Mercurial > hg

changeset 41648:d8cdd5320f75

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: use relative path for "already tracked" message From 932de135041f (subrepo: warn when adding already tracked files in gitsubrepo, 2015-02-27): The file is printed with abs() to be consistent with how it is printed in workingctx, even though that is inconsistent with how added files are printed in verbose mode. However, a few year later, the same author wrote 7008f6819002 (context: name files relative to cwd in warning messages, 2017-07-11) and now it's inconsistent. This fixes that inconsistency. Differential Revision: https://phab.mercurial-scm.org/D5899
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 08 Feb 2019 10:19:30 -0800
parents ec37db02fc72
children 799e156785f7
files mercurial/subrepo.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/subrepo.py	Wed Feb 06 23:56:59 2019 -0800
+++ b/mercurial/subrepo.py	Fri Feb 08 10:19:30 2019 -0800
@@ -1624,7 +1624,7 @@
                 self._gitcommand(command + [f])
 
         for f in rejected:
-            ui.warn(_("%s already tracked!\n") % match.abs(f))
+            ui.warn(_("%s already tracked!\n") % match.rel(f))
 
         return rejected