diff --git a/hgext/amend.py b/hgext/amend.py index 7e999704178135dda8fd61c7eea126ac13691a30_aGdleHQvYW1lbmQucHk=..09d46b90f6f9bfffd91bc36977fcbc2fc81802e9_aGdleHQvYW1lbmQucHk= 100644 --- 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, diff --git a/relnotes/next b/relnotes/next index 7e999704178135dda8fd61c7eea126ac13691a30_cmVsbm90ZXMvbmV4dA==..09d46b90f6f9bfffd91bc36977fcbc2fc81802e9_cmVsbm90ZXMvbmV4dA== 100644 --- 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/tests/test-amend.t b/tests/test-amend.t index 7e999704178135dda8fd61c7eea126ac13691a30_dGVzdHMvdGVzdC1hbWVuZC50..09d46b90f6f9bfffd91bc36977fcbc2fc81802e9_dGVzdHMvdGVzdC1hbWVuZC50 100644 --- 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: