This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5915

cmdutil: migrate previously missed instances to uipathfn
ClosedPublic

Authored by martinvonz on Feb 8 2019, 5:36 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG0cbf491db7ee: cmdutil: migrate previously missed instances to uipathfn
Summary

I seem to have missed these two instances in 15f63ac122ea (files:
respect ui.relative-paths, 2019-01-29) and 7068c6b0114b (revert:
respect ui.relative-paths, 2019-02-05).

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/cmdutil.py (4 lines)

Diff 13996

mercurial/cmdutil.py

if (subrepos or m.exact(subpath) or any(submatch.files())): if (subrepos or m.exact(subpath) or any(submatch.files())):
sub = ctx.sub(subpath) sub = ctx.sub(subpath)
try: try:
recurse = m.exact(subpath) or subrepos recurse = m.exact(subpath) or subrepos
if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0: if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0:
ret = 0 ret = 0
except error.LookupError: except error.LookupError:
ui.status(_("skipping missing subrepository: %s\n") ui.status(_("skipping missing subrepository: %s\n")
% m.rel(subpath)) % uipathfn(subpath))
return ret return ret
def remove(ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun, def remove(ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun,
warnings=None): warnings=None):
ret = 0 ret = 0
s = repo.status(match=m, clean=True) s = repo.status(match=m, clean=True)
modified, added, deleted, clean = s[0], s[1], s[3], s[6] modified, added, deleted, clean = s[0], s[1], s[3], s[6]
if path in names: if path in names:
return return
if path in ctx.substate: if path in ctx.substate:
return return
path_ = path + '/' path_ = path + '/'
for f in names: for f in names:
if f.startswith(path_): if f.startswith(path_):
return return
ui.warn("%s: %s\n" % (m.rel(path), msg)) ui.warn("%s: %s\n" % (uipathfn(path), msg))
for abs in ctx.walk(matchmod.badmatch(m, badfn)): for abs in ctx.walk(matchmod.badmatch(m, badfn)):
if abs not in names: if abs not in names:
names[abs] = m.exact(abs) names[abs] = m.exact(abs)
# Find status of all file in `names`. # Find status of all file in `names`.
m = scmutil.matchfiles(repo, names) m = scmutil.matchfiles(repo, names)