errors: use InputError in uncommit extension

Differential Revision: https://phab.mercurial-scm.org/D9911

hgext/uncommit.py

@@ -1,318 +1,318 b''
 # uncommit - undo the actions of a commit
 #
 # Copyright 2011 Peter Arrenbrecht <[e-mail]>
 #                Logilab SA        <[e-mail]>
 #                Pierre-Yves David <[e-mail]>
 #                Patrick Mezard <[e-mail]>
 # Copyright 2016 Facebook, Inc.
 #
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
 """uncommit part or all of a local changeset (EXPERIMENTAL)
 
 This command undoes the effect of a local commit, returning the affected
 files to their uncommitted state. This means that files modified, added or
 removed in the changeset will be left unchanged, and so will remain modified,
 added and removed in the working directory.
 """
 
 from __future__ import absolute_import
 
 from mercurial.i18n import _
 from mercurial.node import nullid
 
 from mercurial import (
     cmdutil,
     commands,
     context,
     copies as copiesmod,
     error,
     obsutil,
     pathutil,
     pycompat,
     registrar,
     rewriteutil,
     scmutil,
 )
 
 cmdtable = {}
 command = registrar.command(cmdtable)
 
 configtable = {}
 configitem = registrar.configitem(configtable)
 
 configitem(
     b'experimental',
     b'uncommitondirtywdir',
     default=False,
 )
 configitem(
     b'experimental',
     b'uncommit.keep',
     default=False,
 )
 
 # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
 # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
 # be specifying the version(s) of Mercurial they are tested with, or
 # leave the attribute unspecified.
 testedwith = b'ships-with-hg-core'
 
 
 def _commitfiltered(
     repo, ctx, match, keepcommit, message=None, user=None, date=None
 ):
     """Recommit ctx with changed files not in match. Return the new
     node identifier, or None if nothing changed.
     """
     base = ctx.p1()
     # ctx
     initialfiles = set(ctx.files())
     exclude = {f for f in initialfiles if match(f)}
 
     # No files matched commit, so nothing excluded
     if not exclude:
         return None
 
     # return the p1 so that we don't create an obsmarker later
     if not keepcommit:
         return ctx.p1().node()
 
     files = initialfiles - exclude
     # Filter copies
     copied = copiesmod.pathcopies(base, ctx)
     copied = {
         dst: src for dst, src in pycompat.iteritems(copied) if dst in files
     }
 
     def filectxfn(repo, memctx, path, contentctx=ctx, redirect=()):
         if path not in contentctx:
             return None
         fctx = contentctx[path]
         mctx = context.memfilectx(
             repo,
             memctx,
             fctx.path(),
             fctx.data(),
             fctx.islink(),
             fctx.isexec(),
             copysource=copied.get(path),
         )
         return mctx
 
     if not files:
         repo.ui.status(_(b"note: keeping empty commit\n"))
 
     if message is None:
         message = ctx.description()
     if not user:
         user = ctx.user()
     if not date:
         date = ctx.date()
 
     new = context.memctx(
         repo,
         parents=[base.node(), nullid],
         text=message,
         files=files,
         filectxfn=filectxfn,
         user=user,
         date=date,
         extra=ctx.extra(),
     )
     return repo.commitctx(new)
 
 
 @command(
     b'uncommit',
     [
         (b'', b'keep', None, _(b'allow an empty commit after uncommitting')),
         (
             b'',
             b'allow-dirty-working-copy',
             False,
             _(b'allow uncommit with outstanding changes'),
         ),
         (b'n', b'note', b'', _(b'store a note on uncommit'), _(b'TEXT')),
     ]
     + commands.walkopts
     + commands.commitopts
     + commands.commitopts2
     + commands.commitopts3,
     _(b'[OPTION]... [FILE]...'),
     helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
 )
 def uncommit(ui, repo, *pats, **opts):
     """uncommit part or all of a local changeset
 
     This command undoes the effect of a local commit, returning the affected
     files to their uncommitted state. This means that files modified or
     deleted in the changeset will be left unchanged, and so will remain
     modified in the working directory.
 
     If no files are specified, the commit will be pruned, unless --keep is
     given.
     """
     opts = pycompat.byteskwargs(opts)
 
     cmdutil.checknotesize(ui, opts)
     cmdutil.resolvecommitoptions(ui, opts)
 
     with repo.wlock(), repo.lock():
 
         st = repo.status()
         m, a, r, d = st.modified, st.added, st.removed, st.deleted
         isdirtypath = any(set(m + a + r + d) & set(pats))
         allowdirtywcopy = opts[
             b'allow_dirty_working_copy'
         ] or repo.ui.configbool(b'experimental', b'uncommitondirtywdir')
         if not allowdirtywcopy and (not pats or isdirtypath):
             cmdutil.bailifchanged(
                 repo,
                 hint=_(b'requires --allow-dirty-working-copy to uncommit'),
             )
         old = repo[b'.']
         rewriteutil.precheck(repo, [old.rev()], b'uncommit')
         if len(old.parents()) > 1:
