Rev 530: Add branching scheme property. in file:///data/jelmer/bzr-svn/0.4/

[Jelmer Vernooij]

At file:///data/jelmer/bzr-svn/0.4/

------------------------------------------------------------
revno: 530
revision-id: jelmer at samba.org-20070713103218-ujothzh4z6t0ju6k
parent: jelmer at samba.org-20070713102746-i2dygg1cv2ke9eiw
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2007-07-13 13:32:18 +0300
message:
  Add branching scheme property.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tree.py                        tree.py-20060624222557-dudlwqcmkf22lt2s-1
=== modified file 'fetch.py'
--- a/fetch.py	2007-06-24 17:52:51 +0000
+++ b/fetch.py	2007-07-13 10:32:18 +0000
@@ -34,6 +34,7 @@
 from fileids import generate_file_id
 from repository import (SvnRepository, SVN_PROP_BZR_MERGE, SVN_PROP_SVK_MERGE,
                 SVN_PROP_BZR_PREFIX, SVN_PROP_BZR_REVISION_INFO, 
+                SVN_PROP_BZR_BRANCHING_SCHEME,
                 SvnRepositoryFormat, parse_revision_metadata)
 from tree import apply_txdelta_handler
 
@@ -176,9 +177,9 @@
         return file_id
 
     def change_dir_prop(self, id, name, value, pool):
-        if name == SVN_PROP_BZR_MERGE:
+        if name in (SVN_PROP_BZR_MERGE, SVN_PROP_BZR_BRANCHING_SCHEME):
             if id != self.inventory.root.file_id:
-                mutter('rogue %r on non-root directory' % SVN_PROP_BZR_MERGE)
+                mutter('rogue %r on non-root directory' % name)
                 return
             
             self._parent_ids = value.splitlines()[-1]

=== modified file 'repository.py'
--- a/repository.py	2007-07-13 09:43:09 +0000
+++ b/repository.py	2007-07-13 10:32:18 +0000
@@ -52,6 +52,7 @@
 SVN_PROP_BZR_REVISION_INFO = 'bzr:revision-info'
 SVN_REVPROP_BZR_SIGNATURE = 'bzr:gpg-signature'
 SVN_PROP_BZR_REVISION_ID = 'bzr:revision-id-v%d:' % MAPPING_VERSION
+SVN_PROP_BZR_BRANCHING_SCHEME = 'bzr:branching-scheme'
 
 def parse_revid_property(line):
     """Parse a (revnum, revid) tuple as set in revision id properties.

=== modified file 'tree.py'
--- a/tree.py	2007-06-24 14:08:49 +0000
+++ b/tree.py	2007-07-13 10:32:18 +0000
@@ -99,19 +99,17 @@
     def change_dir_prop(self, id, name, value, pool):
         from repository import (SVN_PROP_BZR_MERGE, SVN_PROP_SVK_MERGE, 
                         SVN_PROP_BZR_PREFIX, SVN_PROP_BZR_REVISION_INFO, 
-                        SVN_PROP_BZR_FILEIDS, SVN_PROP_BZR_REVISION_ID)
+                        SVN_PROP_BZR_FILEIDS, SVN_PROP_BZR_REVISION_ID,
+                        SVN_PROP_BZR_BRANCHING_SCHEME)
 
         if name == svn.core.SVN_PROP_ENTRY_COMMITTED_REV:
             self.dir_revnum[id] = int(value)
         elif name == svn.core.SVN_PROP_IGNORE:
             self.dir_ignores[id] = value
-        elif name == SVN_PROP_BZR_MERGE or name == SVN_PROP_SVK_MERGE:
-            if id != self.tree._inventory.root.file_id:
-                mutter('%r set on non-root dir!' % SVN_PROP_BZR_MERGE)
-                return
-        elif name == SVN_PROP_BZR_FILEIDS:
-            if id != self.tree._inventory.root.file_id:
-                mutter('%r set on non-root dir!' % SVN_PROP_BZR_FILEIDS)
+        elif name in (SVN_PROP_BZR_MERGE, SVN_PROP_BZR_FILEIDS,
+                      SVN_PROP_BZR_BRANCHING_SCHEME):
+            if id != self.tree._inventory.root.file_id:
+                mutter('%r set on non-root dir!' % name)
                 return
         elif name in (svn.core.SVN_PROP_ENTRY_COMMITTED_DATE,
                       svn.core.SVN_PROP_ENTRY_LAST_AUTHOR,