# HG changeset patch # User Jordi GutiƩrrez Hermoso # Date 1404138308 14400 # Node ID 0f3a7efd6ee972acda2dcb9d96b825d2fdf9b007 # Parent debf44fa91a2000c49f54b4d3e9a2667c5fc1aec 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. diff -r debf44fa91a2 -r 0f3a7efd6ee9 hgext/evolve.py --- 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") diff -r debf44fa91a2 -r 0f3a7efd6ee9 tests/test-evolve.t --- 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