Mercurial > public > mercurial-scm > hg-stable

diff mercurial/bundle2.py @ 33791:119e1c6be1ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bundle2: fix transaction availability detection Changeset 5fc4ddfbe626 introduce more complex logic around 'bundleoperation.gettransaction'. In that process it turns the old "attribute" into a proper method which breaks the code that detects the "transaction availability". The change was visible in 'test-acl.t', fixing this reverts the test changes. Differential Revision: https://phab.mercurial-scm.org/D303
author Boris Feld <boris.feld@octobus.net>
date Wed, 09 Aug 2017 17:01:21 +0200
parents 373ca5103ba8
children 1bf5c5507614
line wrap: on
line diff
--- a/mercurial/bundle2.py	Thu Aug 10 09:37:50 2017 -0700
+++ b/mercurial/bundle2.py	Wed Aug 09 17:01:21 2017 +0200
@@ -373,7 +373,7 @@
         msg = ['bundle2-input-bundle:']
         if unbundler.params:
             msg.append(' %i params' % len(unbundler.params))
-        if op.gettransaction is None or op.gettransaction is _notransaction:
+        if op._gettransaction is None or op._gettransaction is _notransaction:
             msg.append(' no-transaction')
         else:
             msg.append(' with-transaction')