AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Fix branch name in merge script.

Browse Source 
BUG=chromium:451975
TBR=tandrii@chromium.org
NOTRY=true
LOG=n

TEST=./script_test.py

Review URL: https://codereview.chromium.org/925313002

Cr-Commit-Position: refs/heads/master@{#26657}
This commit is contained in:
machenbach 2015-02-16 03:57:29 -08:00 committed by Commit bot
parent 6834d3abdf
commit bbb639adb7
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tools/release/common_includes.py
View File

@ -331,9 +331,19 @@ class GitInterface(VCInterface):
return "origin/candidates" return "origin/candidates"
def RemoteBranch(self, name): def RemoteBranch(self, name):
# Assume that if someone "fully qualified" the ref, they know what they
# want.
if name.startswith('refs/'):
return name
if name in ["candidates", "master"]: if name in ["candidates", "master"]:
return "origin/%s" % name return "refs/remotes/origin/%s" % name
return "branch-heads/%s" % name # Check if branch is in heads.
if self.Git("show-ref refs/remotes/origin/%s" % name).strip():
return "refs/remotes/origin/%s" % name
# Check if branch is in branch-heads.
if self.Git("show-ref refs/remotes/branch-heads/%s" % name).strip():
return "refs/remotes/branch-heads/%s" % name
self.Die("Can't find remote of %s" % name)
def Tag(self, tag, remote, message): def Tag(self, tag, remote, message):
# Wait for the commit to appear. Assumes unique commit message titles (this # Wait for the commit to appear. Assumes unique commit message titles (this

6
tools/release/test_scripts.py
View File

@ -1191,7 +1191,7 @@ LOG=N
Cmd("git status -s -b -uno", "## some_branch\n"), Cmd("git status -s -b -uno", "## some_branch\n"),
Cmd("git fetch", ""), Cmd("git fetch", ""),
Cmd("git branch", " branch1\n* branch2\n"), Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git new-branch %s --upstream origin/candidates" % Cmd("git new-branch %s --upstream refs/remotes/origin/candidates" %
TEST_CONFIG["BRANCHNAME"], ""), TEST_CONFIG["BRANCHNAME"], ""),
Cmd(("git log --format=%H --grep=\"Port ab12345\" " Cmd(("git log --format=%H --grep=\"Port ab12345\" "
"--reverse origin/master"), "--reverse origin/master"),
@ -1253,12 +1253,12 @@ LOG=N
Cmd("git fetch", ""), Cmd("git fetch", ""),
Cmd("git log -1 --format=%H --grep=\"" Cmd("git log -1 --format=%H --grep=\""
"Version 3.22.5.1 (cherry-pick)" "Version 3.22.5.1 (cherry-pick)"
"\" origin/candidates", "\" refs/remotes/origin/candidates",
""), ""),
Cmd("git fetch", ""), Cmd("git fetch", ""),
Cmd("git log -1 --format=%H --grep=\"" Cmd("git log -1 --format=%H --grep=\""
"Version 3.22.5.1 (cherry-pick)" "Version 3.22.5.1 (cherry-pick)"
"\" origin/candidates", "\" refs/remotes/origin/candidates",
"hsh_to_tag"), "hsh_to_tag"),
Cmd("git tag 3.22.5.1 hsh_to_tag", ""), Cmd("git tag 3.22.5.1 hsh_to_tag", ""),
Cmd("git push origin 3.22.5.1", ""), Cmd("git push origin 3.22.5.1", ""),