Rev 1966: Return old and new value when checking fileprop differences. in file:///data/jelmer/bzr-svn/trunk/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1966
revision-id: jelmer at samba.org-20081109050543-xul5rd4rvkkvli97
parent: jelmer at samba.org-20081108193113-eom4agyvo34kznq0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2008-11-09 06:05:43 +0100
message:
  Return old and new value when checking fileprop differences.
modified:
  mapping.py                     mapping.py-20080128201303-6cp01phc0dmc0kiv-1
  revids.py                      revids.py-20070416220458-36vfa0730cchevp1-1
  subvertpy/subvertpy/properties.py util.py-20080502170127-o220e9py99vt69s6-1
  tests/test_revmeta.py          test_revmeta.py-20080903002416-q6u02e2hrc2oxa8h-1
=== modified file 'mapping.py'
--- a/mapping.py	2008-11-07 13:20:07 +0000
+++ b/mapping.py	2008-11-09 05:05:43 +0000
@@ -507,22 +507,22 @@
     def import_revision(self, svn_revprops, fileprops, uuid, branch, revnum, rev):
         parse_svn_revprops(svn_revprops, rev)
         if SVN_PROP_BZR_LOG in fileprops:
-            rev.message = fileprops[SVN_PROP_BZR_LOG]
+            rev.message = fileprops[SVN_PROP_BZR_LOG][1]
         metadata = fileprops.get(SVN_PROP_BZR_REVISION_INFO)
         if metadata is not None:
-            parse_revision_metadata(metadata, rev)
+            parse_revision_metadata(metadata[1], rev)
 
     def import_text_revisions(self, svn_revprops, fileprops):
         metadata = fileprops.get(SVN_PROP_BZR_TEXT_REVISIONS)
         if metadata is None:
             return {}
-        return parse_text_revisions_property(metadata)
+        return parse_text_revisions_property(metadata[1])
 
     def import_text_parents(self, svn_revprops, fileprops):
         metadata = fileprops.get(SVN_PROP_BZR_TEXT_PARENTS)
         if metadata is None:
             return {}
-        return parse_text_parents_property(metadata)
+        return parse_text_parents_property(metadata[1])
 
     def export_text_parents(self, text_parents, svn_revprops, fileprops):
         if text_parents != {}:
@@ -539,13 +539,13 @@
     def get_rhs_parents(self, branch_path, revprops, fileprops):
         bzr_merges = fileprops.get(SVN_PROP_BZR_ANCESTRY+self.name, None)
         if bzr_merges is not None:
-            return parse_merge_property(bzr_merges.splitlines()[-1])
+            return parse_merge_property(bzr_merges[1].splitlines()[-1])
 
         return ()
 
     def get_rhs_ancestors(self, branch_path, revprops, fileprops):
         ancestry = []
-        for l in fileprops.get(SVN_PROP_BZR_ANCESTRY+self.name, "").splitlines():
+        for l in fileprops.get(SVN_PROP_BZR_ANCESTRY+self.name, (None, ""))[1].splitlines():
             ancestry.extend(l.split("\n"))
         return ancestry
 
@@ -553,7 +553,7 @@
         fileids = fileprops.get(SVN_PROP_BZR_FILEIDS, None)
         if fileids is None:
             return {}
-        return parse_fileid_property(fileids)
+        return parse_fileid_property(fileids[1])
 
     def _record_merges(self, merges, fileprops):
         """Store the extra merges (non-LHS parents) in a file property.
@@ -590,7 +590,7 @@
         if text is None:
             return (None, None)
 
-        lines = text.splitlines()
+        lines = text[1].splitlines()
         if len(lines) == 0:
             return (None, None)
 

=== modified file 'revids.py'
--- a/revids.py	2008-10-02 21:18:28 +0000
+++ b/revids.py	2008-11-09 05:05:43 +0000
@@ -106,7 +106,7 @@
         # Find the branch property between min_revnum and max_revnum that 
         # added revid
         for revmeta in self.repos._revmeta_provider.iter_reverse_branch_changes(branch_path, max_revnum, min_revnum):
-            for propname, propvalue in revmeta.get_changed_fileprops().items():
+            for propname, (oldpropvalue, propvalue) in revmeta.get_changed_fileprops().items():
                 if not propname.startswith(SVN_PROP_BZR_REVISION_ID):
                     continue
                 try:

=== modified file 'subvertpy/subvertpy/properties.py'
--- a/subvertpy/subvertpy/properties.py	2008-10-06 14:55:21 +0000
+++ b/subvertpy/subvertpy/properties.py	2008-11-09 05:05:43 +0000
@@ -216,7 +216,8 @@
 
 def diff(current, previous):
     ret = {}
-    for key, val in current.items():
-        if previous.get(key) != val:
-            ret[key] = val
+    for key, newval in current.items():
+        oldval = previous.get(key)
+        if oldval != newval:
+            ret[key] = (oldval, newval)
     return ret

=== modified file 'tests/test_revmeta.py'
--- a/tests/test_revmeta.py	2008-09-03 00:24:56 +0000
+++ b/tests/test_revmeta.py	2008-11-09 05:05:43 +0000
@@ -40,11 +40,11 @@
         revmeta2 = repos._revmeta_provider.get_revision("", 2)
         revmeta3 = repos._revmeta_provider.get_revision("", 3)
 
-        self.assertEquals("data\n",
+        self.assertEquals((None, "data\n"),
                           revmeta1.get_changed_fileprops()["myprop"])
 
-        self.assertEquals("newdata\n", 
+        self.assertEquals(("data\n","newdata\n"), 
                           revmeta2.get_changed_fileprops()["myprop"])
 
-        self.assertEquals("newdata\n", 
+        self.assertEquals((None, "newdata\n"), 
                           revmeta3.get_changed_fileprops()["myp2"])