# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1555578829 -7200
# Node ID 8dae14cd076aeb8726f705320028cf8d622dc60f
# Parent  24662f94d1261c638b6da0ee1a4af88ee6abda2b
topic: only wrap mergeupdate for repo with topic

This helps repository with and without topic to coexist in the same process.

diff -r 24662f94d126 -r 8dae14cd076a hgext3rd/topic/__init__.py
--- 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