| durin42 |
| hg-reviewers |
As per IRC discussion and suggestion by Augie, we should not allow bare `hg
uncommit` on dirty working directory.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/uncommit.py (3 lines) | |||
| M | tests/test-uncommit.t (5 lines) |
| added and removed in the working directory. | added and removed in the working directory. | ||||
| """ | """ | ||||
| from __future__ import absolute_import | from __future__ import absolute_import | ||||
| from mercurial.i18n import _ | from mercurial.i18n import _ | ||||
| from mercurial import ( | from mercurial import ( | ||||
| cmdutil, | |||||
| commands, | commands, | ||||
| context, | context, | ||||
| copies, | copies, | ||||
| error, | error, | ||||
| node, | node, | ||||
| obsolete, | obsolete, | ||||
| registrar, | registrar, | ||||
| scmutil, | scmutil, | ||||
| files to their uncommitted state. This means that files modified or | files to their uncommitted state. This means that files modified or | ||||
| deleted in the changeset will be left unchanged, and so will remain | deleted in the changeset will be left unchanged, and so will remain | ||||
| modified in the working directory. | modified in the working directory. | ||||
| """ | """ | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| wctx = repo[None] | wctx = repo[None] | ||||
| if not pats: | |||||
| cmdutil.bailifchanged(repo) | |||||
| if wctx.parents()[0].node() == node.nullid: | if wctx.parents()[0].node() == node.nullid: | ||||
| raise error.Abort(_("cannot uncommit null changeset")) | raise error.Abort(_("cannot uncommit null changeset")) | ||||
| if len(wctx.parents()) > 1: | if len(wctx.parents()) > 1: | ||||
| raise error.Abort(_("cannot uncommit while merging")) | raise error.Abort(_("cannot uncommit while merging")) | ||||
| old = repo['.'] | old = repo['.'] | ||||
| if not old.mutable(): | if not old.mutable(): | ||||
| raise error.Abort(_('cannot uncommit public changesets')) | raise error.Abort(_('cannot uncommit public changesets')) | ||||
| if len(old.parents()) > 1: | if len(old.parents()) > 1: | ||||
| Uncommit with dirty state | Uncommit with dirty state | ||||
| $ echo "foo" >> files | $ echo "foo" >> files | ||||
| $ cat files | $ cat files | ||||
| abcde | abcde | ||||
| foo | foo | ||||
| $ hg status | $ hg status | ||||
| M files | M files | ||||
| $ hg uncommit | |||||
| abort: uncommitted changes | |||||
| [255] | |||||
| $ hg uncommit files | $ hg uncommit files | ||||
| $ cat files | $ cat files | ||||
| abcde | abcde | ||||
| foo | foo | ||||
| $ hg commit -m "files abcde + foo" | $ hg commit -m "files abcde + foo" | ||||
| Uncommit in the middle of a stack, does not move bookmark | Uncommit in the middle of a stack, does not move bookmark | ||||
| Add and expect uncommit to fail on both merge working dir and merge changeset | Add and expect uncommit to fail on both merge working dir and merge changeset | ||||
| $ hg merge 2 | $ hg merge 2 | ||||
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
| (branch merge, don't forget to commit) | (branch merge, don't forget to commit) | ||||
| $ hg uncommit | $ hg uncommit | ||||
| abort: cannot uncommit while merging | abort: outstanding uncommitted merge | ||||
| [255] | [255] | ||||
| $ hg status | $ hg status | ||||
| M a | M a | ||||
| $ hg commit -m 'merge a and b' | $ hg commit -m 'merge a and b' | ||||
| $ hg uncommit | $ hg uncommit | ||||
| abort: cannot uncommit merge changeset | abort: cannot uncommit merge changeset | ||||