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

Fix new git workflow in release scripts.

Browse Source 
Need to svn fetch in order to make svn find-rev work.

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

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

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@24666 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
machenbach@chromium.org 2014-10-16 13:45:59 +00:00
parent e8c3708825
commit b4d92528db
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/push-to-trunk/common_includes.py
View File

@ -370,6 +370,7 @@ class GitTagsOnlyMixin(VCInterface):
def Fetch(self):
self.step.Git("fetch")
self.step.GitSVNFetch()
def GetTags(self):
return self.step.Git("tag").strip().splitlines()

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

@ -901,6 +901,7 @@ Performance and stability improvements on all platforms.""", commit)
Cmd("git status -s -uno", ""),
Cmd("git status -s -b -uno", "## some_branch\n"),
Cmd("git fetch", ""),
Cmd("git svn fetch", ""),
Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git checkout -b %s origin/master" % TEST_CONFIG["BRANCHNAME"],
@ -922,6 +923,7 @@ Performance and stability improvements on all platforms.""", commit)
Cmd("git log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"),
Cmd("git log -1 --format=%an rev1", "author1@chromium.org\n"),
Cmd("git fetch", "fetch result\n"),
Cmd("git svn fetch", ""),
Cmd("git checkout -f origin/master", ""),
Cmd("git diff origin/candidates push_hash", "patch content\n"),
Cmd("git svn find-rev push_hash", "123455\n"),
@ -1342,6 +1344,7 @@ LOG=N
Cmd("git status -s -uno", ""),
Cmd("git status -s -b -uno", "## some_branch\n"),
Cmd("git fetch", ""),
Cmd("git svn fetch", ""),
Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git checkout -b %s origin/candidates" %
TEST_CONFIG["BRANCHNAME"], ""),
@ -1514,6 +1517,7 @@ git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3456 0039-1c4b
Cmd("git status -s -uno", ""),
Cmd("git status -s -b -uno", "## some_branch\n"),
Cmd("git fetch", ""),
Cmd("git svn fetch", ""),
Cmd("git branch", " branch1\n* branch2\n"),
Cmd("git checkout -b %s" % TEST_CONFIG["BRANCHNAME"], ""),
Cmd("git branch -r", " branch-heads/3.21\n branch-heads/3.3\n"),