Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uncommit: enable support for adding a note
authorMatt Harbison <matt_harbison@yahoo.com>
Sun, 15 Sep 2019 00:07:30 -0400
changeset 42936 2da754532dd3
parent 42935 f10a0f5eedae
child 42937 69de49c4e39c
uncommit: enable support for adding a note This comes from the evolve extension's version of uncommit. The logic was already in place, and appears to be the last of the trivial things that can be enabled. Should these note options (including on amend) be marked advanced to keep the help text clutter level down? Differential Revision: https://phab.mercurial-scm.org/D6857
hgext/uncommit.py file | annotate | diff | comparison | revisions
tests/test-uncommit.t file | annotate | diff | comparison | revisions 
--- a/hgext/uncommit.py	Sat Sep 14 23:41:31 2019 -0400
+++ b/hgext/uncommit.py	Sun Sep 15 00:07:30 2019 -0400
@@ -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():
--- a/tests/test-uncommit.t	Sat Sep 14 23:41:31 2019 -0400
+++ b/tests/test-uncommit.t	Sun Sep 15 00:07:30 2019 -0400
@@ -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
mercurial