aboutsummaryrefslogtreecommitdiff
path: root/contrib/devtools/github-merge.py
Commit message (Collapse)AuthorAgeFilesLines
* contrib: Allow use of github API authentication in github-mergeWladimir J. van der Laan2019-01-141-2/+6
| | | | | | | | | The API request limit for unauthenticated requests is quite low. I started running into rate limiting errors. The limit for authenticated requests is much higher. This patch adds an optional configuration setting `user.ghtoken` that, when set, is used to authenticate requests to the API.
* contrib: Add support for http[s] URLs in github-mergeWladimir J. van der Laan2019-01-141-1/+4
| | | | | Sometimes it can be useful to use github-merge with read-only access (say, for reviewing and testing).
* contrib: Detailed reporting for http errors in github-mergeWladimir J. van der Laan2019-01-141-0/+6
| | | | Print detailed error, this makes it easier to diagnose github API issues.
* Remove Python 2 import workaroundspracticalswift2018-12-131-5/+1
|
* Handle exception as ImportErrorDaniel Ingram2018-12-091-1/+1
|
* Explicitly specify encoding when opening text files in Python codepracticalswift2018-06-121-1/+1
|
* Minor Python cleanups to make flake8 pass with the new rules enabledpracticalswift2018-04-161-1/+2
|
* Remove assigned but never used local variablespracticalswift2018-03-291-9/+9
|
* github-merge: Coalesce git fetchesWladimir J. van der Laan2017-09-051-7/+3
| | | | | | Fetch the destination branch as well as PR in one go. Saves a few seconds (as well as one ssh authentication, when using a yubikey) when using github-merge.py.
* Use print(...) instead of undefined printf(...)practicalswift2017-08-281-2/+2
|
* Use sys.exit(...) instead of exit(...): exit(...) should not be used in programspracticalswift2017-08-281-18/+19
|
* Add PR description to merge commit in github-merge.pyPieter Wuille2017-07-101-0/+2
|
* devtools: Retry after signing fails in github-mergeWladimir J. van der Laan2017-05-311-2/+1
| | | | | When signing fails, go back to the sign/exit prompt instead of exiting the script.
* Remove unused Python importspracticalswift2017-05-021-1/+1
|
* contrib: github-merge improvementsWladimir J. van der Laan2017-04-211-29/+26
| | | | | | | | | | | | | | | | | | | | | | | | | Some minor github-merge improvements I've made over time: User interface: - Print merge details again before signing off, to refresh your memory - usually I'll have done lots of different things in the shell so this will have scrolled out a long time ago. - Require a valid answer on the prompts. One of the requested answers must be typed, if not, the prompt will re-ask. This prevents accidentally rejecting. Efficiency: - Condense "accept merge" and "sign off" prompts. There's no reason to have this as two separate prompts, both are just opportunities to skip out on the merge, no action is performed in between. Merging: - Strip spaces from github title. This avoids redundant spaces surrounding it from getting into the commit message.
* devtools: Make github-merge compute SHA512 from git, instead of worktreeWladimir J. van der Laan2017-03-131-8/+37
| | | | | | | | | This changes tree_sha512sum() to requests the objects for hashing from git instead of from the working tree. The change should make the process more deterministic (it hashes what will be pushed) and hopefully avoids the frequent miscomputed SHA512's that happen now.
* devtools: Fix a syntax error typoWladimir J. van der Laan2017-03-071-1/+1
| | | | Fix a typo introduced in #9880 causing the script to not even parse.
* Merge #9880: Verify Tree-SHA512s in merge commits, enforce sigs are not SHA1Wladimir J. van der Laan2017-03-061-0/+14
|\ | | | | | | | | | | | | | | | | | | bbd7579 Fix regsig checking for subkey sigs in verify-commits (Matt Corallo) d025bc7 Allow any subkey in verify-commits (Matt Corallo) eddc77a Add comment re: why SHA1 is disabled (Peter Todd) d9c450f Verify Tree-SHA512s in merge commits, enforce sigs are not SHA1 (Matt Corallo) be908a6 Fail merge if there are any symlinks (Matt Corallo) Tree-SHA512: bb66c59cc1c6b1c86d7d8be7adb0769c6598c0e28ad927409941f30af87d390521e82fc13700ee22e92db1bd571db3e19a152ec7b2c0349c6e06f5de62c0b65f
| * Fail merge if there are any symlinksMatt Corallo2017-03-011-0/+14
| |
* | [contrib] gh-merge: Move second sha512 check to before signingMarcoFalke2017-03-031-4/+5
|/
* Add SHA512 tree hash to merge commitsPieter Wuille2017-02-261-3/+43
|
* Remove unused Python importspracticalswift2017-01-131-1/+1
|
* [copyright] copyright header style uniformisle29832016-11-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | 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.
* devtools: Auto-set branch to merge to in github-mergeWladimir J. van der Laan2016-04-021-12/+22
| | | | | | | | | | | | 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.
* devtools: make github-merge.py use py3Wladimir J. van der Laan2016-03-231-7/+13
| | | | | | | | | | | | | | 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.
* devtools: Fix utf-8 support in messages for github-mergeWladimir J. van der Laan2016-01-271-3/+3
| | | | | | | | 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.
* Merge #7402: [devtools] github-merge get toplevel dir without extra whitespaceWladimir J. van der Laan2016-01-251-1/+1
|\ | | | | | | 5ed2f16 [devtools] github-merge get toplevel dir without extra whitespace (Andrew C)
| * [devtools] github-merge get toplevel dir without extra whitespaceAndrew C2016-01-251-1/+1
| | | | | | | | 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.
* | devtools: show pull and commit information in github-mergeWladimir J. van der Laan2016-01-221-0/+12
|/ | | | | Print the number and title of the pull, as well as the commits to be merged.
* devtools: replace github-merge with python versionWladimir J. van der Laan2016-01-201-0/+223
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
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-20 20:07:31 +0000