# HG changeset patch # User Pierre-Yves David # Date 1508847157 -7200 # Node ID 28e501581dc77f80a1dca1c7bc64df1d90fafefa # Parent f9faa5b6f937217562a5b5e9b27f74d8fbc01b69 compat: drop support for 3.8's '_destrebase' function We no longer support this version. diff --git a/hgext3rd/topic/destination.py b/hgext3rd/topic/destination.py --- a/hgext3rd/topic/destination.py +++ b/hgext3rd/topic/destination.py @@ -6,7 +6,6 @@ destutil, error, extensions, - util, ) from . import topicmap from .evolvebits import builddependencies @@ -100,24 +99,8 @@ def modsetup(ui): """run a uisetup time to install all destinations wrapping""" - if util.safehasattr(destutil, '_destmergebranch'): - extensions.wrapfunction(destutil, '_destmergebranch', _destmergebranch) - try: - rebase = extensions.find('rebase') - except KeyError: - rebase = None - - # Mercurial 4.4 rename _definesets into _definedestmap - rebasebefore38 = not util.safehasattr(rebase, '_definesets') - rebasebefore44 = not util.safehasattr(rebase, '_definedestmap') - - if (util.safehasattr(rebase, '_destrebase') - # logic not shared with merge yet < hg-3.8 - and rebasebefore38 and rebasebefore44): - extensions.wrapfunction(rebase, '_destrebase', _destmergebranch) - if util.safehasattr(destutil, 'destupdatesteps'): - bridx = destutil.destupdatesteps.index('branch') - destutil.destupdatesteps.insert(bridx, 'topic') - destutil.destupdatestepmap['topic'] = _destupdatetopic - if util.safehasattr(destutil, 'desthistedit'): - extensions.wrapfunction(destutil, 'desthistedit', desthistedit) + extensions.wrapfunction(destutil, '_destmergebranch', _destmergebranch) + bridx = destutil.destupdatesteps.index('branch') + destutil.destupdatesteps.insert(bridx, 'topic') + destutil.destupdatestepmap['topic'] = _destupdatetopic + extensions.wrapfunction(destutil, 'desthistedit', desthistedit)