# HG changeset patch # User David Soria Parra # Date 1297449169 -3600 # Node ID d073468e3c5f2b6160c54a513badd031883ed2ad # Parent d11405848abd117584535dab70eeac13ceb2a9dd bookmarks: read current bookmark as utf-8 and convert it to local diff -r d11405848abd -r d073468e3c5f mercurial/bookmarks.py --- a/mercurial/bookmarks.py Mon Feb 14 07:39:21 2011 +0000 +++ b/mercurial/bookmarks.py Fri Feb 11 19:32:49 2011 +0100 @@ -38,7 +38,7 @@ if os.path.exists(repo.join('bookmarks.current')): file = repo.opener('bookmarks.current') # No readline() in posixfile_nt, reading everything is cheap - mark = (file.readlines() or [''])[0] + mark = encoding.tolocal((file.readlines() or [''])[0]) if mark == '': mark = None file.close()