Mercurial > public > mercurial-scm > hg

comparison mercurial/hg.py @ 11306:deaeb2d84d8a stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix encoding bug in 05ac42e56452
author Sune Foldager <cryo@cyanite.org>
date Tue, 08 Jun 2010 13:19:22 +0200
parents 05ac42e56452
children 3f1409082720
comparison
equal deleted inserted replaced
11299:05ac42e56452 11306:deaeb2d84d8a
28 branchmap = repo.branchmap() 28 branchmap = repo.branchmap()
29 for branch in branches: 29 for branch in branches:
30 if branch == '.': 30 if branch == '.':
31 if not lrepo or not lrepo.local(): 31 if not lrepo or not lrepo.local():
32 raise util.Abort(_("dirstate branch not accessible")) 32 raise util.Abort(_("dirstate branch not accessible"))
33 branch = lrepo.dirstate.branch() 33 butf8 = lrepo.dirstate.branch()
34 butf8 = encoding.fromlocal(branch) 34 branch = encoding.tolocal(butf8)
35 else:
36 butf8 = encoding.fromlocal(branch)
35 if butf8 in branchmap: 37 if butf8 in branchmap:
36 revs.extend(node.hex(r) for r in reversed(branchmap[butf8])) 38 revs.extend(node.hex(r) for r in reversed(branchmap[butf8]))
37 else: 39 else:
38 revs.append(branch) 40 revs.append(branch)
39 return revs, revs[0] 41 return revs, revs[0]