Commit Graph

16 Commits (master)

Author SHA1 Message Date
Wladimir J. van der Laan e1a57442fd 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.
8 years ago
Wladimir J. van der Laan 7d0542cbc4 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.
8 years ago
isle2983 31f53d8bb8 [copyright] add MIT license headers to .sh scripts where missing
Years are set according to 'git log' history
8 years ago
Peter Todd 2862e189b0 Add README for verify-commits 8 years ago
Peter Todd c2d1d6225e Remove pointless warning
Any attacker who managed to make an evil commit that changed something in the
contrib/verify-commits/ directory could just as easily remove the warning
and/or modify it to not display the evil commits; telling the user to check
those commits specifically misleads them into checking just those commits
rather than the script itself.
8 years ago
Matt Corallo befe6a5368 Make verify-commits path-independent 8 years ago
Matt Corallo acb55ddd01 Make verify-commits POSIX-compliant 8 years ago
Matt Corallo fe83a6df80 Allow to whitelist commits signed with a revoked key
(cherry picked from commit 1d94b72019e31066b33947af5709383b8075e43a)
8 years ago
MarcoFalke e1873f6578 Adjust verify-commits to gitian-builder 8 years ago
Matt Corallo 3be7a42fe9 Fix pre-push-hook regexes 8 years ago
Matt Corallo 73f696920b Add script to verify all merge commits are signed 8 years ago
MarcoFalke 784d87896b Adjust readme for gitian-builder 8 years ago
Wladimir J. van der Laan ee6dee4a2a 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.
8 years ago
Andrew C 7d99dee286 [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.
8 years ago
Wladimir J. van der Laan 0ae5a18069 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.
8 years ago
Wladimir J. van der Laan 992efcf3a5 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
8 years ago