7 Commits (16cf85fa2c2da7ff73b2c72afcbb5de26a2bede2)

Author	SHA1	Message	Date
Wladimir J. van der Laan	10d3ae102a	devtools: Auto-set branch to merge to in github-merge ... As we are already using the API to retrieve the pull request title, also retrieve the base branch. This makes sure that pull requests for 0.12 automatically end up in 0.12, and pull requests for master automatically end up in master, and so on. It is still possible to override the branch from the command line or using the `githubmerge.branch` git option.	9 years ago
Wladimir J. van der Laan	f11c5a3cbd	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.	9 years ago
Wladimir J. van der Laan	c8a6c11d6d	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.	9 years ago
Wladimir J. van der Laan	6a5932bf2a	Merge #7402: [devtools] github-merge get toplevel dir without extra whitespace ... 5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)	9 years ago
Andrew C	5ed2f16480	[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.	9 years ago
Wladimir J. van der Laan	17b5d3896f	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.	9 years ago
Wladimir J. van der Laan	da6d18b6c7	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	9 years ago