From 6928a9895f5951446657d19c1ad5dc42b65c9746 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 24 Aug 2008 18:04:04 +0200 Subject: [PATCH] Avoid reconnecting when pushing. --- NEWS | 2 ++ commit.py | 5 ++++- transport.py | 7 ------- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/NEWS b/NEWS index 966c7093..6d052062 100644 --- a/NEWS +++ b/NEWS @@ -25,6 +25,8 @@ bzr-svn-0.4.11 UNRELEASED * 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 diff --git a/commit.py b/commit.py index 7f27e794..3ef6e9cb 100644 --- a/commit.py +++ b/commit.py @@ -485,7 +485,8 @@ class SvnCommitBuilder(RootCommitBuilder): 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 @@ class SvnCommitBuilder(RootCommitBuilder): 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() diff --git a/transport.py b/transport.py index 0e8a8409..4571d3f0 100644 --- a/transport.py +++ b/transport.py @@ -464,13 +464,6 @@ class SvnRaTransport(Transport): 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(). """ -- 2.34.1