-            raise error.Abort(_(b"cannot uncommit merge changeset"))
+            raise error.InputError(_(b"cannot uncommit merge changeset"))
 
         match = scmutil.match(old, pats, opts)
 
         # Check all explicitly given files; abort if there's a problem.
         if match.files():
             s = old.status(old.p1(), match, listclean=True)
             eligible = set(s.added) | set(s.modified) | set(s.removed)
 
             badfiles = set(match.files()) - eligible
 
             # Naming a parent directory of an eligible file is OK, even
             # if not everything tracked in that directory can be
             # uncommitted.
             if badfiles:
                 badfiles -= {f for f in pathutil.dirs(eligible)}
 
             for f in sorted(badfiles):
                 if f in s.clean:
                     hint = _(
                         b"file was not changed in working directory parent"
                     )
                 elif repo.wvfs.exists(f):
                     hint = _(b"file was untracked in working directory parent")
                 else:
                     hint = _(b"file does not exist")
 
-                raise error.Abort(
+                raise error.InputError(
                     _(b'cannot uncommit "%s"') % scmutil.getuipathfn(repo)(f),
                     hint=hint,
                 )
 
         with repo.transaction(b'uncommit'):
             if not (opts[b'message'] or opts[b'logfile']):
                 opts[b'message'] = old.description()
             message = cmdutil.logmessage(ui, opts)
 
             keepcommit = pats
             if not keepcommit:
                 if opts.get(b'keep') is not None:
                     keepcommit = opts.get(b'keep')
                 else:
                     keepcommit = ui.configbool(
                         b'experimental', b'uncommit.keep'
                     )
             newid = _commitfiltered(
                 repo,
                 old,
                 match,
                 keepcommit,
                 message=message,
                 user=opts.get(b'user'),
                 date=opts.get(b'date'),
             )
             if newid is None:
                 ui.status(_(b"nothing to uncommit\n"))
                 return 1
 
             mapping = {}
             if newid != old.p1().node():
                 # Move local changes on filtered changeset
                 mapping[old.node()] = (newid,)
             else:
                 # Fully removed the old commit
                 mapping[old.node()] = ()
 
             with repo.dirstate.parentchange():
                 scmutil.movedirstate(repo, repo[newid], match)
 
             scmutil.cleanupnodes(repo, mapping, b'uncommit', fixphase=True)
 
 
 def predecessormarkers(ctx):
     """yields the obsolete markers marking the given changeset as a successor"""
     for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):
         yield obsutil.marker(ctx.repo(), data)
 
 
 @command(
     b'unamend',
     [],
     helpcategory=command.CATEGORY_CHANGE_MANAGEMENT,
     helpbasic=True,
 )
 def unamend(ui, repo, **opts):
     """undo the most recent amend operation on a current changeset
 
     This command will roll back to the previous version of a changeset,
     leaving working directory in state in which it was before running
     `hg amend` (e.g. files modified as part of an amend will be
     marked as modified `hg status`)
     """
 
     unfi = repo.unfiltered()
     with repo.wlock(), repo.lock(), repo.transaction(b'unamend'):
 
         # identify the commit from which to unamend
         curctx = repo[b'.']
 
         rewriteutil.precheck(repo, [curctx.rev()], b'unamend')
 
         # identify the commit to which to unamend
         markers = list(predecessormarkers(curctx))
         if len(markers) != 1:
             e = _(b"changeset must have one predecessor, found %i predecessors")
