merge with stable
authorAugie Fackler <augie@google.com>
Mon, 14 Jan 2019 17:45:48 -0500
changeset 41215 6242a19004ca
parent 41214 8633c716f908 (current diff)
parent 41146 fbd168455b26 (diff)
child 41216 5cc5a5561c3f
merge with stable
--- a/mercurial/destutil.py	Sun Jan 13 17:56:02 2019 +0530
+++ b/mercurial/destutil.py	Mon Jan 14 17:45:48 2019 -0500
@@ -381,6 +381,8 @@
         revs = stack.getstack(repo)
     elif default:
         revs = scmutil.revrange(repo, [default])
+    else:
+        raise error.Abort(_("config option histedit.defaultrev can't be empty"))
 
     if revs:
         # Take the first revision of the revset as the root
--- a/tests/test-histedit-arguments.t	Sun Jan 13 17:56:02 2019 +0530
+++ b/tests/test-histedit-arguments.t	Mon Jan 14 17:45:48 2019 -0500
@@ -112,6 +112,13 @@
   > pick 08d98a8350f3 4 five
   > EOF
 
+Test invalid config default
+---------------------------
+
+  $ hg histedit --config "histedit.defaultrev="
+  abort: config option histedit.defaultrev can't be empty
+  [255]
+
 Run on a revision not descendants of the initial parent
 --------------------------------------------------------------------