[PATCH 01 of 17] remove: specify hg in added warning

timeless timeless at fmr.im
Tue Sep 20 20:19:42 EDT 2016


# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1472852760 0
#      Fri Sep 02 21:46:00 2016 +0000
# Node ID 31e48b2f0db6a01c6c7f64a54d12719c48033eed
# Parent  285a8c3e53f2183438f0cdbc238e4ab851d0d110
# Available At https://bitbucket.org/timeless/mercurial-crew
#              hg pull https://bitbucket.org/timeless/mercurial-crew -r 31e48b2f0db6
remove: specify hg in added warning

diff -r 285a8c3e53f2 -r 31e48b2f0db6 mercurial/cmdutil.py
--- a/mercurial/cmdutil.py	Tue May 03 13:36:12 2016 +0900
+++ b/mercurial/cmdutil.py	Fri Sep 02 21:46:00 2016 +0000
@@ -2519,7 +2519,7 @@
             count += 1
             ui.progress(_('skipping'), count, total=total, unit=_('files'))
             warnings.append(_('not removing %s: file has been marked for add'
-                      ' (use forget to undo)\n') % m.rel(f))
+                      " (use 'hg forget' to undo add)\n") % m.rel(f))
             ret = 1
         ui.progress(_('skipping'), None)
 
diff -r 285a8c3e53f2 -r 31e48b2f0db6 tests/test-largefiles.t
--- a/tests/test-largefiles.t	Tue May 03 13:36:12 2016 +0900
+++ b/tests/test-largefiles.t	Fri Sep 02 21:46:00 2016 +0000
@@ -112,7 +112,7 @@
   normalnew already tracked!
   $ hg remove normalnew largenew
   not removing largenew: file is untracked
-  not removing normalnew: file has been marked for add (use forget to undo)
+  not removing normalnew: file has been marked for add (use 'hg forget' to undo add)
   [1]
   $ rm normalnew largenew
   $ hg up -Cq
diff -r 285a8c3e53f2 -r 31e48b2f0db6 tests/test-remove.t
--- a/tests/test-remove.t	Tue May 03 13:36:12 2016 +0900
+++ b/tests/test-remove.t	Fri Sep 02 21:46:00 2016 +0000
@@ -50,7 +50,7 @@
   \r (no-eol) (esc)
   skipping [===========================================>] 1/1\r (no-eol) (esc)
                                                               \r (no-eol) (esc)
-  not removing bar: file has been marked for add (use forget to undo)
+  not removing bar: file has been marked for add (use 'hg forget' to undo add)
   exit code: 1
   A bar
   ./bar


More information about the Mercurial-devel mailing list