mercurial/logexchange.py
branchstable
changeset 40411 94c0421d67a0
parent 38024 bbdc1bc56e58
child 41387 876494fd967d
--- a/mercurial/logexchange.py	Wed Oct 24 22:40:48 2018 -0400
+++ b/mercurial/logexchange.py	Thu Oct 25 00:22:42 2018 -0400
@@ -105,7 +105,7 @@
     # use the string given to us
     rpath = remote
     if local:
-        rpath = remote._repo.root
+        rpath = util.pconvert(remote._repo.root)
     elif not isinstance(remote, bytes):
         rpath = remote._url
 
@@ -113,6 +113,11 @@
     for path, url in repo.ui.configitems('paths'):
         # remove auth info from user defined url
         noauthurl = util.removeauth(url)
+
+        # Standardize on unix style paths, otherwise some {remotenames} end up
+        # being an absolute path on Windows.
+        url = util.pconvert(bytes(url))
+        noauthurl = util.pconvert(noauthurl)
         if url == rpath or noauthurl == rpath:
             rpath = path
             break