( )⚙ D6855 amend: enable support for closing the branch

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6855

amend: enable support for closing the branch
ClosedPublic

Authored by mharbison72 on Sep 15 2019, 12:57 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG09d46b90f6f9: amend: enable support for closing the branch
Summary

This comes from the evolve extension's version of amend. The logic was already
in place.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

mharbison72 created this revision.Sep 15 2019, 12:57 AM
pulkit accepted this revision.Sep 16 2019, 1:00 PM
This revision is now accepted and ready to land.Sep 16 2019, 1:00 PM
mharbison72 added a commit: rHG09d46b90f6f9: amend: enable support for closing the branch.Sep 16 2019, 1:55 PM
Closed by commit rHG09d46b90f6f9: amend: enable support for closing the branch (authored by mharbison72). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/amend.py (2 lines)
Mrelnotes/next (2 lines)
Mtests/test-amend.t (6 lines)

Diff 16548

hgext/amend.py

cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
@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'mark a branch as closed, hiding it from the branch list')),
('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

relnotes/next

== 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 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 ==

tests/test-amend.t

summary: commit 1 summary: commit 1
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
$ hg amend --close-branch
$ hg log --limit 1 -T 'close={get(extras, "close")}\n'
close=1
$ 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.