Show More
@@ -273,7 +273,9 b' def branches(ui, repo):' | |||
|
273 | 273 | if ui.quiet: |
|
274 | 274 | ui.write("%s\n" % t) |
|
275 | 275 | else: |
|
276 | ui.write("%-30s %s:%s\n" % (t, -r, hexfunc(n))) | |
|
276 | t = util.localsub(t, 30) | |
|
277 | t += " " * (30 - util.locallen(t)) | |
|
278 | ui.write("%s %s:%s\n" % (t, -r, hexfunc(n))) | |
|
277 | 279 | |
|
278 | 280 | def bundle(ui, repo, fname, dest=None, **opts): |
|
279 | 281 | """create a changegroup file |
@@ -322,7 +322,10 b' class localrepository(repo.repository):' | |||
|
322 | 322 | self._updatebranchcache(partial, lrev+1, tiprev+1) |
|
323 | 323 | self._writebranchcache(partial, self.changelog.tip(), tiprev) |
|
324 | 324 | |
|
325 | self.branchcache = partial | |
|
325 | # the branch cache is stored on disk as UTF-8, but in the local | |
|
326 | # charset internally | |
|
327 | for k, v in partial.items(): | |
|
328 | self.branchcache[util.tolocal(k)] = v | |
|
326 | 329 | return self.branchcache |
|
327 | 330 | |
|
328 | 331 | def _readbranchcache(self): |
@@ -633,12 +636,12 b' class localrepository(repo.repository):' | |||
|
633 | 636 | m2 = self.manifest.read(c2[0]) |
|
634 | 637 | |
|
635 | 638 | if use_dirstate: |
|
636 | branchname = self.workingctx().branch() | |
|
639 | branchname = util.fromlocal(self.workingctx().branch()) | |
|
637 | 640 | else: |
|
638 | 641 | branchname = "" |
|
639 | 642 | |
|
640 | 643 | if use_dirstate: |
|
641 | oldname = c1[5].get("branch", "") | |
|
644 | oldname = c1[5].get("branch", "") # stored in UTF-8 | |
|
642 | 645 | if not commit and not remove and not force and p2 == nullid and \ |
|
643 | 646 | branchname == oldname: |
|
644 | 647 | self.ui.status(_("nothing changed\n")) |
@@ -477,6 +477,7 b' def update(repo, node, branchmerge, forc' | |||
|
477 | 477 | repo.dirstate.setparents(fp1, fp2) |
|
478 | 478 | repo.hook('update', parent1=xp1, parent2=xp2, error=stats[3]) |
|
479 | 479 | if not branchmerge: |
|
480 | b = util.tolocal(p2.branch()) | |
|
480 | 481 | repo.opener("branch", "w").write(p2.branch() + "\n") |
|
481 | 482 | |
|
482 | 483 | return stats |
General Comments 0
You need to be logged in to leave comments.
Login now