##// END OF EJS Templates
amend: enable support for closing the branch...
Matt Harbison -
r43204:09d46b90 default
parent child Browse files
Show More
@@ -34,6 +34,8 b' command = registrar.command(cmdtable)'
34 _('mark new/missing files as added/removed before committing')),
34 _('mark new/missing files as added/removed before committing')),
35 ('e', 'edit', None, _('invoke editor on commit messages')),
35 ('e', 'edit', None, _('invoke editor on commit messages')),
36 ('i', 'interactive', None, _('use interactive mode')),
36 ('i', 'interactive', None, _('use interactive mode')),
37 (b'', b'close-branch', None,
38 _(b'mark a branch as closed, hiding it from the branch list')),
37 ('n', 'note', '', _('store a note on the amend')),
39 ('n', 'note', '', _('store a note on the amend')),
38 ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2
40 ] + cmdutil.walkopts + cmdutil.commitopts + cmdutil.commitopts2
39 + cmdutil.commitopts3,
41 + cmdutil.commitopts3,
@@ -2,6 +2,8 b''
2
2
3 * The amend extension supports the `--currentuser` argument.
3 * The amend extension supports the `--currentuser` argument.
4
4
5 * The amend extension supports the `--close-branch` argument.
6
5 * The uncommit extension supports the `rewrite.update-timestamp` config option.
7 * The uncommit extension supports the `rewrite.update-timestamp` config option.
6
8
7 == New Experimental Features ==
9 == New Experimental Features ==
@@ -450,6 +450,12 b' Bad combination of date options:'
450 abort: --date and --currentdate are mutually exclusive
450 abort: --date and --currentdate are mutually exclusive
451 [255]
451 [255]
452
452
453 Close branch
454
455 $ hg amend --close-branch
456 $ hg log --limit 1 -T 'close={get(extras, "close")}\n'
457 close=1
458
453 $ cd ..
459 $ cd ..
454
460
455 Corner case of amend from issue6157:
461 Corner case of amend from issue6157:
General Comments 0
You need to be logged in to leave comments. Login now