Commit Graph

5 Commits

Author SHA1 Message Date
Wladimir J. van der Laan
48d9e58483 devtools: make github-merge.py use py3
This makes github-merge.py the first developer tool to go
all Python 3 (for context see #7717).

The changes are straightforward as the script already was
`from __future__ import division,print_function,unicode_literals`.

However urllib2 changed name, and json will only accept unicode data not
bytes.

This retains py2 compatibility for now: not strictly necessary
as it's not used by the build system - but it was easy.
2018-11-09 22:51:32 +03:00
Wladimir J. van der Laan
f1084d15b1 devtools: Fix utf-8 support in messages for github-merge
Use 'utf-8' instead of the Python 2 default of 'ascii' to encode/decode
commit messages.
This can be removed when switching to Python 3, as 'utf-8' is the
default there.
Necessary for merging #7422 due to the ฿ in ฿tcDrak.
2018-11-09 22:51:24 +03:00
Andrew C
f6d3a70fbf [devtools] github-merge get toplevel dir without extra whitespace
Fixes a bug in github merge when it runs the tests where the toplevel directory has an extra '\n' appended to the path string. Now it doesn't.
2018-11-09 22:51:15 +03:00
Wladimir J. van der Laan
7dfa83448d devtools: show pull and commit information in github-merge
Print the number and title of the pull, as well as the commits to be
merged.
2018-11-09 22:51:06 +03:00
Wladimir J. van der Laan
ceeecd99da devtools: replace github-merge with python version
This is meant to be a direct translation of the bash script,
with the difference that it retrieves the PR title from github,
thus creating pull messages like:

    Merge #12345: Expose transaction temperature over RPC
2018-11-09 22:50:54 +03:00