[PATCH 2 of 2] rebase: don't require destination if commands.rebase.requiredest=False

Martin von Zweigbergk martinvonz at google.com
Fri Mar 24 19:35:08 EDT 2017


# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1490397610 25200
#      Fri Mar 24 16:20:10 2017 -0700
# Node ID ccac4af8923796bf53dba045d574dcfd68665fff
# Parent  d2674430b3d3eea1259e4fe2c1d7da539db9454f
rebase: don't require destination if commands.rebase.requiredest=False

diff -r d2674430b3d3 -r ccac4af89237 hgext/rebase.py
--- a/hgext/rebase.py	Fri Mar 24 16:20:04 2017 -0700
+++ b/hgext/rebase.py	Fri Mar 24 16:20:10 2017 -0700
@@ -686,7 +686,7 @@
         # Validate input and define rebasing points
         destf = opts.get('dest', None)
 
-        if ui.config('commands', 'rebase.requiredest'):
+        if ui.configbool('commands', 'rebase.requiredest'):
             if not destf:
                 raise error.Abort(_('you must specify a destination'),
                                   hint=_('use: hg rebase -d REV'))
diff -r d2674430b3d3 -r ccac4af89237 tests/test-rebase-base.t
--- a/tests/test-rebase-base.t	Fri Mar 24 16:20:04 2017 -0700
+++ b/tests/test-rebase-base.t	Fri Mar 24 16:20:10 2017 -0700
@@ -419,6 +419,5 @@
   saved backup bundle to $TESTTMP/repo/.hg/strip-backup/889b0bc6a730-41ec4f81-backup.hg (glob)
   $ hg rebase -d 0 -r . -q
   $ hg --config commands.rebase.requiredest=False rebase
-  abort: you must specify a destination
-  (use: hg rebase -d REV)
-  [255]
+  rebasing 2:279de9495438 "cc" (tip)
+  saved backup bundle to $TESTTMP/repo/.hg/strip-backup/279de9495438-ab0a5128-backup.hg (glob)


More information about the Mercurial-devel mailing list