Mercurial > hg-stable
changeset 36794:ed46d48453e8
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.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Sun, 04 Mar 2018 18:47:07 -0500 |
| parents | e2c0c0884b1f |
| children | 4397909f82d3 |
| files | contrib/python3-whitelist tests/generate-working-copy-states.py |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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