equal
deleted
inserted
replaced
92 |
92 |
93 def modsetup(ui): |
93 def modsetup(ui): |
94 """run a uisetup time to install all destinations wrapping""" |
94 """run a uisetup time to install all destinations wrapping""" |
95 if util.safehasattr(destutil, '_destmergebranch'): |
95 if util.safehasattr(destutil, '_destmergebranch'): |
96 extensions.wrapfunction(destutil, '_destmergebranch', _destmergebranch) |
96 extensions.wrapfunction(destutil, '_destmergebranch', _destmergebranch) |
97 rebase = extensions.find('rebase') |
97 try: |
|
98 rebase = extensions.find('rebase') |
|
99 except KeyError: |
|
100 rebase = None |
98 if (util.safehasattr(rebase, '_destrebase') |
101 if (util.safehasattr(rebase, '_destrebase') |
99 # logic not shared with merge yet < hg-3.8 |
102 # logic not shared with merge yet < hg-3.8 |
100 and not util.safehasattr(rebase, '_definesets')): |
103 and not util.safehasattr(rebase, '_definesets')): |
101 extensions.wrapfunction(rebase, '_destrebase', _destmergebranch) |
104 extensions.wrapfunction(rebase, '_destrebase', _destmergebranch) |
102 if util.safehasattr(destutil, 'destupdatesteps'): |
105 if util.safehasattr(destutil, 'destupdatesteps'): |