Mercurial > hg > evolve

changeset 1239:160fd06312fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncommit: abort when rev specifies the current changeset The uncommit command now fails when the rev argument indicates the current changeset. Previously this aborted in the changeset obsolescence machinery when the current commit tries to obsolete itself. Using the rev argument like this indicates a misunderstanding, so printing an uncommit-specific error should make it easier to understand what went wrong.
author Nathan Goldbaum <ngoldbau@ucsc.edu>
date Tue, 28 Oct 2014 18:06:28 -0700
parents 9d85fd6e1474
children b2a78b950a51
files hgext/evolve.py tests/test-uncommit.t
diffstat 2 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1987,6 +1987,9 @@
         rev = None
         if opts.get('rev'):
             rev = scmutil.revsingle(repo, opts.get('rev'))
+            ctx = repo[None]
+            if ctx.p1() == rev or ctx.p2() == rev:
+                raise util.Abort(_("cannot uncommit to parent changeset"))
 
         # Recommit the filtered changeset
         tr = repo.transaction('uncommit')
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -347,6 +347,9 @@
   $ hg cat b --rev 0
   b: no such file in rev 07f494440405
   [1]
+  $ hg uncommit --rev . b
+  abort: cannot uncommit to parent changeset
+  [255]
   $ hg uncommit --rev 0 b
   $ hg cat b --rev .
   b: no such file in rev 5b27f6b17da2