| pulkit |
| hg-reviewers |
This comes from the evolve extension's version of amend. The logic was already
in place, and appears to be the last of the trivial things that can be enabled.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/amend.py (1 line) | |||
| M | relnotes/next (2 lines) | |||
| M | tests/test-amend.t (5 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 | ||
| Closed | mharbison72 |
| @command('amend', | @command('amend', | ||||
| [('A', 'addremove', None, | [('A', 'addremove', None, | ||||
| _('mark new/missing files as added/removed before committing')), | _('mark new/missing files as added/removed before committing')), | ||||
| ('e', 'edit', None, _('invoke editor on commit messages')), | ('e', 'edit', None, _('invoke editor on commit messages')), | ||||
| ('i', 'interactive', None, _('use interactive mode')), | ('i', 'interactive', None, _('use interactive mode')), | ||||
| (b'', b'close-branch', None, | (b'', b'close-branch', None, | ||||
| _(b'mark a branch as closed, hiding it from the branch list')), | _(b'mark a branch as closed, hiding it from the branch list')), | ||||
| (b's', b'secret', None, _(b'use the secret phase for committing')), | |||||
| ('n', 'note', '', _('store a note on the amend')), | ('n', 'note', '', _('store a note on the amend')), | ||||
| ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2 | ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2 | ||||
| + cmdutil.commitopts3, | + cmdutil.commitopts3, | ||||
| _('[OPTION]... [FILE]...'), | _('[OPTION]... [FILE]...'), | ||||
| helpcategory=command.CATEGORY_COMMITTING, | helpcategory=command.CATEGORY_COMMITTING, | ||||
| inferrepo=True) | inferrepo=True) | ||||
| def amend(ui, repo, *pats, **opts): | def amend(ui, repo, *pats, **opts): | ||||
| """amend the working copy parent with all or specified outstanding changes | """amend the working copy parent with all or specified outstanding changes | ||||
| == New Features == | == New Features == | ||||
| * The amend extension supports the `--currentuser` argument. | * The amend extension supports the `--currentuser` argument. | ||||
| * The amend extension supports the `--close-branch` argument. | * The amend extension supports the `--close-branch` argument. | ||||
| * The amend extension supports the `--secret` argument. | |||||
| * The uncommit extension supports the `rewrite.update-timestamp` config option. | * The uncommit extension supports the `rewrite.update-timestamp` config option. | ||||
| == New Experimental Features == | == New Experimental Features == | ||||
| == Bug Fixes == | == Bug Fixes == | ||||
| Bad combination of date options: | Bad combination of date options: | ||||
| $ hg amend -D --date '0 0' | $ hg amend -D --date '0 0' | ||||
| abort: --date and --currentdate are mutually exclusive | abort: --date and --currentdate are mutually exclusive | ||||
| [255] | [255] | ||||
| Close branch | Close branch | ||||
| $ hg amend --close-branch | $ hg amend --secret --close-branch | ||||
| $ hg log --limit 1 -T 'close={get(extras, "close")}\n' | $ hg log --limit 1 -T 'close={get(extras, "close")}\nphase={phase}\n' | ||||
| close=1 | close=1 | ||||
| phase=secret | |||||
| $ cd .. | $ cd .. | ||||
| Corner case of amend from issue6157: | Corner case of amend from issue6157: | ||||
| - working copy parent has a change to file `a` | - working copy parent has a change to file `a` | ||||
| - working copy has the inverse change | - working copy has the inverse change | ||||
| - we amend the working copy parent for files other than `a` | - we amend the working copy parent for files other than `a` | ||||
| hg used to include the changes to `a` anyway. | hg used to include the changes to `a` anyway. | ||||