equal
deleted
inserted
replaced
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] |