##// END OF EJS Templates
bookmark: use `list_paths` to access path definition...
marmoute -
r47959:353718f7 default
parent child Browse files
Show More
@@ -600,11 +600,12 b' def _diverge(ui, b, path, localmarks, re'
600 # if an @pathalias already exists, we overwrite (update) it
600 # if an @pathalias already exists, we overwrite (update) it
601 if path.startswith(b"file:"):
601 if path.startswith(b"file:"):
602 path = urlutil.url(path).path
602 path = urlutil.url(path).path
603 for p, u in ui.configitems(b"paths"):
603 for name, p in urlutil.list_paths(ui):
604 if u.startswith(b"file:"):
604 loc = p.rawloc
605 u = urlutil.url(u).path
605 if loc.startswith(b"file:"):
606 if path == u:
606 loc = urlutil.url(loc).path
607 return b'%s@%s' % (b, p)
607 if path == loc:
608 return b'%s@%s' % (b, name)
608
609
609 # assign a unique "@number" suffix newly
610 # assign a unique "@number" suffix newly
610 for x in range(1, 100):
611 for x in range(1, 100):
General Comments 0
You need to be logged in to leave comments. Login now