Mercurial > evolve

changeset 2987:d59d6413bb68

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topics/transaction: return immediately if we are in the middle of a transaction
author Aurélien Campéas
date Fri, 22 Sep 2017 18:01:29 +0200
parents 4746b92cc1f8
children 62201935e1a7
files hgext3rd/topic/__init__.py
diffstat 1 files changed, 3 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext3rd/topic/__init__.py	Fri Sep 22 16:41:37 2017 +0200
+++ b/hgext3rd/topic/__init__.py	Fri Sep 22 18:01:29 2017 +0200
@@ -313,7 +313,10 @@
             return peer
 
         def transaction(self, *a, **k):
+            ctr = self.currenttransaction()
             tr = super(topicrepo, self).transaction(*a, **k)
+            if ctr is not None:
+                return tr
 
             reporef = weakref.ref(self)