D6857: uncommit: enable support for adding a note
mharbison72 (Matt Harbison)
phabricator at mercurial-scm.org
Mon Sep 16 13:56:13 EDT 2019
Closed by commit rHG2da754532dd3: uncommit: enable support for adding a note (authored by mharbison72).
This revision was automatically updated to reflect the committed changes.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6857?vs=16550&id=16559
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6857/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6857
AFFECTED FILES
hgext/uncommit.py
tests/test-uncommit.t
CHANGE DETAILS
diff --git a/tests/test-uncommit.t b/tests/test-uncommit.t
--- a/tests/test-uncommit.t
+++ b/tests/test-uncommit.t
@@ -36,6 +36,7 @@
--keep allow an empty commit after uncommiting
--allow-dirty-working-copy allow uncommit with outstanding changes
+ -n --note TEXT store a note on uncommit
-I --include PATTERN [+] include names matching the given patterns
-X --exclude PATTERN [+] exclude names matching the given patterns
-m --message TEXT use text as commit message
@@ -570,7 +571,7 @@
$ hg rollback -q --config ui.rollback=True
$ cd dir
- $ hg uncommit .
+ $ hg uncommit . -n 'this is a note'
note: keeping empty commit
$ hg status
A dir/file2.txt
diff --git a/hgext/uncommit.py b/hgext/uncommit.py
--- a/hgext/uncommit.py
+++ b/hgext/uncommit.py
@@ -111,7 +111,8 @@
@command('uncommit',
[('', 'keep', None, _('allow an empty commit after uncommiting')),
('', 'allow-dirty-working-copy', False,
- _('allow uncommit with outstanding changes'))
+ _('allow uncommit with outstanding changes')),
+ (b'n', b'note', b'', _(b'store a note on uncommit'), _(b'TEXT'))
] + commands.walkopts + commands.commitopts + commands.commitopts2
+ commands.commitopts3,
_('[OPTION]... [FILE]...'),
@@ -129,6 +130,7 @@
"""
opts = pycompat.byteskwargs(opts)
+ cmdutil.checknotesize(ui, opts)
cmdutil.resolvecommitoptions(ui, opts)
with repo.wlock(), repo.lock():
To: mharbison72, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
More information about the Mercurial-devel
mailing list