aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/github-merge.py
AgeCommit message (Collapse)Author
2017-01-13Remove unused Python importspracticalswift
2016-11-06[copyright] copyright header style uniformisle2983
Three categories of modifications: 1) 1 instance of 'The Bitcoin Core developers \n', 1 instance of 'the Bitcoin Core developers\n', 3 instances of 'Bitcoin Core Developers\n', and 12 instances of 'The Bitcoin developers\n' are made uniform with the 443 instances of 'The Bitcoin Core developers\n' 2) 3 instances of 'BitPay, Inc\.\n' are made uniform with the other 6 instances of 'BitPay Inc\.\n' 3) 4 instances where there was no '(c)' between the 'Copyright' and the year where it deviates from the style of the local directory.
2016-04-02devtools: Auto-set branch to merge to in github-mergeWladimir J. van der Laan
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.
2016-03-23devtools: make github-merge.py use py3Wladimir J. van der Laan
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.
2016-01-27devtools: Fix utf-8 support in messages for github-mergeWladimir J. van der Laan
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.
2016-01-25Merge #7402: [devtools] github-merge get toplevel dir without extra whitespaceWladimir J. van der Laan
5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)
2016-01-25[devtools] github-merge get toplevel dir without extra whitespaceAndrew C
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.
2016-01-22devtools: show pull and commit information in github-mergeWladimir J. van der Laan
Print the number and title of the pull, as well as the commits to be merged.
2016-01-20devtools: replace github-merge with python versionWladimir J. van der Laan
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