| pulkit |
| hg-reviewers |
This comes from the evolve extension's version of uncommit. The logic was
already in place, and appears to be the last of the trivial things that can be
enabled.
Should these note options (including on amend) be marked advanced to keep the
help text clutter level down?
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
Should these note options (including on amend) be marked advanced to keep the
help text clutter level down?
Maybe, I don't have strong opinion here on any of the options.
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/uncommit.py (4 lines) | |||
| M | tests/test-uncommit.t (3 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| user=user, | user=user, | ||||
| date=date, | date=date, | ||||
| extra=ctx.extra()) | extra=ctx.extra()) | ||||
| return repo.commitctx(new) | return repo.commitctx(new) | ||||
| @command('uncommit', | @command('uncommit', | ||||
| [('', 'keep', None, _('allow an empty commit after uncommiting')), | [('', 'keep', None, _('allow an empty commit after uncommiting')), | ||||
| ('', 'allow-dirty-working-copy', False, | ('', 'allow-dirty-working-copy', False, | ||||
| _('allow uncommit with outstanding changes')) | _('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.walkopts + commands.commitopts + commands.commitopts2 | ||||
| + commands.commitopts3, | + commands.commitopts3, | ||||
| _('[OPTION]... [FILE]...'), | _('[OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) | helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) | ||||
| def uncommit(ui, repo, *pats, **opts): | def uncommit(ui, repo, *pats, **opts): | ||||
| """uncommit part or all of a local changeset | """uncommit part or all of a local changeset | ||||
| This command undoes the effect of a local commit, returning the affected | This command undoes the effect of a local commit, returning the affected | ||||
| 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. | ||||
| If no files are specified, the commit will be pruned, unless --keep is | If no files are specified, the commit will be pruned, unless --keep is | ||||
| given. | given. | ||||
| """ | """ | ||||
| opts = pycompat.byteskwargs(opts) | opts = pycompat.byteskwargs(opts) | ||||
| cmdutil.checknotesize(ui, opts) | |||||
| cmdutil.resolvecommitoptions(ui, opts) | cmdutil.resolvecommitoptions(ui, opts) | ||||
| with repo.wlock(), repo.lock(): | with repo.wlock(), repo.lock(): | ||||
| m, a, r, d = repo.status()[:4] | m, a, r, d = repo.status()[:4] | ||||
| isdirtypath = any(set(m + a + r + d) & set(pats)) | isdirtypath = any(set(m + a + r + d) & set(pats)) | ||||
| allowdirtywcopy = (opts['allow_dirty_working_copy'] or | allowdirtywcopy = (opts['allow_dirty_working_copy'] or | ||||
| repo.ui.configbool('experimental', 'uncommitondirtywdir')) | repo.ui.configbool('experimental', 'uncommitondirtywdir')) | ||||
| given. | given. | ||||
| (use 'hg help -e uncommit' to show help for the uncommit extension) | (use 'hg help -e uncommit' to show help for the uncommit extension) | ||||
| options ([+] can be repeated): | options ([+] can be repeated): | ||||
| --keep allow an empty commit after uncommiting | --keep allow an empty commit after uncommiting | ||||
| --allow-dirty-working-copy allow uncommit with outstanding changes | --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 | -I --include PATTERN [+] include names matching the given patterns | ||||
| -X --exclude PATTERN [+] exclude names matching the given patterns | -X --exclude PATTERN [+] exclude names matching the given patterns | ||||
| -m --message TEXT use text as commit message | -m --message TEXT use text as commit message | ||||
| -l --logfile FILE read commit message from file | -l --logfile FILE read commit message from file | ||||
| -d --date DATE record the specified date as commit date | -d --date DATE record the specified date as commit date | ||||
| -u --user USER record the specified user as committer | -u --user USER record the specified user as committer | ||||
| -D --currentdate record the current date as commit date | -D --currentdate record the current date as commit date | ||||
| -U --currentuser record the current user as committer | -U --currentuser record the current user as committer | ||||
| $ hg ci -Aqm 'add file2 in directory' | $ hg ci -Aqm 'add file2 in directory' | ||||
| $ hg uncommit dir | $ hg uncommit dir | ||||
| note: keeping empty commit | note: keeping empty commit | ||||
| $ hg status | $ hg status | ||||
| A dir/file2.txt | A dir/file2.txt | ||||
| $ hg rollback -q --config ui.rollback=True | $ hg rollback -q --config ui.rollback=True | ||||
| $ cd dir | $ cd dir | ||||
| $ hg uncommit . | $ hg uncommit . -n 'this is a note' | ||||
| note: keeping empty commit | note: keeping empty commit | ||||
| $ hg status | $ hg status | ||||
| A dir/file2.txt | A dir/file2.txt | ||||
| $ cd .. | $ cd .. | ||||
| ... and errors out the same way when nothing can be uncommitted | ... and errors out the same way when nothing can be uncommitted | ||||
| $ hg rollback -q --config ui.rollback=True | $ hg rollback -q --config ui.rollback=True | ||||