mercurial/obsutil.py
changeset 38707 6b5ca1d0aa1e
parent 38706 83d965803325
child 39300 52e6171ec822
--- a/mercurial/obsutil.py	Sun Jul 15 18:22:40 2018 +0900
+++ b/mercurial/obsutil.py	Sun Jul 15 18:24:57 2018 +0900
@@ -12,6 +12,7 @@
 from .i18n import _
 from . import (
     diffutil,
+    encoding,
     node as nodemod,
     phases,
     util,
@@ -822,7 +823,8 @@
     """ Returns a sorted list of markers users without duplicates
     """
     markersmeta = [dict(m[3]) for m in markers]
-    users = set(meta['user'] for meta in markersmeta if meta.get('user'))
+    users = set(encoding.tolocal(meta['user']) for meta in markersmeta
+                if meta.get('user'))
 
     return sorted(users)