-            raise error.Abort(e % len(markers))
+            raise error.InputError(e % len(markers))
 
         prednode = markers[0].prednode()
         predctx = unfi[prednode]
 
         # add an extra so that we get a new hash
         # note: allowing unamend to undo an unamend is an intentional feature
         extras = predctx.extra()
         extras[b'unamend_source'] = curctx.hex()
 
         def filectxfn(repo, ctx_, path):
             try:
                 return predctx.filectx(path)
             except KeyError:
                 return None
 
         # Make a new commit same as predctx
         newctx = context.memctx(
             repo,
             parents=(predctx.p1(), predctx.p2()),
             text=predctx.description(),
             files=predctx.files(),
             filectxfn=filectxfn,
             user=predctx.user(),
             date=predctx.date(),
             extra=extras,
         )
         newprednode = repo.commitctx(newctx)
         newpredctx = repo[newprednode]
         dirstate = repo.dirstate
 
         with dirstate.parentchange():
             scmutil.movedirstate(repo, newpredctx)
 
         mapping = {curctx.node(): (newprednode,)}
         scmutil.cleanupnodes(repo, mapping, b'unamend', fixphase=True)

tests/test-unamend.t

@@ -1,421 +1,421 b''
 Test for command `hg unamend` which lives in uncommit extension
 ===============================================================
 
   $ cat >> $HGRCPATH << EOF
   > [alias]
   > glog = log -G -T '{rev}:{node|short}  {desc}'
   > [experimental]
   > evolution = createmarkers, allowunstable
   > [extensions]
   > rebase =
   > amend =
   > uncommit =
   > EOF
 
 Repo Setup
 
   $ hg init repo
   $ cd repo
   $ for ch in a b c d e f g h; do touch $ch; echo "foo" >> $ch; hg ci -Aqm "Added "$ch; done
 
   $ hg glog
   @  7:ec2426147f0e  Added h
   |
   o  6:87d6d6676308  Added g
   |
   o  5:825660c69f0c  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
 Trying to unamend when there was no amend done
 
   $ hg unamend
   abort: changeset must have one predecessor, found 0 predecessors
