Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: only wrap mergeupdate for repo with topic stable
authorPierre-Yves David <pierre-yves.david@octobus.net>
Thu, 18 Apr 2019 11:13:49 +0200
branchstable
changeset 4535 8dae14cd076a
parent 4534 24662f94d126
child 4536 9837e8d378de
topic: only wrap mergeupdate for repo with topic This helps repository with and without topic to coexist in the same process.
hgext3rd/topic/__init__.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/topic/__init__.py	Thu Apr 18 11:13:39 2019 +0200
+++ b/hgext3rd/topic/__init__.py	Thu Apr 18 11:13:49 2019 +0200
@@ -1186,6 +1186,8 @@
     ist0 = False
     try:
         ret = orig(repo, node, branchmerge, force, *args, **kwargs)
+        if not hastopicext(repo):
+            return ret
         # The mergeupdatewrap function makes the destination's topic as the
         # current topic. This is right for merge but wrong for rebase. We check
         # if rebase is running and update the currenttopic to topic of new
evolve