Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fastannotate: use stringutil.pprint() to dump diffopts to be hashed
authorYuya Nishihara <yuya@tcha.org>
Sat, 01 Sep 2018 10:40:48 +0900
changeset 39386 2df3271ef139
parent 39385 34ef6a5a7bcd
child 39387 da84cca65036
fastannotate: use stringutil.pprint() to dump diffopts to be hashed
hgext/fastannotate/context.py file | annotate | diff | comparison | revisions
tests/test-check-py3-compat.t file | annotate | diff | comparison | revisions 
--- a/hgext/fastannotate/context.py	Sat Sep 01 10:23:13 2018 +0900
+++ b/hgext/fastannotate/context.py	Sat Sep 01 10:40:48 2018 +0900
@@ -23,6 +23,9 @@
     scmutil,
     util,
 )
+from mercurial.utils import (
+    stringutil,
+)
 
 from . import (
     error as faerror,
@@ -131,7 +134,7 @@
             .replace('.lock/', '.lock.hg/'))
 
 def hashdiffopts(diffopts):
-    diffoptstr = str(sorted(
+    diffoptstr = stringutil.pprint(sorted(
         (k, getattr(diffopts, k))
         for k in mdiff.diffopts.defaults
     ))
--- a/tests/test-check-py3-compat.t	Sat Sep 01 10:23:13 2018 +0900
+++ b/tests/test-check-py3-compat.t	Sat Sep 01 10:40:48 2018 +0900
@@ -31,11 +31,6 @@
   > | sed 's|\\|/|g' | xargs python3 contrib/check-py3-compat.py \
   > | sed 's/[0-9][0-9]*)$/*)/'
   hgext/convert/transport.py: error importing: <*Error> No module named 'svn.client' (error at transport.py:*) (glob) (?)
-  hgext/fastannotate/commands.py: error importing: <TypeError> Unicode-objects must be encoded before hashing (error at context.py:*)
-  hgext/fastannotate/context.py: error importing: <TypeError> Unicode-objects must be encoded before hashing (error at context.py:*)
-  hgext/fastannotate/formatter.py: error importing: <TypeError> Unicode-objects must be encoded before hashing (error at context.py:*)
-  hgext/fastannotate/protocol.py: error importing: <TypeError> Unicode-objects must be encoded before hashing (error at context.py:*)
-  hgext/fastannotate/support.py: error importing: <TypeError> Unicode-objects must be encoded before hashing (error at context.py:*)
   hgext/infinitepush/sqlindexapi.py: error importing: <*Error> No module named 'mysql' (error at sqlindexapi.py:*) (glob) (?)
   mercurial/scmwindows.py: error importing: <ValueError> _type_ 'v' not supported (error at win32.py:*) (no-windows !)
   mercurial/win32.py: error importing: <ValueError> _type_ 'v' not supported (error at win32.py:*) (no-windows !)
Mercurial