Rev 1638: Avoid reconnecting when pushing. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk
Jelmer Vernooij
jelmer at samba.org
Sun Aug 24 17:04:07 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/trunk
------------------------------------------------------------
revno: 1638
revision-id: jelmer at samba.org-20080824160404-vke8zl0yuke54fd8
parent: jelmer at samba.org-20080824155305-l6kvu47fsucqzn2z
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-08-24 18:04:04 +0200
message:
Avoid reconnecting when pushing.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'NEWS'
--- a/NEWS 2008-08-24 15:22:40 +0000
+++ b/NEWS 2008-08-24 16:04:04 +0000
@@ -25,6 +25,8 @@
* Create tags base directory if it doesn't exist.
+ * Add --merged option to svn-push command.
+
bzr-svn 0.4.11~rc1 2008-08-08
CHANGES
=== modified file 'commit.py'
--- a/commit.py 2008-08-24 15:53:05 +0000
+++ b/commit.py 2008-08-24 16:04:04 +0000
@@ -485,7 +485,8 @@
for prop in self._svn_revprops:
if not properties.is_valid_property_name(prop):
warning("Setting property %r with invalid characters in name", prop)
- self.editor = self.repository.transport.get_commit_editor(
+ conn = self.repository.transport.get_connection()
+ self.editor = conn.get_commit_editor(
self._svn_revprops, done, None, False)
try:
root = self.editor.open_root(self.base_revnum)
@@ -523,9 +524,11 @@
dir_editor.close()
except:
self.editor.abort()
+ self.repository.transport.add_connection(conn)
raise
self.editor.close()
+ self.repository.transport.add_connection(conn)
finally:
lock.unlock()
=== modified file 'transport.py'
--- a/transport.py 2008-08-23 17:55:26 +0000
+++ b/transport.py 2008-08-24 16:04:04 +0000
@@ -464,13 +464,6 @@
finally:
self.add_connection(conn)
- @convert_svn_error
- def get_commit_editor(self, revprops, done_cb=None,
- lock_token=None, keep_locks=False):
- conn = self._open_real_transport()
- self.mutter('svn get-commit-editor %r' % (revprops,))
- return conn.get_commit_editor(revprops, done_cb, lock_token, keep_locks)
-
def listable(self):
"""See Transport.listable().
"""
More information about the bazaar-commits
mailing list