-  [255]
+  [10]
 
 Unamend on clean wdir and tip
 
   $ echo "bar" >> h
   $ hg amend
 
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID c9fa1a715c1b7661c0fafb362a9f30bd75878d7d
   # Parent  87d6d66763085b629e6d7ed56778c79827273022
   Added h
   
   diff -r 87d6d6676308 -r c9fa1a715c1b h
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
   +foo
   +bar
 
   $ hg glog --hidden
   @  8:c9fa1a715c1b  Added h
   |
   | x  7:ec2426147f0e  Added h
   |/
   o  6:87d6d6676308  Added g
   |
   o  5:825660c69f0c  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
   $ hg unamend
   $ hg glog --hidden
   @  9:46d02d47eec6  Added h
   |
   | x  8:c9fa1a715c1b  Added h
   |/
   | x  7:ec2426147f0e  Added h
   |/
   o  6:87d6d6676308  Added g
   |
   o  5:825660c69f0c  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
   $ hg diff
   diff -r 46d02d47eec6 h
   --- a/h	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    foo
   +bar
 
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 46d02d47eec6ca096b8dcab3f8f5579c40c3dd9a
   # Parent  87d6d66763085b629e6d7ed56778c79827273022
   Added h
   
   diff -r 87d6d6676308 -r 46d02d47eec6 h
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +foo
 
   $ hg status
   M h
 
   $ hg log -r . -T '{extras % "{extra}\n"}' --config alias.log=log
   branch=default
   unamend_source=c9fa1a715c1b7661c0fafb362a9f30bd75878d7d
 
 Using unamend to undo an unamed (intentional)
 
   $ hg unamend
   $ hg exp
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 850ddfc1bc662997ec6094ada958f01f0cc8070a
   # Parent  87d6d66763085b629e6d7ed56778c79827273022
   Added h
   
   diff -r 87d6d6676308 -r 850ddfc1bc66 h
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/h	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
   +foo
   +bar
   $ hg diff
 
 Unamend on a dirty working directory
 
   $ echo "bar" >> a
   $ hg amend
   $ echo "foobar" >> a
   $ echo "bar" >> b
   $ hg status
   M a
   M b
 
   $ hg unamend
 
   $ hg status
   M a
   M b
 
   $ hg diff
   diff -r ec338db45d51 a
   --- a/a	Thu Jan 01 00:00:00 1970 +0000
   +++ b/a	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,3 @@
    foo
   +bar
   +foobar
   diff -r ec338db45d51 b
   --- a/b	Thu Jan 01 00:00:00 1970 +0000
   +++ b/b	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,2 @@
    foo
   +bar
 
 Unamending an added file
 
   $ hg ci -m "Added things to a and b"
   $ echo foo > bar
   $ hg add bar
   $ hg amend
 
   $ hg unamend
   $ hg status
   A bar
 
   $ hg revert --all
   forgetting bar
 
 Unamending a removed file
 
   $ hg remove a
   $ hg amend
 
   $ hg unamend
   $ hg status
   R a
   ? bar
 
   $ hg revert --all
   undeleting a
 
 Unamending an added file with dirty wdir status
 
   $ hg add bar
   $ hg amend
   $ echo bar >> bar
   $ hg status
   M bar
 
   $ hg unamend
   $ hg status
   A bar
   $ hg diff
   diff -r 7f79409af972 bar
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/bar	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,2 @@
   +foo
   +bar
 
   $ hg revert --all
   forgetting bar
   $ rm bar
 
 Unamending in middle of a stack
 
   $ hg glog
   @  19:7f79409af972  Added things to a and b
   |
   o  12:ec338db45d51  Added h
   |
   o  6:87d6d6676308  Added g
   |
   o  5:825660c69f0c  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
   $ hg up 5
   2 files updated, 0 files merged, 2 files removed, 0 files unresolved
   $ echo bar >> f
   $ hg amend
   3 new orphan changesets
   $ hg rebase -s 6 -d . -q
 
   $ hg glog
   o  23:03ddd6fc5af1  Added things to a and b
   |
   o  22:3e7b64ee157b  Added h
   |
   o  21:49635b68477e  Added g
   |
   @  20:93f0e8ffab32  Added f
   |
   o  4:aa98ab95a928  Added e
   |
   o  3:62615734edd5  Added d
   |
   o  2:28ad74487de9  Added c
   |
   o  1:29becc82797a  Added b
   |
   o  0:18d04c59bb5d  Added a
   
 
   $ hg --config experimental.evolution=createmarkers unamend
   abort: cannot unamend changeset with children
   [10]
 
   $ hg unamend
   3 new orphan changesets
 
 Trying to unamend a public changeset
 
   $ hg up -C 23
   5 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg phase -r . -p
   1 new phase-divergent changesets
   $ hg unamend
   abort: cannot unamend public changesets
   (see 'hg help phases' for details)
   [10]
 
 Testing whether unamend retains copies or not
 
   $ hg status
 
   $ hg mv a foo
 
   $ hg ci -m "Moved a to foo"
   $ hg exp --git
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID cfef290346fbee5126313d7e1aab51d877679b09
   # Parent  03ddd6fc5af19e028c44a2fd6d790dd22712f231
   Moved a to foo
   
   diff --git a/a b/foo
   rename from a
   rename to foo
 
   $ hg mv b foobar
   $ hg diff --git
   diff --git a/b b/foobar
   rename from b
   rename to foobar
   $ hg amend
 
   $ hg exp --git
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID eca050985275bb271ce3092b54e56ea5c85d29a3
   # Parent  03ddd6fc5af19e028c44a2fd6d790dd22712f231
   Moved a to foo
   
   diff --git a/a b/foo
   rename from a
   rename to foo
   diff --git a/b b/foobar
   rename from b
   rename to foobar
 
   $ hg mv c wat
   $ hg unamend
 
   $ hg verify -v
   repository uses revlog format 1
   checking changesets
   checking manifests
   crosschecking files in changesets and manifests
   checking files
   checked 28 changesets with 16 changes to 11 files
 
 Retained copies in new prdecessor commit
 
   $ hg exp --git
   # HG changeset patch
   # User test
   # Date 0 0
   #      Thu Jan 01 00:00:00 1970 +0000
   # Node ID 552e3af4f01f620f88ca27be1f898316235b736a
   # Parent  03ddd6fc5af19e028c44a2fd6d790dd22712f231
   Moved a to foo
   
   diff --git a/a b/foo
   rename from a
   rename to foo
 
 Retained copies in working directoy
 
   $ hg diff --git
   diff --git a/b b/foobar
   rename from b
   rename to foobar
   diff --git a/c b/wat
   rename from c
   rename to wat
   $ hg revert -qa
   $ rm foobar wat
 
 Rename a->b, then amend b->c. After unamend, should look like b->c.
 
   $ hg co -q 0
   $ hg mv a b
   $ hg ci -qm 'move to a b'
   $ hg mv b c
   $ hg amend
   $ hg unamend
   $ hg st --copies --change .
   A b
     a
   R a
   $ hg st --copies
   A c
     b
   R b
   $ hg revert -qa
   $ rm c
 
 Rename a->b, then amend b->c, and working copy change c->d. After unamend, should look like b->d
 
   $ hg co -q 0
   $ hg mv a b
   $ hg ci -qm 'move to a b'
   warning: commit already existed in the repository!
   $ hg mv b c
   $ hg amend
   warning: commit already existed in the repository!
   $ hg mv c d
   $ hg unamend
   $ hg st --copies --change .
   A b
     a
   R a
   $ hg st --copies
   A d
     b
   R b

