neobytes-project/neobytes
neobytes-project/neobytes
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge #7395: devtools: show pull and commit information in github-merge

Browse Source 
17b5d38 devtools: show pull and commit information in github-merge (Wladimir J. van der Laan)
This commit is contained in:
Wladimir J. van der Laan 2016-01-25 14:58:02 +01:00 committed by Alexander Block
parent 85919332dd
commit d9d9e95e42
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/devtools/github-merge.py
View File

@ -24,6 +24,15 @@ import subprocess
GIT = os.getenv('GIT','git') GIT = os.getenv('GIT','git')
BASH = os.getenv('BASH','bash') BASH = os.getenv('BASH','bash')
# OS specific configuration for terminal attributes
ATTR_RESET = ''
ATTR_PR = ''
COMMIT_FORMAT = '%h %s (%an)%d'
if os.name == 'posix': # if posix, assume we can use basic terminal escapes
ATTR_RESET = '\033[0m'
ATTR_PR = '\033[1;36m'
COMMIT_FORMAT = '%C(bold blue)%h%Creset %s %C(cyan)(%an)%Creset%C(green)%d%Creset'
def git_config_get(option, default=None): def git_config_get(option, default=None):
''' '''
Get named configuration option from git repository. Get named configuration option from git repository.
@ -150,6 +159,9 @@ def main():
print("ERROR: Creating merge failed (already merged?).",file=stderr) print("ERROR: Creating merge failed (already merged?).",file=stderr)
exit(4) exit(4)
print('%s#%s%s %s' % (ATTR_RESET+ATTR_PR,pull,ATTR_RESET,title))
subprocess.check_call([GIT,'log','--graph','--topo-order','--pretty=format:'+COMMIT_FORMAT,base_branch+'..'+head_branch])
print()
# Run test command if configured. # Run test command if configured.
if testcmd: if testcmd:
# Go up to the repository's root. # Go up to the repository's root.