Mercurial > hg > mercurial-crew-with-dirclash

comparison mercurial/localrepo.py @ 3862:46abbed02b2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use UTF-8 in .hg/branch
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sun, 10 Dec 2006 20:35:28 -0200
parents db36a4f490f6
children 1e0b94cfba0e 27230c29bfec
comparison
equal deleted inserted replaced
3861:db36a4f490f6 3862:46abbed02b2d
681 c2 = self.changelog.read(p2) 681 c2 = self.changelog.read(p2)
682 m1 = self.manifest.read(c1[0]).copy() 682 m1 = self.manifest.read(c1[0]).copy()
683 m2 = self.manifest.read(c2[0]) 683 m2 = self.manifest.read(c2[0])
684 684
685 if use_dirstate: 685 if use_dirstate:
686 branchname = util.fromlocal(self.workingctx().branch()) 686 branchname = self.workingctx().branch()
687 try:
688 branchname = branchname.decode('UTF-8').encode('UTF-8')
689 except UnicodeDecodeError:
690 raise util.Abort(_('branch name not in UTF-8!'))
687 else: 691 else:
688 branchname = "" 692 branchname = ""
689 693
690 if use_dirstate: 694 if use_dirstate:
691 oldname = c1[5].get("branch", "") # stored in UTF-8 695 oldname = c1[5].get("branch", "") # stored in UTF-8