tests/test-uncommit.t

@@ -1,596 +1,596 b''
 Test uncommit - set up the config
 
   $ cat >> $HGRCPATH <<EOF
   > [experimental]
   > evolution.createmarkers=True
   > evolution.allowunstable=True
   > [extensions]
   > uncommit =
   > drawdag=$TESTDIR/drawdag.py
   > EOF
 
 Build up a repo
 
   $ hg init repo
   $ cd repo
   $ hg bookmark foo
 
 Help for uncommit
 
   $ hg help uncommit
   hg uncommit [OPTION]... [FILE]...
   
   uncommit part or all of a local changeset
   
       This command undoes the effect of a local commit, returning the affected
       files to their uncommitted state. This means that files modified or
       deleted in the changeset will be left unchanged, and so will remain
       modified in the working directory.
   
       If no files are specified, the commit will be pruned, unless --keep is
       given.
   
   (use 'hg help -e uncommit' to show help for the uncommit extension)
   
   options ([+] can be repeated):
   
       --keep                     allow an empty commit after uncommitting
       --allow-dirty-working-copy allow uncommit with outstanding changes
    -n --note TEXT                store a note on uncommit
    -I --include PATTERN [+]      include names matching the given patterns
    -X --exclude PATTERN [+]      exclude names matching the given patterns
    -m --message TEXT             use text as commit message
    -l --logfile FILE             read commit message from file
    -d --date DATE                record the specified date as commit date
    -u --user USER                record the specified user as committer
    -D --currentdate              record the current date as commit date
    -U --currentuser              record the current user as committer
   
   (some details hidden, use --verbose to show complete help)
 
 Uncommit with no commits should fail
 
   $ hg uncommit
   abort: cannot uncommit null changeset
   (no changeset checked out)
   [10]
 
 Create some commits
 
   $ touch files
   $ hg add files
   $ for i in a ab abc abcd abcde; do echo $i > files; echo $i > file-$i; hg add file-$i; hg commit -m "added file-$i"; done
   $ ls -A
   .hg
   file-a
   file-ab
   file-abc
   file-abcd
   file-abcde
   files
 
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @  4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
   |
   o  3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
   |
   o  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
   |
   o  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
   |
   o  0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
   
 Simple uncommit off the top, also moves bookmark
 
   $ hg bookmark
    * foo                       4:6c4fd43ed714
   $ hg uncommit
   $ hg status
   M files
   A file-abcde
   $ hg bookmark
    * foo                       3:6db330d65db4
 
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   x  4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
   |
   @  3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
   |
   o  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
   |
   o  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
   |
   o  0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
   
 
 Recommit
 
   $ hg commit -m 'new change abcde'
   $ hg status
   $ hg heads -T '{rev}:{node} {desc}'
   5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde (no-eol)
 
 Uncommit of non-existent and unchanged files aborts
   $ hg uncommit nothinghere
   abort: cannot uncommit "nothinghere"
   (file does not exist)
-  [255]
+  [10]
   $ hg status
   $ hg uncommit file-abc
   abort: cannot uncommit "file-abc"
   (file was not changed in working directory parent)
