Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fold: emit error message when folding a single revision
authorJordi Gutiérrez Hermoso <jordigh@octave.org>
Mon, 30 Jun 2014 10:25:08 -0400
changeset 995 0f3a7efd6ee9
parent 994 debf44fa91a2
child 996 b98dd5d3065c
fold: emit error message when folding a single revision Previously, a confusing error state would happen if the revision set to fold was a singleton.
hgext/evolve.py file | annotate | diff | comparison | revisions
tests/test-evolve.t file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Mon Jun 30 10:27:15 2014 -0400
+++ b/hgext/evolve.py	Mon Jun 30 10:25:08 2014 -0400
@@ -2099,6 +2099,11 @@
         revs = ()
     if not revs:
         raise util.Abort(_('no revisions specified'))
+
+    if len(revs) == 1:
+        ui.write_err(_('single revision specified, nothing to fold\n'))
+        return 1
+
     roots = repo.revs('roots(%ld)', revs)
     if len(roots) > 1:
         raise util.Abort("set has multiple roots")
--- a/tests/test-evolve.t	Mon Jun 30 10:27:15 2014 -0400
+++ b/tests/test-evolve.t	Mon Jun 30 10:25:08 2014 -0400
@@ -619,6 +619,9 @@
   $ hg fold 6 --rev 10
   abort: cannot specify both --rev and a target revision
   [255]
+  $ hg fold .
+  single revision specified, nothing to fold
+  [1]
   $ hg fold 6 # want to run hg fold 6
   2 changesets folded
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
evolve