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

login
register
mail settings
Submitter phabricator
Date Feb. 13, 2019, 12:15 p.m.
Message ID <6c80351f21641d3091440d7dae2426e9@localhost.localdomain>
Download mbox | patch
Permalink /patch/38708/
State Not Applicable
Headers show

Comments

phabricator - Feb. 13, 2019, 12:15 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHGa8d3a4be066e: windows: use util.localpath for repo-relative paths in getuipathfn() (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D5935?vs=14031&id=14058

REVISION DETAIL
  https://phab.mercurial-scm.org/D5935

AFFECTED FILES
  mercurial/scmutil.py

CHANGE DETAILS




To: martinvonz, #hg-reviewers
Cc: mercurial-devel

Patch

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -756,8 +756,10 @@ 
         cwd = repo.getcwd()
         pathto = repo.pathto
         return lambda f: pathto(f, cwd)
+    elif repo.ui.configbool('ui', 'slash'):
+        return lambda f: f
     else:
-        return lambda f: f
+        return util.localpath
 
 def subdiruipathfn(subpath, uipathfn):
     '''Create a new uipathfn that treats the file as relative to subpath.'''