Mercurial > hg > mercurial-crew-with-dirclash

diff 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
line wrap: on
line diff
--- a/mercurial/localrepo.py
+++ b/mercurial/localrepo.py
@@ -683,7 +683,11 @@ class localrepository(repo.repository):
         m2 = self.manifest.read(c2[0])
 
         if use_dirstate:
-            branchname = util.fromlocal(self.workingctx().branch())
+            branchname = self.workingctx().branch()
+            try:
+                branchname = branchname.decode('UTF-8').encode('UTF-8')
+            except UnicodeDecodeError:
+                raise util.Abort(_('branch name not in UTF-8!'))
         else:
             branchname = ""