[PATCH] rebase: add option --tool/-t for 'pull --rebase'

[Adrian Buehlmann]

# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1306483409 -7200
# Node ID 5823fb9cab769ef0d70d0e05427ca8f7f04b65eb
# Parent  5b48ad1e7f1a0bb6e408993d50eb8959255834ea
rebase: add option --tool/-t for 'pull --rebase'

This makes 'pull --rebase' consistent with the merge command, which already
provides that option to control the merges

diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -577,11 +577,14 @@
                 # 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,
-                     _("rebase working directory to branch head"))
-)
+                     _("rebase working directory to branch head")))
+    entry[1].append(('t', 'tool', '',
+                     _("specify merge tool for rebase")))