D5905: diff: respect ui.relative-paths for warning about path outside --root
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sat Feb 9 22:40:15 EST 2019
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGdf59b1078983: diff: respect ui.relative-paths for warning about path outside --root (authored by martinvonz, committed by ).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D5905?vs=13930&id=13987
REVISION DETAIL
https://phab.mercurial-scm.org/D5905
AFFECTED FILES
mercurial/logcmdutil.py
CHANGE DETAILS
diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py
--- a/mercurial/logcmdutil.py
+++ b/mercurial/logcmdutil.py
@@ -73,12 +73,13 @@
if relroot != '':
# XXX relative roots currently don't work if the root is within a
# subrepo
- uirelroot = match.uipath(relroot)
+ uipathfn = scmutil.getuipathfn(repo, legacyrelativevalue=True)
+ uirelroot = uipathfn(pathfn(relroot))
relroot += '/'
for matchroot in match.files():
if not matchroot.startswith(relroot):
- ui.warn(_('warning: %s not inside relative root %s\n') % (
- match.uipath(matchroot), uirelroot))
+ ui.warn(_('warning: %s not inside relative root %s\n') %
+ (uipathfn(pathfn(matchroot)), uirelroot))
relrootmatch = scmutil.match(ctx2, pats=[relroot], default='path')
match = matchmod.intersectmatchers(match, relrootmatch)
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list