Rev 1105: 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: 1105
revision-id: jelmer at samba.org-20080617225434-4421o96ffosyuz9y
parent: jelmer at samba.org-20080617223611-u7llhl0o1hfk80uo
parent: jelmer at samba.org-20080617225233-2b79ggobt2sc0qet
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Wed 2008-06-18 00:54:34 +0200
message:
  Merge 0.4.
modified:
  format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
  mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
    ------------------------------------------------------------
    revno: 950.3.180
    revision-id: jelmer at samba.org-20080617225233-2b79ggobt2sc0qet
    parent: jelmer at samba.org-20080617223119-ub4cxwjhnya05p5n
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Wed 2008-06-18 00:52:33 +0200
    message:
      Move delta operations to separate file.
    added:
      delta.py                       delta.py-20080617225125-jeg43afui0czkuwk-1
    modified:
      fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
      mapping3/__init__.py           __init__.py-20080502174630-9324zh25kka98vlw-1
      ra.py                          ra.py-20080615005305-t5221niknu8rm6bt-1
      tests/test_branch.py           test_branch.py-20060508162215-74ffeb5d608f8e20
      tests/test_checkout.py         test_checkout.py-20070101154110-eevkc29qj0q7udz5-1
      tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
      workingtree.py                 workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'format.py'
--- a/format.py	2008-06-17 22:36:11 +0000
+++ b/format.py	2008-06-17 22:54:34 +0000
@@ -65,10 +65,10 @@
         return format
 
     def _open(self, transport):
-        from bzrlib.plugins.svn import core
+        from bzrlib.plugins.svn.core import SubversionException
         try: 
             return remote.SvnRemoteAccess(transport, self)
-        except core.SubversionException, (_, num):
+        except SubversionException, (_, num):
             if num == errors.ERR_RA_DAV_REQUEST_FAILED:
                 raise bzr_errors.NotBranchError(transport.base)
             raise
@@ -115,7 +115,7 @@
     @classmethod
     def probe_transport(klass, transport):
         from bzrlib.transport.local import LocalTransport
-        import wc
+        from bzrlib.plugins.svn import wc
         format = klass()
 
         if isinstance(transport, LocalTransport) and \

=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py	2008-06-17 22:36:11 +0000
+++ b/mapping3/__init__.py	2008-06-17 22:54:34 +0000
@@ -121,7 +121,7 @@
 def set_property_scheme(repository, scheme):
     editor = repository.transport.get_commit_editor(
             {properties.PROP_REVISION_LOG: "Updating branching scheme for Bazaar."},
-            done, None, False)
+            None, None, False)
     root = editor.open_root()
     root.change_prop(SVN_PROP_BZR_BRANCHING_SCHEME, 
             "".join(map(lambda x: x+"\n", scheme.branch_list)).encode("utf-8"))

=== modified file 'tree.py'
--- a/tree.py	2008-06-17 22:36:11 +0000
+++ b/tree.py	2008-06-17 22:54:34 +0000
@@ -18,11 +18,12 @@
 from bzrlib import osutils, urlutils
 from bzrlib.branch import Branch
 from bzrlib.inventory import Inventory, InventoryDirectory, TreeReference
-
 from bzrlib.revision import CURRENT_REVISION
 from bzrlib.trace import mutter
 from bzrlib.revisiontree import RevisionTree
 
+from bzrlib.plugins.svn.delta import apply_txdelta_handler
+
 import os
 import md5
 from cStringIO import StringIO
@@ -158,12 +159,12 @@
 
     def change_prop(self, name, value):
         if name in (properties.PROP_ENTRY_COMMITTED_DATE,
-                      properties.PROP_ENTRY_COMMITTED_REV,
-                      properties.PROP_ENTRY_LAST_AUTHOR,
-                      properties.PROP_ENTRY_LOCK_TOKEN,
-                      properties.PROP_ENTRY_UUID,
-                      properties.PROP_EXECUTABLE,
-                      properties.PROP_IGNORE):
+                    properties.PROP_ENTRY_LAST_AUTHOR,
+                    properties.PROP_ENTRY_LOCK_TOKEN,
+                    properties.PROP_ENTRY_COMMITTED_REV,
+                    properties.PROP_ENTRY_UUID,
+                    properties.PROP_IGNORE,
+                    properties.PROP_EXECUTABLE):
             pass
         elif name.startswith(properties.PROP_WC_PREFIX):
             pass