Rev 1107: Merge 0.4. in http://people.samba.org/bzr/jelmer/bzr-svn/cext

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/cext

------------------------------------------------------------
revno: 1107
revision-id: jelmer at samba.org-20080618120137-yldzyf34qt35z342
parent: jelmer at samba.org-20080618115918-bc24d35jr60f6b9z
parent: jelmer at samba.org-20080618115824-vzo020t2d83ik66x
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Wed 2008-06-18 14:01:37 +0200
message:
  Merge 0.4.
modified:
  auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
    ------------------------------------------------------------
    revno: 950.3.181
    revision-id: jelmer at samba.org-20080618115824-vzo020t2d83ik66x
    parent: jelmer at samba.org-20080617225233-2b79ggobt2sc0qet
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-06-18 13:58:24 +0200
    message:
      Change API to be more similar to cext branch.
    modified:
      auth.py                        auth.py-20071209174622-w8d42k6nm5yhxvi8-1
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'auth.py'
--- a/auth.py	2008-06-18 11:59:18 +0000
+++ b/auth.py	2008-06-18 12:01:37 +0000
@@ -17,18 +17,9 @@
 
 from bzrlib.config import AuthenticationConfig
 from bzrlib.ui import ui_factory
-from bzrlib.plugins.svn.ra import (get_username_prompt_provider, 
-                                   get_simple_prompt_provider,
-                                   get_ssl_server_trust_prompt_provider,
-                                   get_ssl_client_cert_pw_prompt_provider,
-                                   get_simple_provider,
-                                   get_username_provider,
-                                   get_ssl_client_cert_file_provider,
-                                   get_ssl_client_cert_pw_file_provider,
-                                   get_ssl_server_trust_file_provider,
-                                   Auth
-                                   )
+
 from bzrlib.plugins.svn import ra
+
 import urlparse
 import urllib
 
@@ -104,7 +95,7 @@
         
         :param retries: Number of allowed retries.
         """
-        return get_username_prompt_provider(self.get_svn_username, 
+        return ra.get_username_prompt_provider(self.get_svn_username, 
                                                      retries)
 
     def get_svn_simple_prompt_provider(self, retries):
@@ -113,13 +104,12 @@
         
         :param retries: Number of allowed retries.
         """
-        return get_simple_prompt_provider(self.get_svn_simple, retries)
+        return ra.get_simple_prompt_provider(self.get_svn_simple, retries)
 
     def get_svn_ssl_server_trust_prompt_provider(self):
         """Return a Subversion auth provider for checking 
         whether a SSL server is trusted."""
-        return get_ssl_server_trust_prompt_provider(
-                    self.get_svn_ssl_server_trust)
+        return ra.get_ssl_server_trust_prompt_provider(self.get_svn_ssl_server_trust)
 
     def get_svn_auth_providers(self):
         """Return a list of auth providers for this authentication file.
@@ -140,15 +130,15 @@
 
 
 def get_ssl_client_cert_pw_provider(tries):
-    return get_ssl_client_cert_pw_prompt_provider(
+    return ra.get_ssl_client_cert_pw_prompt_provider(
                 get_ssl_client_cert_pw, tries)
 
 def get_stock_svn_providers():
-    providers = [get_simple_provider(),
-            get_username_provider(),
-            get_ssl_client_cert_file_provider(),
-            get_ssl_client_cert_pw_file_provider(),
-            get_ssl_server_trust_file_provider(),
+    providers = [ra.get_simple_provider(),
+            ra.get_username_provider(),
+            ra.get_ssl_client_cert_file_provider(),
+            ra.get_ssl_client_cert_pw_file_provider(),
+            ra.get_ssl_server_trust_file_provider(),
             ]
 
     if hasattr(ra, 'get_windows_simple_provider'):
@@ -181,7 +171,7 @@
         providers += auth_config.get_svn_auth_providers()
         providers += [get_ssl_client_cert_pw_provider(1)]
 
-    auth_baton = Auth(providers)
+    auth_baton = ra.Auth(providers)
     if creds is not None:
         (user, password) = urllib.splitpasswd(creds)
         if user is not None:

=== modified file 'commit.py'
--- a/commit.py	2008-06-17 22:36:11 +0000
+++ b/commit.py	2008-06-18 12:01:37 +0000
@@ -298,7 +298,7 @@
                     self.modified_files[child_ie.file_id], child_editor)
 
             if child_editor is not None:
-                child_editor.close(None)
+                child_editor.close()
 
         # Loop over subdirectories of file_id in self.new_inventory
         for child_name in self.new_inventory[file_id].children:

=== modified file 'fetch.py'
--- a/fetch.py	2008-06-17 22:54:34 +0000
+++ b/fetch.py	2008-06-18 12:01:37 +0000
@@ -40,6 +40,7 @@
 from bzrlib.plugins.svn.tree import (parse_externals_description, 
                   inventory_add_external)
 
+import svn.delta
 
 def _escape_commit_message(message):
     """Replace xml-incompatible control characters."""
@@ -93,8 +94,8 @@
         self.source = source
         self.transact = target.get_transaction()
 
-    def set_target_revision(self, target_revision):
-        pass
+    def set_target_revision(self, revnum):
+        assert self.revnum == revnum
 
     def start_revision(self, revid, prev_inventory, revmeta):
         self.revid = revid

=== modified file 'workingtree.py'
--- a/workingtree.py	2008-06-17 22:54:34 +0000
+++ b/workingtree.py	2008-06-18 12:01:37 +0000
@@ -69,7 +69,7 @@
 class SvnWorkingTree(WorkingTree):
     """WorkingTree implementation that uses a Subversion Working Copy for storage."""
     def __init__(self, bzrdir, local_path, branch):
-        version = wc.check_wc(local_path)
+        version = svn.wc.check_wc(local_path)
         self._format = SvnWorkingTreeFormat(version)
         self.basedir = local_path
         assert isinstance(self.basedir, unicode)