# HG changeset patch # User timeless@gmail.com # Date 1467997183 0 # Node ID a604423c1500f5c0ce842b14534d522975f78aab # Parent 08cbfeb15a1a12e117f9df0c2271d975e7c85b2e compat: tolerate missing rebase extension diff -r 08cbfeb15a1a -r a604423c1500 hgext3rd/topic/__init__.py --- 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 diff -r 08cbfeb15a1a -r a604423c1500 hgext3rd/topic/destination.py --- 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')):