equal
deleted
inserted
replaced
43 return orig(repo) |
43 return orig(repo) |
44 |
44 |
45 def setupdest(): |
45 def setupdest(): |
46 if util.safehasattr(destutil, '_destmergebranch'): |
46 if util.safehasattr(destutil, '_destmergebranch'): |
47 extensions.wrapfunction(destutil, '_destmergebranch', _destmergebranch) |
47 extensions.wrapfunction(destutil, '_destmergebranch', _destmergebranch) |
|
48 rebase = extensions.find('rebase') |
|
49 if (util.safehasattr(rebase, '_destrebase') |
|
50 # logic not shared with merge yet < hg-3.8 |
|
51 and not util.safehasattr(rebase, '_definesets')): |
|
52 extensions.wrapfunction(rebase, '_destrebase', _destmergebranch) |
48 |
53 |
49 def ngtip(repo, branch, all=False): |
54 def ngtip(repo, branch, all=False): |
50 """tip new generation""" |
55 """tip new generation""" |
51 ## search for untopiced heads of branch |
56 ## search for untopiced heads of branch |
52 # could be heads((::branch(x) - topic())) |
57 # could be heads((::branch(x) - topic())) |