This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5935

windows: use util.localpath for repo-relative paths in getuipathfn()
ClosedPublic

Authored by martinvonz on Feb 11 2019, 12:50 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa8d3a4be066e: windows: use util.localpath for repo-relative paths in getuipathfn()
Summary

Now that we have a single place that translates from internal path
representation (slash-separated) to UI representation
(i.e. scmutil.getuipathfn()), let's switch that over to using
util.localpath for absolute paths. I don't expect any test impact on
Windows because we still respect ui.slash, which is set by the test
runner.

As Yuya pointed out, a997163e7fae (status: extract helper for
producing relative or absolute path for UI, 2019-01-29) accidentally
changed to slash-separated paths on Windows because it used used to
use repo.pathto(f, cwd='') (which calls util.localpath()) and after
that patch it just prints the filename without any
transformation. This patch should fix that regression.

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

Diff 14058

mercurial/scmutil.py

if relative is None: if relative is None:
raise error.ConfigError( raise error.ConfigError(
_("ui.relative-paths is not a boolean ('%s')") % config) _("ui.relative-paths is not a boolean ('%s')") % config)
if relative: if relative:
cwd = repo.getcwd() cwd = repo.getcwd()
pathto = repo.pathto pathto = repo.pathto
return lambda f: pathto(f, cwd) return lambda f: pathto(f, cwd)
else: elif repo.ui.configbool('ui', 'slash'):
return lambda f: f return lambda f: f
else:
return util.localpath
def subdiruipathfn(subpath, uipathfn): def subdiruipathfn(subpath, uipathfn):
'''Create a new uipathfn that treats the file as relative to subpath.''' '''Create a new uipathfn that treats the file as relative to subpath.'''
return lambda f: uipathfn(posixpath.join(subpath, f)) return lambda f: uipathfn(posixpath.join(subpath, f))
def anypats(pats, opts): def anypats(pats, opts):
'''Checks if any patterns, including --include and --exclude were given. '''Checks if any patterns, including --include and --exclude were given.