Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/cmdutil.py @ 41675:0cbf491db7ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cmdutil: migrate previously missed instances to uipathfn 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). Differential Revision: https://phab.mercurial-scm.org/D5915
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 08 Feb 2019 13:00:28 -0800
parents 28ce9184d495
children 5d383d9636d0
comparison
equal deleted inserted replaced
41674:28ce9184d495 41675:0cbf491db7ee
2191 recurse = m.exact(subpath) or subrepos 2191 recurse = m.exact(subpath) or subrepos
2192 if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0: 2192 if sub.printfiles(ui, submatch, fm, fmt, recurse) == 0:
2193 ret = 0 2193 ret = 0
2194 except error.LookupError: 2194 except error.LookupError:
2195 ui.status(_("skipping missing subrepository: %s\n") 2195 ui.status(_("skipping missing subrepository: %s\n")
2196 % m.rel(subpath)) 2196 % uipathfn(subpath))
2197 2197
2198 return ret 2198 return ret
2199 2199
2200 def remove(ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun, 2200 def remove(ui, repo, m, prefix, uipathfn, after, force, subrepos, dryrun,
2201 warnings=None): 2201 warnings=None):
2823 return 2823 return
2824 path_ = path + '/' 2824 path_ = path + '/'
2825 for f in names: 2825 for f in names:
2826 if f.startswith(path_): 2826 if f.startswith(path_):
2827 return 2827 return
2828 ui.warn("%s: %s\n" % (m.rel(path), msg)) 2828 ui.warn("%s: %s\n" % (uipathfn(path), msg))
2829 2829
2830 for abs in ctx.walk(matchmod.badmatch(m, badfn)): 2830 for abs in ctx.walk(matchmod.badmatch(m, badfn)):
2831 if abs not in names: 2831 if abs not in names:
2832 names[abs] = m.exact(abs) 2832 names[abs] = m.exact(abs)
2833 2833