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

Fix resolving svn revisions in release scripts.

Browse Source 
BUG=chromium:410721
LOG=n
TEST=script_test.py
R=tandrii@chromium.org
TBR=tandrii@chromium.org

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24247 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
machenbach@chromium.org 2014-09-26 10:16:16 +00:00
parent b7cf053937
commit 7dcec61269
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/push-to-trunk/git_recipes.py
View File

@ -295,8 +295,11 @@ class GitRecipesMixin(object):
@Strip @Strip
def GitSVNFindGitHash(self, revision, branch="", **kwargs): def GitSVNFindGitHash(self, revision, branch="", **kwargs):
assert revision assert revision
return self.Git( args = MakeArgs(["svn find-rev", "r%s" % revision, branch])
MakeArgs(["svn find-rev", "r%s" % revision, branch]), **kwargs)
# Pick the last line if multiple lines are available. The first lines might
# print information about rebuilding the svn-git mapping.
return self.Git(args, **kwargs).splitlines()[-1]
@Strip @Strip
def GitSVNFindSVNRev(self, git_hash, branch="", **kwargs): def GitSVNFindSVNRev(self, git_hash, branch="", **kwargs):

3
tools/push-to-trunk/test_scripts.py
View File

@ -1221,7 +1221,8 @@ LOG=N
Cmd("git svn find-rev hash3 origin/master", "56789"), Cmd("git svn find-rev hash3 origin/master", "56789"),
Cmd("git log -1 --format=%s hash3", "Title3"), Cmd("git log -1 --format=%s hash3", "Title3"),
RL("Y"), # Automatically add corresponding ports (34567, 56789)? RL("Y"), # Automatically add corresponding ports (34567, 56789)?
Cmd("git svn find-rev r12345 origin/master", "hash4"), Cmd("git svn find-rev r12345 origin/master",
"Partial-rebuilding bla\nDone rebuilding blub\nhash4"),
# Simulate svn being down which stops the script. # Simulate svn being down which stops the script.
Cmd("git svn find-rev r23456 origin/master", None), Cmd("git svn find-rev r23456 origin/master", None),
# Restart script in the failing step. # Restart script in the failing step.