Rev 597: Change set_svn_revprops to take a dictionary rather than a tuple. in file:///data/jelmer/bzr-svn/revprops/

Jelmer Vernooij jelmer at samba.org
Thu Dec 6 20:52:02 GMT 2007


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

------------------------------------------------------------
revno: 597
revision-id:jelmer at samba.org-20071206205202-x18dllv0w1hpo1qa
parent: jelmer at samba.org-20071206191812-4qah8eg11d0uae4a
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: revprops
timestamp: Thu 2007-12-06 21:52:02 +0100
message:
  Change set_svn_revprops to take a dictionary rather than a tuple.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
=== modified file 'commit.py'
--- a/commit.py	2007-11-12 02:01:41 +0000
+++ b/commit.py	2007-12-06 20:52:02 +0000
@@ -68,10 +68,6 @@
     :param author: New author
     :param timestamp: UTC timestamp
     """
-    revprops = {
-        svn.core.SVN_PROP_REVISION_AUTHOR: author,
-        svn.core.SVN_PROP_REVISION_DATE: svn_time_to_cstring(1000000*timestamp)
-    }
     for (name, value) in revprops.items():
         try:
             transport.change_rev_prop(revnum, name, value)
@@ -469,14 +465,14 @@
         bp_parts = self.branch.get_branch_path().split("/")
         repository_latest_revnum = self.repository.transport.get_latest_revnum()
         lock = self.repository.transport.lock_write(".")
+        set_revprops = self.repository.get_config().get_set_revprops()
 
         try:
             existing_bp_parts = _check_dirs_exist(self.repository.transport, 
                                               bp_parts, -1)
             self.revnum = None
             self._svn_revprops[svn.core.SVN_PROP_REVISION_LOG] = message.encode("utf-8")
-            self.editor = self.repository.transport.get_commit_editor(self._svn_revprops,
-                  done, None, False)
+            self.editor = self.repository.transport.get_commit_editor(self._svn_revprops, done, None, False)
 
             root = self.editor.open_root(self.base_revnum)
 
@@ -531,8 +527,12 @@
                (self.revnum, self.author, self.date, revid))
 
         if self.repository.get_config().get_override_svn_revprops():
-            set_svn_revprops(self.repository.transport, 
-                             self.revnum, self._committer, self._timestamp)
+            set_svn_revprops(self.repository.transport, self.revnum, {
+                svn.core.SVN_PROP_REVISION_AUTHOR: self._committer,
+                svn.core.SVN_PROP_REVISION_DATE: svn_time_to_cstring(1000000*self._timestamp)
+                })
+
+        # FIXME: Set bzr: revision properties if we haven't done so yet
 
         return revid
 

=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py	2007-11-05 13:46:26 +0000
+++ b/tests/test_commit.py	2007-12-06 20:52:02 +0000
@@ -559,7 +559,8 @@
         self.client_commit("dc", "My commit")
 
         transport = SvnRaTransport(repos_url)
-        set_svn_revprops(transport, 1, "Somebody", 473385600)
+        set_svn_revprops(transport, 1, {"svn:author": "Somebody", 
+                                        "svn:date": svn_time_to_cstring(1000000*473385600)})
 
         self.assertEquals(("Somebody", "1985-01-01T00:00:00.000000Z", "My commit"), 
                           self.client_log("dc")[1][1:])
@@ -572,4 +573,4 @@
 
         transport = SvnRaTransport(repos_url)
         self.assertRaises(RevpropChangeFailed, 
-            lambda: set_svn_revprops(transport, 1, "Somebody", 473385600))
+                lambda: set_svn_revprops(transport, 1, {"svn:author": "Somebody", "svn:date": svn_time_to_cstring(1000000*473385600)}))




More information about the bazaar-commits mailing list