-  [255]
+  [10]
   $ hg status
 
 Try partial uncommit, also moves bookmark
 
   $ hg bookmark
    * foo                       5:0c07a3ccda77
   $ hg uncommit files
   $ hg status
   M files
   $ hg bookmark
    * foo                       6:3727deee06f7
   $ hg heads -T '{rev}:{node} {desc}'
   6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde (no-eol)
   $ hg log -r . -p -T '{rev}:{node} {desc}'
   6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcdediff -r 6db330d65db4 -r 3727deee06f7 file-abcde
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file-abcde	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +abcde
   
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @  6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
   |
   | x  5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
   |/
   | x  4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
   |/
   o  3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
   |
   o  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
   |
   o  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
   |
   o  0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
   
   $ hg commit -m 'update files for abcde'
 
 Uncommit with dirty state
 
   $ echo "foo" >> files
   $ cat files
   abcde
   foo
   $ hg status
   M files
   $ hg uncommit
   abort: uncommitted changes
   (requires --allow-dirty-working-copy to uncommit)
   [20]
   $ hg uncommit files
   abort: uncommitted changes
   (requires --allow-dirty-working-copy to uncommit)
   [20]
   $ cat files
   abcde
   foo
   $ hg commit --amend -m "files abcde + foo"
 
 Testing the 'experimental.uncommitondirtywdir' config
 
   $ echo "bar" >> files
   $ hg uncommit
   abort: uncommitted changes
   (requires --allow-dirty-working-copy to uncommit)
   [20]
   $ hg uncommit --config experimental.uncommitondirtywdir=True
   $ hg commit -m "files abcde + foo"
 
 Uncommit in the middle of a stack, does not move bookmark
 
   $ hg checkout '.^^^'
   1 files updated, 0 files merged, 2 files removed, 0 files unresolved
   (leaving bookmark foo)
   $ hg log -r . -p -T '{rev}:{node} {desc}'
   2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abcdiff -r 69a232e754b0 -r abf2df566fc1 file-abc
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file-abc	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +abc
   diff -r 69a232e754b0 -r abf2df566fc1 files
   --- a/files	Thu Jan 01 00:00:00 1970 +0000
   +++ b/files	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -ab
   +abc
   
   $ hg bookmark
      foo                       9:48e5bd7cd583
   $ hg uncommit
   3 new orphan changesets
   $ hg status
   M files
   A file-abc
   $ hg heads -T '{rev}:{node} {desc}'
   9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo (no-eol)
   $ hg bookmark
      foo                       9:48e5bd7cd583
   $ hg commit -m 'new abc'
   created new head
 
 Partial uncommit in the middle, does not move bookmark
 
   $ hg checkout '.^'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg log -r . -p -T '{rev}:{node} {desc}'
   1:69a232e754b08d568c4899475faf2eb44b857802 added file-abdiff -r 3004d2d9b508 -r 69a232e754b0 file-ab
   --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
   +++ b/file-ab	Thu Jan 01 00:00:00 1970 +0000
   @@ -0,0 +1,1 @@
   +ab
   diff -r 3004d2d9b508 -r 69a232e754b0 files
   --- a/files	Thu Jan 01 00:00:00 1970 +0000
   +++ b/files	Thu Jan 01 00:00:00 1970 +0000
   @@ -1,1 +1,1 @@
   -a
   +ab
   
   $ hg bookmark
      foo                       9:48e5bd7cd583
   $ hg uncommit file-ab
   1 new orphan changesets
   $ hg status
   A file-ab
 
   $ hg heads -T '{rev}:{node} {desc}\n'
   11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
   10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
   9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
 
   $ hg bookmark
      foo                       9:48e5bd7cd583
   $ hg commit -m 'update ab'
   $ hg status
   $ hg heads -T '{rev}:{node} {desc}\n'
   12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
   10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
   9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
 
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @  12:f21039c59242b085491bb58f591afc4ed1c04c09 update ab
   |
   o  11:8eb87968f2edb7f27f27fe676316e179de65fff6 added file-ab
   |
   | *  10:5dc89ca4486f8a88716c5797fa9f498d13d7c2e1 new abc
   | |
   | | *  9:48e5bd7cd583eb24164ef8b89185819c84c96ed7 files abcde + foo
   | | |
   | | | x  8:84beeba0ac30e19521c036e4d2dd3a5fa02586ff files abcde + foo
   | | |/
   | | | x  7:0977fa602c2fd7d8427ed4e7ee15ea13b84c9173 update files for abcde
   | | |/
   | | *  6:3727deee06f72f5ffa8db792ee299cf39e3e190b new change abcde
   | | |
   | | | x  5:0c07a3ccda771b25f1cb1edbd02e683723344ef1 new change abcde
   | | |/
   | | | x  4:6c4fd43ed714e7fcd8adbaa7b16c953c2e985b60 added file-abcde
   | | |/
   | | *  3:6db330d65db434145c0b59d291853e9a84719b24 added file-abcd
   | | |
   | | x  2:abf2df566fc193b3ac34d946e63c1583e4d4732b added file-abc
   | |/
   | x  1:69a232e754b08d568c4899475faf2eb44b857802 added file-ab
   |/
   o  0:3004d2d9b50883c1538fc754a3aeb55f1b4084f6 added file-a
   
 Uncommit with draft parent
 
   $ hg uncommit
   $ hg phase -r .
   11: draft
   $ hg commit -m 'update ab again'
 
 Phase is preserved
 
   $ hg uncommit --keep --config phases.new-commit=secret
   note: keeping empty commit
   $ hg phase -r .
   14: draft
   $ hg commit --amend -m 'update ab again'
 
 Uncommit with public parent
 
   $ hg phase -p "::.^"
   $ hg uncommit
   $ hg phase -r .
   11: public
 
 Partial uncommit with public parent
 
   $ echo xyz > xyz
   $ hg add xyz
   $ hg commit -m "update ab and add xyz"
   $ hg uncommit xyz
   $ hg status
   A xyz
   $ hg phase -r .
   17: draft
   $ hg phase -r ".^"
   11: public
 
 Uncommit with --keep or experimental.uncommit.keep leaves an empty changeset
 
   $ cd $TESTTMP
   $ hg init repo1
   $ cd repo1
   $ hg debugdrawdag <<'EOS'
   > Q
   > |
   > P
   > EOS
   $ hg up Q -q
   $ hg uncommit --keep
   note: keeping empty commit
   $ hg log -G -T '{desc} FILES: {files}'
   @  Q FILES:
   |
   | x  Q FILES: Q
   |/
   o  P FILES: P
   
   $ cat >> .hg/hgrc <<EOF
   > [experimental]
   > uncommit.keep=True
   > EOF
   $ hg ci --amend
   $ hg uncommit
   note: keeping empty commit
   $ hg log -G -T '{desc} FILES: {files}'
   @  Q FILES:
   |
   | x  Q FILES: Q
   |/
   o  P FILES: P
   
   $ hg status
   A Q
   $ hg ci --amend
   $ hg uncommit --no-keep
   $ hg log -G -T '{desc} FILES: {files}'
   x  Q FILES: Q
   |
   @  P FILES: P
   
   $ hg status
   A Q
   $ cd ..
   $ rm -rf repo1
 
 Testing uncommit while merge
 
   $ hg init repo2
   $ cd repo2
 
 Create some history
 
   $ touch a
   $ hg add a
   $ for i in 1 2 3; do echo $i > a; hg commit -m "a $i"; done
   $ hg checkout 0
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ touch b
   $ hg add b
   $ for i in 1 2 3; do echo $i > b; hg commit -m "b $i"; done
   created new head
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @  5:2cd56cdde163ded2fbb16ba2f918c96046ab0bf2 b 3
   |
   o  4:c3a0d5bb3b15834ffd2ef9ef603e93ec65cf2037 b 2
   |
   o  3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1
   |
   | o  2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3
   | |
   | o  1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2
   |/
   o  0:ea4e33293d4d274a2ba73150733c2612231f398c a 1
   
 
 Add and expect uncommit to fail on both merge working dir and merge changeset
 
   $ hg merge 2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (branch merge, don't forget to commit)
 
   $ hg uncommit
   abort: outstanding uncommitted merge
   (requires --allow-dirty-working-copy to uncommit)
   [20]
 
   $ hg uncommit --config experimental.uncommitondirtywdir=True
   abort: cannot uncommit while merging
   [20]
 
   $ hg status
   M a
   $ hg commit -m 'merge a and b'
 
   $ hg uncommit
   abort: cannot uncommit merge changeset
-  [255]
+  [10]
 
   $ hg status
   $ hg log -G -T '{rev}:{node} {desc}' --hidden
   @    6:c03b9c37bc67bf504d4912061cfb527b47a63c6e merge a and b
   |\
   | o  5:2cd56cdde163ded2fbb16ba2f918c96046ab0bf2 b 3
   | |
   | o  4:c3a0d5bb3b15834ffd2ef9ef603e93ec65cf2037 b 2
   | |
   | o  3:49bb009ca26078726b8870f1edb29fae8f7618f5 b 1
   | |
   o |  2:990982b7384266e691f1bc08ca36177adcd1c8a9 a 3
   | |
   o |  1:24d38e3cf160c7b6f5ffe82179332229886a6d34 a 2
   |/
   o  0:ea4e33293d4d274a2ba73150733c2612231f398c a 1
   
 
 Rename a->b, then remove b in working copy. Result should remove a.
 
   $ hg co -q 0
   $ hg mv a b
   $ hg ci -qm 'move a to b'
   $ hg rm b
   $ hg uncommit --config experimental.uncommitondirtywdir=True
   $ hg st --copies
   R a
   $ hg revert a
 
 Rename a->b, then rename b->c in working copy. Result should rename a->c.
 
   $ hg co -q 0
   $ hg mv a b
   $ hg ci -qm 'move a to b'
   $ hg mv b c
   $ hg uncommit --config experimental.uncommitondirtywdir=True
   $ hg st --copies
   A c
     a
   R a
   $ hg revert a
   $ hg forget c
   $ rm c
 
 Copy a->b1 and a->b2, then rename b1->c in working copy. Result should copy a->b2 and a->c.
 
   $ hg co -q 0
   $ hg cp a b1
   $ hg cp a b2
   $ hg ci -qm 'move a to b1 and b2'
   $ hg mv b1 c
   $ hg uncommit --config experimental.uncommitondirtywdir=True
   $ hg st --copies
   A b2
     a
   A c
     a
   $ cd ..
 
 --allow-dirty-working-copy should also work on a dirty PATH
 
   $ hg init issue5977
   $ cd issue5977
   $ echo 'super critical info!' > a
   $ hg ci -Am 'add a'
   adding a
   $ echo 'foo' > b
   $ hg add b
   $ hg status
   A b
   $ hg uncommit a
   note: keeping empty commit
   $ cat a
   super critical info!
   $ hg log
   changeset:   1:656ba143d384
   tag:         tip
   parent:      -1:000000000000
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a
   
   $ hg ci -Am 'add b'
   $ echo 'foo bar' > b
   $ hg uncommit b
   abort: uncommitted changes
   (requires --allow-dirty-working-copy to uncommit)
   [20]
   $ hg uncommit --allow-dirty-working-copy b
   $ hg log
   changeset:   3:30fa958635b2
   tag:         tip
   parent:      1:656ba143d384
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add b
   
   changeset:   1:656ba143d384
   parent:      -1:000000000000
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
   summary:     add a
   
 Removes can be uncommitted
 
   $ hg ci -m 'modified b'
   $ hg rm b
   $ hg ci -m 'remove b'
   $ hg uncommit b
   note: keeping empty commit
   $ hg status
   R b
 
 Uncommitting a directory won't run afoul of the checks that an explicit file
 can be uncommitted.
 
   $ mkdir dir
   $ echo 1 > dir/file.txt
   $ hg ci -Aqm 'add file in directory'
   $ hg uncommit dir -m 'uncommit with message' -u 'different user' \
   >                 -d 'Jun 30 12:12:12 1980 +0000'
   $ hg status
   A dir/file.txt
   $ hg log -r .
   changeset:   8:b4dd26dc42e0
   tag:         tip
   parent:      6:2278a4c24330
   user:        different user
   date:        Mon Jun 30 12:12:12 1980 +0000
   summary:     uncommit with message
   
 Bad option combinations
 
   $ hg rollback -q --config ui.rollback=True
   $ hg uncommit -U --user 'user'
   abort: cannot specify both --user and --currentuser
   [10]
   $ hg uncommit -D --date today
   abort: cannot specify both --date and --currentdate
   [10]
 
 `uncommit <dir>` and `cd <dir> && uncommit .` behave the same...
 
   $ echo 2 > dir/file2.txt
   $ hg ci -Aqm 'add file2 in directory'
   $ hg uncommit dir
   note: keeping empty commit
   $ hg status
   A dir/file2.txt
 
   $ hg rollback -q --config ui.rollback=True
   $ cd dir
   $ hg uncommit . -n 'this is a note'
   note: keeping empty commit
   $ hg status
   A dir/file2.txt
   $ cd ..
 
 ... and errors out the same way when nothing can be uncommitted
 
   $ hg rollback -q --config ui.rollback=True
   $ mkdir emptydir
   $ hg uncommit emptydir
   abort: cannot uncommit "emptydir"
   (file was untracked in working directory parent)
-  [255]
+  [10]
 
   $ cd emptydir
   $ hg uncommit .
   abort: cannot uncommit "emptydir"
   (file was untracked in working directory parent)
-  [255]
+  [10]
   $ hg status
   $ cd ..