# HG changeset patch # User Augie Fackler # Date 1418269638 18000 # Node ID c791efb7082a01ec9596d65cae47b9fdd499eb6a # Parent 2ae577a4cd56e80f67fbb57f03345ff92ecdbdf5# Parent b5520673f6f243a511070d45e6c63ead2f3e135c Merge with stable. diff --git a/hgsubversion/wrappers.py b/hgsubversion/wrappers.py --- a/hgsubversion/wrappers.py +++ b/hgsubversion/wrappers.py @@ -521,13 +521,23 @@ def pull(repo, source, heads=[], force=F def exchangepull(orig, repo, remote, heads=None, force=False, bookmarks=()): capable = getattr(remote, 'capable', lambda x: False) if capable('subversion'): + # transaction manager is present in Mercurial >= 3.3 + try: + trmanager = getattr(exchange, 'transactionmanager') + except AttributeError: + trmanager = None pullop = exchange.pulloperation(repo, remote, heads, force, bookmarks=bookmarks) + if trmanager: + pullop.trmanager = trmanager(repo, 'pull', remote.url()) try: pullop.cgresult = pull(repo, remote, heads, force) return pullop finally: - pullop.releasetransaction() + if trmanager: + pullop.trmanager.release() + else: + pullop.releasetransaction() else: return orig(repo, remote, heads, force, bookmarks=bookmarks)