D7193: py3: fix exception message encoding in scmutil.py's simplekeyvaluefile.read

2019-11-01 Thread touilleMan (Leblond Emmanuel)
touilleMan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REPOSITORY
  rHG Mercurial

REVISION DETAIL
  https://phab.mercurial-scm.org/D7193

AFFECTED FILES
  mercurial/scmutil.py

CHANGE DETAILS

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1854,7 +1854,7 @@
 raise error.CorruptedState(e % self.firstlinekey)
 d.update(updatedict)
 except ValueError as e:
-raise error.CorruptedState(str(e))
+raise error.CorruptedState(stringutil.forcebytestr(e))
 return d
 
 def write(self, data, firstline=None):



To: touilleMan, #hg-reviewers
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel


D7193: py3: fix exception message encoding in scmutil.py's simplekeyvaluefile.read

2019-11-01 Thread touilleMan (Leblond Emmanuel)
Closed by commit rHG8a1d9e252ea4: py3: fix exception message encoding in 
scmutil.py's simplekeyvaluefile.read (authored by touilleMan).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7193?vs=17447&id=17454

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7193/new/

REVISION DETAIL
  https://phab.mercurial-scm.org/D7193

AFFECTED FILES
  mercurial/scmutil.py

CHANGE DETAILS

diff --git a/mercurial/scmutil.py b/mercurial/scmutil.py
--- a/mercurial/scmutil.py
+++ b/mercurial/scmutil.py
@@ -1854,7 +1854,7 @@
 raise error.CorruptedState(e % self.firstlinekey)
 d.update(updatedict)
 except ValueError as e:
-raise error.CorruptedState(str(e))
+raise error.CorruptedState(stringutil.forcebytestr(e))
 return d
 
 def write(self, data, firstline=None):



To: touilleMan, #hg-reviewers, indygreg
Cc: mercurial-devel
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel