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 prints the branch it is about to merge into. It is still possible to override the branch from the command line or using the githubmerge.branch git option.
Concept ACK; this has been a feature I've wanted for a while.
Nice! Concept ACK. Great safety measure also.
utACK c1cff21
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.
120 | + # - base branch for pull (as retrieved from github) 121 | + # - 'master' 122 | branch = args.branch 123 | + branch = opt_branch if branch is None else branch 124 | + branch = info['base']['ref'] if branch is None else branch 125 | + branch = 'master' if branch is None else branch
Nit: Couldn't this be just one line?
Something like
branch = args.branch or opt_branch or info['base']['ref'] or 'master'
That's much shorter, also seems to work:
>>> None or 'a' or 'b' or 'c'
'a'
>>> None or None or 'b' or 'c'
'b'
>>> None or None or None or 'c'
'c'
>>> 'f' or None or None or 'c'
'f'
I think the subtle difference in this case is that '' is seen as False (hence the use of is None. But doesn't matter here, an empty branch name is pointless.
utACK 10d3ae1
I've been using this version for a few days, both on master and 0.12, seems to work. Tested ACK 10d3ae1