# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 2011-05-27 08:03:29
# Node ID 1f997134a9d1cb1957a5bc894c2ae4b78c74894e
# Parent  6fe6defdc924d4ac9f0cbe97f2afd5b97b6e5c1e

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 @@ def pullrebase(orig, ui, repo, *args, **
                 # 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")))