Mercurial > hg-stable
changeset 14444:1f997134a9d1
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
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Fri, 27 May 2011 10:03:29 +0200 |
| parents | 6fe6defdc924 |
| children | 61f51f4a9a3b |
| files | hgext/rebase.py |
| diffstat | 1 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Fri May 27 11:01:44 2011 +0200 +++ b/hgext/rebase.py Fri May 27 10:03:29 2011 +0200 @@ -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")))