--- a/hgext3rd/topic/__init__.py Fri Jul 08 16:09:55 2016 +0000
+++ b/hgext3rd/topic/__init__.py Fri Jul 08 16:59:43 2016 +0000
@@ -320,8 +320,11 @@
def newmakeextrafn(orig, copiers):
return orig(copiers + [savetopic])
- rebase = extensions.find("rebase")
- extensions.wrapfunction(rebase, '_makeextrafn', newmakeextrafn)
+ try:
+ rebase = extensions.find("rebase")
+ extensions.wrapfunction(rebase, '_makeextrafn', newmakeextrafn)
+ except KeyError:
+ pass
## preserve topic during import/export
--- a/hgext3rd/topic/destination.py Fri Jul 08 16:09:55 2016 +0000
+++ b/hgext3rd/topic/destination.py Fri Jul 08 16:59:43 2016 +0000
@@ -94,7 +94,10 @@
"""run a uisetup time to install all destinations wrapping"""
if util.safehasattr(destutil, '_destmergebranch'):
extensions.wrapfunction(destutil, '_destmergebranch', _destmergebranch)
- rebase = extensions.find('rebase')
+ try:
+ rebase = extensions.find('rebase')
+ except KeyError:
+ rebase = None
if (util.safehasattr(rebase, '_destrebase')
# logic not shared with merge yet < hg-3.8
and not util.safehasattr(rebase, '_definesets')):