[PATCH 1 of 4] addremove: add labels for messages about added and removed files

Boris Feld boris.feld at octobus.net
Tue Aug 14 15:13:07 UTC 2018


# HG changeset patch
# User Boris Feld <boris.feld at octobus.net>
# Date 1532531512 -7200
#      Wed Jul 25 17:11:52 2018 +0200
# Node ID 4c46bfaba3767b33a7c29c9ceb3dde57ba5d9653
# Parent  d99468d2b09acc8f5c6c5ce5c1b08b47a742841f
# EXP-Topic addremovelabel
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 4c46bfaba376
addremove: add labels for messages about added and removed files

This is the first step to add color for add and remove output.

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1005,9 +1005,11 @@ def addremove(repo, matcher, prefix, opt
         if repo.ui.verbose or not m.exact(abs):
             if abs in unknownset:
                 status = _('adding %s\n') % m.uipath(abs)
+                label = 'addremove.added'
             else:
                 status = _('removing %s\n') % m.uipath(abs)
-            repo.ui.status(status)
+                label = 'addremove.removed'
+            repo.ui.status(status, label=label)
 
     renames = _findrenames(repo, m, added + unknown, removed + deleted,
                            similarity)
diff --git a/tests/test-addremove.t b/tests/test-addremove.t
--- a/tests/test-addremove.t
+++ b/tests/test-addremove.t
@@ -69,6 +69,12 @@
   removing c
   adding d
   recording removal of a as rename to b (100% similar)
+  $ hg addremove -ns 50 --color debug
+  [addremove.removed ui.status|removing a]
+  [addremove.added ui.status|adding b]
+  [addremove.removed ui.status|removing c]
+  [addremove.added ui.status|adding d]
+  [ ui.status|recording removal of a as rename to b (100% similar)]
   $ hg addremove -s 50
   removing a
   adding b


More information about the Mercurial-devel mailing list