Mercurial > public > mercurial-scm > hg

comparison mercurial/bookmarks.py @ 22629:b3f74b405c20

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bookmarks: fix divergent bookmark path normalization
author Matt Mackall <mpm@selenic.com>
date Thu, 02 Oct 2014 16:43:50 -0500
parents 808df84fba83
children 1ec7cdaf898f
comparison
equal deleted inserted replaced
22628:2805d23e1f88 22629:b3f74b405c20
336 n = '%s@%d' % (b, x) 336 n = '%s@%d' % (b, x)
337 if n not in localmarks: 337 if n not in localmarks:
338 break 338 break
339 # try to use an @pathalias suffix 339 # try to use an @pathalias suffix
340 # if an @pathalias already exists, we overwrite (update) it 340 # if an @pathalias already exists, we overwrite (update) it
341 path = str(util.url(path)) 341 if path.startswith("file:"):
342 path = util.url(path).path
342 for p, u in ui.configitems("paths"): 343 for p, u in ui.configitems("paths"):
343 u = str(util.url(path)) 344 if u.startswith("file:"):
345 u = util.url(u).path
344 if path == u: 346 if path == u:
345 n = '%s@%s' % (b, p) 347 n = '%s@%s' % (b, p)
346 return n 348 return n
347 349
348 def updatefromremote(ui, repo, remotemarks, path): 350 def updatefromremote(ui, repo, remotemarks, path):