D6855: amend: enable support for closing the branch
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Sun Sep 15 04:57:14 UTC 2019
mharbison72 created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This comes from the evolve extension's version of amend. The logic was already
in place.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6855
AFFECTED FILES
hgext/amend.py
relnotes/next
tests/test-amend.t
CHANGE DETAILS
diff --git a/tests/test-amend.t b/tests/test-amend.t
--- a/tests/test-amend.t
+++ b/tests/test-amend.t
@@ -450,6 +450,12 @@
abort: --date and --currentdate are mutually exclusive
[255]
+Close branch
+
+ $ hg amend --close-branch
+ $ hg log --limit 1 -T 'close={get(extras, "close")}\n'
+ close=1
+
$ cd ..
Corner case of amend from issue6157:
diff --git a/relnotes/next b/relnotes/next
--- a/relnotes/next
+++ b/relnotes/next
@@ -2,6 +2,8 @@
* 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.
== New Experimental Features ==
diff --git a/hgext/amend.py b/hgext/amend.py
--- a/hgext/amend.py
+++ b/hgext/amend.py
@@ -34,6 +34,8 @@
_('mark new/missing files as added/removed before committing')),
('e', 'edit', None, _('invoke editor on commit messages')),
('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')),
] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2
+ cmdutil.commitopts3,
To: mharbison72, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list