Mercurial Mercurial > mercurial / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial/hg.py
branchstable
changeset 11306 deaeb2d84d8a
parent 11299 05ac42e56452
child 11312 3f1409082720 
--- a/mercurial/hg.py	Mon Jun 07 16:28:23 2010 +0200
+++ b/mercurial/hg.py	Tue Jun 08 13:19:22 2010 +0200
@@ -30,8 +30,10 @@
         if branch == '.':
             if not lrepo or not lrepo.local():
                 raise util.Abort(_("dirstate branch not accessible"))
-            branch = lrepo.dirstate.branch()
-        butf8 = encoding.fromlocal(branch)
+            butf8 = lrepo.dirstate.branch()
+            branch = encoding.tolocal(butf8)
+        else:
+            butf8 = encoding.fromlocal(branch)
         if butf8 in branchmap:
             revs.extend(node.hex(r) for r in reversed(branchmap[butf8]))
         else:
mercurial