Rev 618: Merge 0.4. in file:///data/jelmer/bzr-svn/revprops/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 618
revision-id:jelmer at samba.org-20080201145339-qi9htwdsfb2h2kji
parent: jelmer at samba.org-20080201144906-1mvyf412uaud15xb
parent: jelmer at samba.org-20080201145120-5v2rvp1556pzfod4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: revprops
timestamp: Fri 2008-02-01 15:53:39 +0100
message:
  Merge 0.4.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  tests/test_mapping.py          test_mapping.py-20080201131338-0zd86eznn4bojtee-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 579.1.307
    revision-id:jelmer at samba.org-20080201145120-5v2rvp1556pzfod4
    parent: jelmer at samba.org-20080201144541-d1teo734kp28m5tq
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-02-01 15:51:20 +0100
    message:
      Make function for overriding svn revision properties later on easier to use.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      tests/test_commit.py           test_commit.py-20060624213521-l5kcufywkh9mnilk-1
    ------------------------------------------------------------
    revno: 579.1.306
    revision-id:jelmer at samba.org-20080201144541-d1teo734kp28m5tq
    parent: jelmer at samba.org-20080201135612-esqeh187y12uuysy
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-02-01 15:45:41 +0100
    message:
      Use richer svn API that allows specifying custom revision properties during 
      commit.
    modified:
      commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
      format.py                      format.py-20070917005147-94kb7zysotf82kqw-1
      repository.py                  repository.py-20060306123302-1f8c5069b3fe0265
      transport.py                   transport.py-20060406231150-b3472d06b3a0818d
    ------------------------------------------------------------
    revno: 579.1.305
    revision-id:jelmer at samba.org-20080201135612-esqeh187y12uuysy
    parent: jelmer at samba.org-20080201135516-q78n1744xqg5yqew
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-02-01 14:56:12 +0100
    message:
      Fix import of mutter.
    modified:
      tests/test_mapping.py          test_mapping.py-20080201131338-0zd86eznn4bojtee-1
    ------------------------------------------------------------
    revno: 579.1.304
    revision-id:jelmer at samba.org-20080201135516-q78n1744xqg5yqew
    parent: jelmer at samba.org-20080201133339-rerur511thojhpd9
    committer: Jelmer Vernooij <jelmer at samba.org>
    branch nick: 0.4
    timestamp: Fri 2008-02-01 14:55:16 +0100
    message:
      Convert SVN_ERR_RA_NOT_IMPLEMENTED errors to NotImplementedError exceptions.
    modified:
      errors.py                      errors.py-20061226172623-w1sbj8ynpo0eojqp-1
      tests/test_errors.py           test_errors.py-20070129114605-ban03f32t6ja14ez-1
=== modified file 'commit.py'
--- a/commit.py	2008-02-01 14:49:06 +0000
+++ b/commit.py	2008-02-01 14:53:39 +0000
@@ -552,13 +552,14 @@
         assert self._new_revision_id is None or self._new_revision_id == revid
 
         self.mutter('commit %d finished. author: %r, date: %r, revid: %r' % 
-               (self.revision_metadata.revision, self.revision_metadata.author, self.revision_metadata.date, revid))
+               (self.revision_metadata.revision, self.revision_metadata.author, 
+                   self.revision_metadata.date, revid))
 
         if self.repository.get_config().get_override_svn_revprops():
-            set_svn_revprops(self.repository.transport, self.revision_metadata.revision, {
+            set_svn_revprops(self.repository.transport, 
+                 self.revision_metadata.revision, {
                 svn.core.SVN_PROP_REVISION_AUTHOR: self._committer,
-                svn.core.SVN_PROP_REVISION_DATE: svn_time_to_cstring(1000000*self._timestamp)
-                })
+                svn.core.SVN_PROP_REVISION_DATE: svn_time_to_cstring(1000000*self._timestamp)})
 
         try:
             set_svn_revprops(self.repository.transport, self.revision_metadata.revision, 

=== modified file 'tests/test_mapping.py'
--- a/tests/test_mapping.py	2008-02-01 13:33:39 +0000
+++ b/tests/test_mapping.py	2008-02-01 13:56:12 +0000
@@ -20,6 +20,7 @@
                      parse_revid_property, parse_merge_property)
 from bzrlib.tests import TestCase
 from bzrlib.revision import Revision
+from bzrlib.trace import mutter
 
 class MetadataMarshallerTests(TestCase):
     def test_generate_revision_metadata_none(self):

=== modified file 'transport.py'
--- a/transport.py	2008-01-19 12:43:31 +0000
+++ b/transport.py	2008-02-01 14:53:39 +0000
@@ -531,15 +531,9 @@
             elif revprops.keys() != [svn.core.SVN_PROP_REVISION_LOG]:
                 raise NotImplementedError()
             else:
-                def done_wrapper(new_rev, date, author):
-                    commit_info = svn.core.svn_commit_info_t()
-                    commit_info.revision = new_rev
-                    commit_info.date = date
-                    commit_info.author = author
-                    done_cb(commit_info)
-                editor = svn.ra.get_commit_editor(self._ra, 
+                editor = svn.ra.get_commit_editor2(self._ra, 
                             revprops[svn.core.SVN_PROP_REVISION_LOG],
-                            done_wrapper, lock_token, keep_locks)
+                            done_cb, lock_token, keep_locks)
 
             return Editor(self, editor)
         except: