# HG changeset patch # User Yuya Nishihara <y...@tcha.org> # Date 1520207227 18000 # Sun Mar 04 18:47:07 2018 -0500 # Node ID 0ff68d961b986c69fac32c02c6ee6b34fe84b923 # Parent e121d58f97b1cb94d3a45972bbfb7cf9f477d3cf 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. diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist --- a/contrib/python3-whitelist +++ b/contrib/python3-whitelist @@ -200,6 +200,7 @@ test-merge-closedheads.t 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 diff --git a/tests/generate-working-copy-states.py b/tests/generate-working-copy-states.py --- a/tests/generate-working-copy-states.py +++ b/tests/generate-working-copy-states.py @@ -66,7 +66,7 @@ combinations = sorted(generatestates(max 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-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel