Skip to content
Snippets Groups Projects
Commit 2df3271ef139 authored by Yuya Nishihara's avatar Yuya Nishihara
Browse files

fastannotate: use stringutil.pprint() to dump diffopts to be hashed

parent 34ef6a5a7bcd
No related branches found
No related tags found
No related merge requests found
......@@ -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
))
......
......@@ -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 !)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment