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.
py3: drop b'' from generate-working-copy-states.py output
authorYuya Nishihara <yuya@tcha.org>
Sun, 04 Mar 2018 18:47:07 -0500
changeset 36786 ed46d48453e8
parent 36785 e2c0c0884b1f
child 36787 4397909f82d3
py3: drop b'' from generate-working-copy-states.py output I could make everything bytes, but decoding filename seemed easier and we don't have to worry about non-ascii filenames here.
contrib/python3-whitelist file | annotate | diff | comparison | revisions
tests/generate-working-copy-states.py file | annotate | diff | comparison | revisions 
--- a/contrib/python3-whitelist	Sun Mar 04 18:41:09 2018 -0500
+++ b/contrib/python3-whitelist	Sun Mar 04 18:47:07 2018 -0500
@@ -200,6 +200,7 @@
 test-merge-commit.t
 test-merge-criss-cross.t
 test-merge-default.t
+test-merge-force.t
 test-merge-internal-tools-pattern.t
 test-merge-local.t
 test-merge-remove.t
--- a/tests/generate-working-copy-states.py	Sun Mar 04 18:41:09 2018 -0500
+++ b/tests/generate-working-copy-states.py	Sun Mar 04 18:47:07 2018 -0500
@@ -66,7 +66,7 @@
 content = []
 for filename, states in combinations:
     if target == 'filelist':
-        print(filename)
+        print(filename.decode('ascii'))
     elif target == 'state':
         if depth == 'wc':
             # Make sure there is content so the file gets written and can be
Mercurial