changeset 28315:9e3f505b1d50

changelog: backed out changeset 86de91c56355
author Matt Mackall <mpm@selenic.com>
date Wed, 02 Mar 2016 16:05:30 -0600
parents 918b64c91e6c
children c0cecc153d25
files mercurial/changelog.py mercurial/context.py
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/changelog.py	Wed Mar 02 12:46:54 2016 -0600
+++ b/mercurial/changelog.py	Wed Mar 02 16:05:30 2016 -0600
@@ -342,7 +342,7 @@
         desc = encoding.tolocal(text[last + 2:])
         l = text[:last].split('\n')
         manifest = bin(l[0])
-        user = l[1]
+        user = encoding.tolocal(l[1])
 
         tdata = l[2].split(' ', 2)
         if len(tdata) != 3:
--- a/mercurial/context.py	Wed Mar 02 12:46:54 2016 -0600
+++ b/mercurial/context.py	Wed Mar 02 16:05:30 2016 -0600
@@ -548,7 +548,7 @@
         return self._changeset[0]
 
     def user(self):
-        return encoding.tolocal(self._changeset[1])
+        return self._changeset[1]
     def date(self):
         return self._changeset[2]
     def files(self):