diff --git a/hgext/rebase.py b/hgext/rebase.py index 6fe6defdc924d4ac9f0cbe97f2afd5b97b6e5c1e_aGdleHQvcmViYXNlLnB5..1f997134a9d1cb1957a5bc894c2ae4b78c74894e_aGdleHQvcmViYXNlLnB5 100644 --- a/hgext/rebase.py +++ b/hgext/rebase.py @@ -577,9 +577,11 @@ # there was nothing to rebase we force an update hg.update(repo, dest) else: + if opts.get('tool'): + raise util.Abort(_('--tool can only be used with --rebase')) orig(ui, repo, *args, **opts) def uisetup(ui): 'Replace pull with a decorator to provide --rebase option' entry = extensions.wrapcommand(commands.table, 'pull', pullrebase) entry[1].append(('', 'rebase', None, @@ -580,8 +582,9 @@ orig(ui, repo, *args, **opts) def uisetup(ui): 'Replace pull with a decorator to provide --rebase option' entry = extensions.wrapcommand(commands.table, 'pull', pullrebase) entry[1].append(('', 'rebase', None, - _("rebase working directory to branch head")) -) + _("rebase working directory to branch head"))) + entry[1].append(('t', 'tool', '', + _("specify merge tool for rebase")))