Rev 583: Merge upstream. in file:///data/jelmer/bzr-svn/revprops/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 583
revision-id: jelmer at samba.org-20071002012632-x1khfhiakyvshsfv
parent: jelmer at samba.org-20071001233054-whbjbtcblvum9qrf
parent: jelmer at samba.org-20071002010530-gabzblnbdcd9xyzy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: revprops
timestamp: Tue 2007-10-02 03:26:32 +0200
message:
  Merge upstream.
modified:
  NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 579.1.142
    revision-id: jelmer at samba.org-20071002010530-gabzblnbdcd9xyzy
    parent: jelmer at samba.org-20071001181833-0ziqv0xb584jl20k
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Tue 2007-10-02 03:05:30 +0200
    message:
      Use commit revprops rather than just commit message when committing.
    modified:
      NEWS                           news-20061231030336-h9fhq245ie0de8bs-1
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'NEWS'
--- a/NEWS	2007-09-26 12:05:21 +0000
+++ b/NEWS	2007-10-02 01:05:30 +0000
@@ -16,6 +16,8 @@
 
    * Implement ListBranchingScheme.is_branch_parent(). (#144357)
 
+   * Use revprop lists rather than just commit message when committing.
+
   BUG FIXES
 
    * Handle long file names with unicode characters correctly on python2.4 (#129334)

=== modified file 'commit.py'
--- a/commit.py	2007-09-15 03:31:14 +0000
+++ b/commit.py	2007-10-02 01:05:30 +0000
@@ -430,7 +430,8 @@
                                               bp_parts, -1)
             self.revnum = None
             self.editor = self.repository.transport.get_commit_editor(
-                message.encode("utf-8"), done, None, False)
+                  {svn.core.SVN_PROP_REVISION_LOG: message.encode("utf-8")}, 
+                  done, None, False)
 
             root = self.editor.open_root(self.base_revnum)
 

=== modified file 'repository.py'
--- a/repository.py	2007-09-17 13:18:46 +0000
+++ b/repository.py	2007-10-02 01:05:30 +0000
@@ -357,7 +357,7 @@
         def done(revision, date, author):
             pass
         editor = self.transport.get_commit_editor(
-                "Updating branching scheme for Bazaar.",
+                {svn.core.SVN_PROP_REVISION_LOG: "Updating branching scheme for Bazaar."},
                 done, None, False)
         root = editor.open_root(-1)
         editor.change_dir_prop(root, SVN_PROP_BZR_BRANCHING_SCHEME, 

=== modified file 'transport.py'
--- a/transport.py	2007-09-12 01:20:57 +0000
+++ b/transport.py	2007-10-02 01:05:30 +0000
@@ -438,11 +438,21 @@
         return self.Reporter(self, svn.ra.do_update(self._ra, revnum, "", 
                              *args, **kwargs))
 
+    def supports_custom_revprops(self):
+        return has_attr(svn.ra, 'get_commit_editor3')
+
     @convert_svn_error
-    def get_commit_editor(self, *args, **kwargs):
+    def get_commit_editor(self, revprops, done_cb, lock_token, keep_locks):
         self._open_real_transport()
         self._mark_busy()
-        return Editor(self, svn.ra.get_commit_editor(self._ra, *args, **kwargs))
+        if revprops.keys() == [svn.core.SVN_PROP_REVISION_LOG]:
+            editor = svn.ra.get_commit_editor(self._ra, 
+                        revprops[svn.core.SVN_PROP_REVISION_LOG],
+                        done_cb, lock_token, keep_locks)
+        else:
+            editor = svn.ra.get_commit_editor3(self._ra, revprops, done_cb, 
+                                              lock_token, keep_locks)
+        return Editor(self, editor)
 
     def listable(self):
         """See Transport.listable().