Mercurial > evolve

changeset 4535:8dae14cd076a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: only wrap mergeupdate for repo with topic This helps repository with and without topic to coexist in the same process.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Thu, 18 Apr 2019 11:13:49 +0200
parents 24662f94d126
children 9837e8d378de
files hgext3rd/topic/__init__.py
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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