Repository: mesos Updated Branches: refs/heads/master 3de248615 -> 870ee5d69
Updated post-reviews.py to print parent diff only if one exists. Makes the `... with parent diff created from:` show up only if such parent diff exists. Review: https://reviews.apache.org/r/35772 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/870ee5d6 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/870ee5d6 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/870ee5d6 Branch: refs/heads/master Commit: 870ee5d69aad011782042de7b9f61683107b7687 Parents: 3de2486 Author: Michael Park <[email protected]> Authored: Thu Jun 25 00:56:04 2015 +0200 Committer: Till Toenshoff <[email protected]> Committed: Thu Jun 25 00:56:04 2015 +0200 ---------------------------------------------------------------------- support/post-reviews.py | 60 ++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/870ee5d6/support/post-reviews.py ---------------------------------------------------------------------- diff --git a/support/post-reviews.py b/support/post-reviews.py index 92f565c..f337649 100755 --- a/support/post-reviews.py +++ b/support/post-reviews.py @@ -29,7 +29,7 @@ import sys from distutils.version import LooseVersion -from subprocess import call, Popen, PIPE, STDOUT +from subprocess import check_output, Popen, PIPE, STDOUT def execute(command, ignore_errors=False): process = None @@ -121,13 +121,15 @@ atexit.register(lambda: execute(['git', 'checkout', branch])) merge_base = execute(['git', 'merge-base', tracking_branch, branch_ref]).strip() -print 'Running \'%s\' across all of ...' % " ".join(post_review) -call(['git', - '--no-pager', - 'log', - '--pretty=format:%Cred%H%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset', - merge_base + '..HEAD']) +output = check_output([ + 'git', + '--no-pager', + 'log', + '--pretty=format:%Cred%H%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset', + merge_base + '..HEAD']) +print 'Running \'%s\' across all of ...' % " ".join(post_review) +print output log = execute(['git', '--no-pager', @@ -170,27 +172,35 @@ for i in range(len(shas)): # Show the commit. if review_request_id is None: - print '\n\nCreating diff of:' - call(['git', - '--no-pager', - 'log', - '--pretty=format:%Cred%H%Creset -%C(yellow)%d%Creset %s', - previous + '..' + sha]) + output = check_output([ + 'git', + '--no-pager', + 'log', + '--pretty=format:%Cred%H%Creset -%C(yellow)%d%Creset %s', + previous + '..' + sha]) + print '\nCreating diff of:' + print output else: - print '\n\nUpdating diff of:' - call(['git', - '--no-pager', - 'log', - '--pretty=format:%Cred%H%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset', - previous + '..' + sha]) + output = check_output([ + 'git', + '--no-pager', + 'log', + '--pretty=format:%Cred%H%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset', + previous + '..' + sha]) + print '\nUpdating diff of:' + print output # Show the "parent" commit(s). - print '\n\n... with parent diff created from:' - call(['git', - '--no-pager', - 'log', - '--pretty=format:%Cred%H%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset', - tracking_branch + '..' + previous]) + output = check_output([ + 'git', + '--no-pager', + 'log', + '--pretty=format:%Cred%H%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset', + tracking_branch + '..' + previous]) + + if output: + print '\n... with parent diff created from:' + print output try: raw_input('\nPress enter to continue or \'Ctrl-C\' to skip.\n')
