Return-Path: X-Original-To: apmail-mesos-commits-archive@www.apache.org Delivered-To: apmail-mesos-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 225E517E69 for ; Thu, 21 May 2015 00:18:41 +0000 (UTC) Received: (qmail 43280 invoked by uid 500); 21 May 2015 00:18:41 -0000 Delivered-To: apmail-mesos-commits-archive@mesos.apache.org Received: (qmail 43206 invoked by uid 500); 21 May 2015 00:18:41 -0000 Mailing-List: contact commits-help@mesos.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@mesos.apache.org Delivered-To: mailing list commits@mesos.apache.org Received: (qmail 43183 invoked by uid 99); 21 May 2015 00:18:41 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 21 May 2015 00:18:41 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DABCAE022E; Thu, 21 May 2015 00:18:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jieyu@apache.org To: commits@mesos.apache.org Date: Thu, 21 May 2015 00:18:41 -0000 Message-Id: In-Reply-To: <16c1c7d05e0a45ebadf9336755562d86@git.apache.org> References: <16c1c7d05e0a45ebadf9336755562d86@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/3] mesos git commit: Renamed parent_branch to tracking_branch in post-reviews.py. Renamed parent_branch to tracking_branch in post-reviews.py. Review: https://reviews.apache.org/r/34485 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2e333790 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2e333790 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2e333790 Branch: refs/heads/master Commit: 2e333790efd340291e246c6380da9a895deaa797 Parents: 1af08ab Author: Jie Yu Authored: Wed May 20 11:16:18 2015 -0700 Committer: Jie Yu Committed: Wed May 20 17:09:59 2015 -0700 ---------------------------------------------------------------------- support/post-reviews.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/2e333790/support/post-reviews.py ---------------------------------------------------------------------- diff --git a/support/post-reviews.py b/support/post-reviews.py index ec385a5..485b2f9 100755 --- a/support/post-reviews.py +++ b/support/post-reviews.py @@ -85,7 +85,7 @@ if diff_stat: top_level_dir = execute(['git', 'rev-parse', '--show-toplevel']).strip() -parent_branch = 'master' +tracking_branch = 'master' branch_ref = execute(['git', 'symbolic-ref', 'HEAD']).strip() branch = branch_ref.replace('refs/heads/', '', 1) @@ -103,7 +103,7 @@ atexit.register(lambda: execute(['git', 'branch', '-D', temporary_branch], True) # Always put us back on the original branch. atexit.register(lambda: execute(['git', 'checkout', branch])) -merge_base = execute(['git', 'merge-base', parent_branch, branch_ref]).strip() +merge_base = execute(['git', 'merge-base', tracking_branch, branch_ref]).strip() print 'Running \'%s\' across all of ...' % " ".join(post_review) @@ -133,7 +133,7 @@ for line in log.split('\n'): shas.append(sha) -previous = parent_branch +previous = tracking_branch parent_review_request_id = None for i in range(len(shas)): sha = shas[i] @@ -175,7 +175,7 @@ for i in range(len(shas)): '--no-pager', 'log', '--pretty=format:%Cred%H%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset', - parent_branch + '..' + previous]) + tracking_branch + '..' + previous]) try: raw_input('\nPress enter to continue or \'Ctrl-C\' to skip.\n') @@ -188,7 +188,7 @@ for i in range(len(shas)): revision_range = previous + ':' + sha # Build the post-review/rbt command up to the point where they are common. - command = post_review + ['--tracking-branch=' + parent_branch] + command = post_review + ['--tracking-branch=' + tracking_branch] if review_request_id: command = command + ['--review-request-id=' + review_request_id]