[PATCH 3 of 6] rebase: move dest check down below other flag parsings
Ryan McElroy
rm at fb.com
Tue Mar 28 17:31:12 EDT 2017
# HG changeset patch
# User Ryan McElroy <rmcelroy at fb.com>
# Date 1490736312 25200
# Tue Mar 28 14:25:12 2017 -0700
# Node ID 409a87200f6b079c9bfe1e85fd0715822346c402
# Parent 976b28021f29ad7686ea57fb0fdff4bd17798a71
rebase: move dest check down below other flag parsings
diff --git a/hgext/rebase.py b/hgext/rebase.py
--- a/hgext/rebase.py
+++ b/hgext/rebase.py
@@ -685,12 +685,6 @@ def rebase(ui, repo, **opts):
# Validate input and define rebasing points
destf = opts.get('dest', None)
-
- if ui.configbool('commands', 'rebase.requiredest'):
- if not destf:
- raise error.Abort(_('you must specify a destination'),
- hint=_('use: hg rebase -d REV'))
-
srcf = opts.get('source', None)
basef = opts.get('base', None)
revf = opts.get('rev', [])
@@ -710,6 +704,11 @@ def rebase(ui, repo, **opts):
"'histedit' extension (see \"%s\")") % help
raise error.Abort(msg)
+ if ui.configbool('commands', 'rebase.requiredest'):
+ if not destf:
+ raise error.Abort(_('you must specify a destination'),
+ hint=_('use: hg rebase -d REV'))
+
if rbsrt.collapsemsg and not rbsrt.collapsef:
raise error.Abort(
_('message can only be specified with collapse'))
More information about the Mercurial-devel
mailing list