##// END OF EJS Templates
Merge pull request #12833 from meeseeksmachine/auto-backport-of-pr-12826-on-7.x...
Merge pull request #12833 from meeseeksmachine/auto-backport-of-pr-12826-on-7.x Backport PR #12826 on branch 7.x (IPDB: "context" command)

File last commit:

r24382:d9fd2cee
r26347:bd4d0a4f merge
Show More
git-mpr.py
127 lines | 4.0 KiB | text/x-python | PythonLexer
Matthias BUSSONNIER
merge pull request by number...
r7254 #!/usr/bin/env python
# -*- coding: utf-8 -*-
"""
Usage:
Fernando Perez
Create a branch for the merge, so it's easier to do local testing...
r10749 git-mpr [-h] [-l | -a] [pr-number [pr-number ...]]
Type `git mpr -h` for details.
Matthias BUSSONNIER
merge pull request by number...
r7254 """
Fernando Perez
Create a branch for the merge, so it's easier to do local testing...
r10749
Matthias BUSSONNIER
merge pull request by number...
r7254
Matthias BUSSONNIER
fix mpr for earlier git version
r8030 import io, os
Matthias BUSSONNIER
some fixs
r7448 import argparse
Matthias BUSSONNIER
more cleaning
r7457 from subprocess import check_call, CalledProcessError
Matthias BUSSONNIER
merge pull request by number...
r7254
import gh_api
ipy_repository = 'git://github.com/ipython/ipython.git'
Matthias BUSSONNIER
more cleaning
r7457 gh_project = "ipython/ipython"
not_merged = {}
Matthias BUSSONNIER
merge pull request by number...
r7254
Matthias BUSSONNIER
more cleaning
r7457 def merge_branch(repo, branch ):
Matthias BUSSONNIER
some fixs
r7448 """try to merge the givent branch into the current one
If something does not goes smoothly, merge is aborted
luzpaz
Misc. typo fixes...
r24084 Returns True if merge successful, False otherwise
Matthias BUSSONNIER
some fixs
r7448 """
Matthias BUSSONNIER
merge pull request by number...
r7254 # Delete the branch first
try :
Matthias BUSSONNIER
fix mpr for earlier git version
r8030 check_call(['git', 'pull', repo, branch], stdin=io.open(os.devnull))
Matthias BUSSONNIER
merge pull request by number...
r7254 except CalledProcessError :
check_call(['git', 'merge', '--abort'])
return False
return True
Fernando Perez
Create a branch for the merge, so it's easier to do local testing...
r10749
def git_new_branch(name):
"""Create a new branch with the given name and check it out.
"""
check_call(['git', 'checkout', '-b', name])
Matthias BUSSONNIER
some fixs
r7448
Fernando Perez
Create a branch for the merge, so it's easier to do local testing...
r10749
Matthias BUSSONNIER
fix mpr...
r7927 def merge_pr(num):
Matthias BUSSONNIER
some fixs
r7448 """ try to merge the branch of PR `num` into current branch
"""
Matthias BUSSONNIER
merge pull request by number...
r7254 # Get Github authorisation first, so that the user is prompted straight away
# if their login is needed.
Matthias BUSSONNIER
fix mpr...
r7927 pr = gh_api.get_pull_request(gh_project, num)
repo = pr['head']['repo']['clone_url']
Matthias BUSSONNIER
merge pull request by number...
r7254
Matthias BUSSONNIER
fix 2->3
r7450
Matthias BUSSONNIER
some fixs
r7448 branch = pr['head']['ref']
mergeable = merge_branch(repo=repo,
Matthias BUSSONNIER
merge pull request by number...
r7254 branch=branch,
)
if not mergeable :
cmd = "git pull "+repo+" "+branch
Matthias BUSSONNIER
some fixs
r7448 not_merged[str(num)] = cmd
Matthias BUSSONNIER
merge pull request by number...
r7254 print("==============================================================================")
apunisal
Changed a misspelled word in tools/git-mpr.py
r24382 print("Something went wrong merging this branch, you can try it manually by running :")
Matthias BUSSONNIER
merge pull request by number...
r7254 print(cmd)
print("==============================================================================")
Matthias BUSSONNIER
some fixs
r7448 def main(*args):
Matthias BUSSONNIER
merge pull request by number...
r7254 parser = argparse.ArgumentParser(
description="""
Matthias BUSSONNIER
fix help string, drop mflag
r8045 Merge one or more github pull requests by their number. If any
one pull request can't be merged as is, its merge is ignored
and the process continues with the next ones (if any).
Matthias BUSSONNIER
merge pull request by number...
r7254 """
)
grp = parser.add_mutually_exclusive_group()
grp.add_argument(
'-l',
'--list',
action='store_const',
const=True,
help='list PR, their number and their mergeability')
grp.add_argument('-a',
'--merge-all',
action='store_const',
const=True ,
help='try to merge as many PR as possible, one by one')
Bussonnier Matthias
fix mpr again
r8144 parser.add_argument('merge',
Matthias BUSSONNIER
merge pull request by number...
r7254 type=int,
help="The pull request numbers",
nargs='*',
metavar='pr-number')
args = parser.parse_args()
Matthias BUSSONNIER
some fixs
r7448
Matthias BUSSONNIER
merge pull request by number...
r7254 if(args.list):
Matthias BUSSONNIER
fix mpr...
r7927 pr_list = gh_api.get_pulls_list(gh_project)
Matthias BUSSONNIER
merge pull request by number...
r7254 for pr in pr_list :
Matthias BUSSONNIER
fix mpr...
r7927 mergeable = gh_api.get_pull_request(gh_project, pr['number'])['mergeable']
Matthias BUSSONNIER
merge pull request by number...
r7254
ismgb = u"√" if mergeable else " "
print(u"* #{number} [{ismgb}]: {title}".format(
number=pr['number'],
title=pr['title'],
ismgb=ismgb))
if(args.merge_all):
Fernando Perez
Create a branch for the merge, so it's easier to do local testing...
r10749 branch_name = 'merge-' + '-'.join(str(pr['number']) for pr in pr_list)
git_new_branch(branch_name)
Matthias BUSSONNIER
merge pull request by number...
r7254 pr_list = gh_api.get_pulls_list(gh_project)
for pr in pr_list :
merge_pr(pr['number'])
elif args.merge:
Fernando Perez
Create a branch for the merge, so it's easier to do local testing...
r10749 branch_name = 'merge-' + '-'.join(map(str, args.merge))
git_new_branch(branch_name)
Matthias BUSSONNIER
merge pull request by number...
r7254 for num in args.merge :
Matthias BUSSONNIER
fix mpr...
r7927 merge_pr(num)
Matthias BUSSONNIER
merge pull request by number...
r7254
if not_merged :
print('*************************************************************************************')
luz.paz
Fix documentation typos...
r24322 print('The following branch has not been merged automatically, consider doing it by hand :')
Matthias BUSSONNIER
more cleaning
r7457 for num, cmd in not_merged.items() :
print( "PR {num}: {cmd}".format(num=num, cmd=cmd))
Matthias BUSSONNIER
merge pull request by number...
r7254 print('*************************************************************************************')
Matthias BUSSONNIER
some fixs
r7448
if __name__ == '__main__':
main()