( )⚙ D5899 subrepo: use relative path for "already tracked" message

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5899

subrepo: use relative path for "already tracked" message
ClosedPublic

Authored by martinvonz on Feb 8 2019, 1:48 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd8cdd5320f75: subrepo: use relative path for "already tracked" message
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/subrepo.py (2 lines)

Diff 13980

mercurial/subrepo.py

if f in tracked: # hg prints 'adding' even if already tracked if f in tracked: # hg prints 'adding' even if already tracked
if exact: if exact:
rejected.append(f) rejected.append(f)
continue continue
if not opts.get(r'dry_run'): if not opts.get(r'dry_run'):
self._gitcommand(command + [f]) self._gitcommand(command + [f])
for f in rejected: for f in rejected:
ui.warn(_("%s already tracked!\n") % match.abs(f)) ui.warn(_("%s already tracked!\n") % match.rel(f))
return rejected return rejected
@annotatesubrepoerror @annotatesubrepoerror
def remove(self): def remove(self):
if self._gitmissing(): if self._gitmissing():
return return
if self.dirty(): if self.dirty():