Rev 1514: Attach Subversion meta object rather than individual settings. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1514
revision-id: jelmer at samba.org-20080802004146-v8h0ol221bjxpdbi
parent: jelmer at samba.org-20080802001443-l5ap9wn1av92nbxp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-02 02:41:46 +0200
message:
  Attach Subversion meta object rather than individual settings.
modified:
  log.py                         log.py-20080707143400-mxzjdllay5jhvnq1-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  tests/test_log.py              test_log.py-20080707150233-jwwy10h0byik6jxj-1
=== modified file 'log.py'
--- a/log.py	2008-07-07 14:55:25 +0000
+++ b/log.py	2008-08-02 00:41:46 +0000
@@ -20,8 +20,8 @@
 def show_subversion_properties(rev):
     data = None
     ret = {}
-    if getattr(rev, "svn_revision", None) is not None:
-        data = (rev.svn_revision, rev.svn_branch)
+    if getattr(rev, "svn_meta", None) is not None:
+        data = (rev.svn_meta.revnum, rev.svn_meta.branch_path)
     else:
         try:
             (uuid, bp, revnum, mapp) = mapping.parse_revision_id(rev.revision_id)

=== modified file 'repository.py'
--- a/repository.py	2008-07-25 11:50:37 +0000
+++ b/repository.py	2008-08-02 00:41:46 +0000
@@ -541,8 +541,7 @@
                        parent_ids=parent_ids,
                        inventory_sha1="")
 
-        rev.svn_revision = revnum
-        rev.svn_branch = path
+        rev.svn_meta = revmeta
         rev.svn_uuid = self.uuid
 
         mapping.import_revision(svn_revprops, svn_fileprops, self.uuid, path, 

=== modified file 'tests/test_log.py'
--- a/tests/test_log.py	2008-07-07 15:06:13 +0000
+++ b/tests/test_log.py	2008-08-02 00:41:46 +0000
@@ -24,8 +24,11 @@
 
     def test_svnprops(self):
         rev = Revision("foo")
-        rev.svn_revision = 2
-        rev.svn_branch = "bar"
+        class Metaobj:
+            def __init__(self, revnum, branch):
+                self.revnum = revnum
+                self.branch_path = branch
+        rev.svn_meta = Metaobj(2, "bar")
         self.assertEquals({"svn revno": "2 (on /bar)"}, 
                           show_subversion_properties(rev))