equal
deleted
inserted
replaced
36 raise error.Abort(_("topic '%s' has %d heads - " |
36 raise error.Abort(_("topic '%s' has %d heads - " |
37 "please merge with an explicit rev") |
37 "please merge with an explicit rev") |
38 % (top, len(heads))) |
38 % (top, len(heads))) |
39 else: |
39 else: |
40 assert False # that's impossible |
40 assert False # that's impossible |
41 if orig.func_default: # version above hg-3.7 |
41 if getattr(orig, 'func_default', ()): # version above hg-3.7 |
42 return orig(repo, action, sourceset, onheadcheck) |
42 return orig(repo, action, sourceset, onheadcheck) |
43 else: |
43 else: |
44 return orig(repo) |
44 return orig(repo) |
45 |
45 |
46 def _destupdatetopic(repo, clean, check): |
46 def _destupdatetopic(repo, clean, check): |