Reviewers: tandrii,
Message:
PTAL
Description:
Make releases script ready for the new git workflow.
BUG=chromium:410721
LOG=n
TEST=script_test.py
[email protected]
Please review this at https://codereview.chromium.org/646383002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+34, -13 lines):
M tools/push-to-trunk/common_includes.py
M tools/push-to-trunk/releases.py
Index: tools/push-to-trunk/common_includes.py
diff --git a/tools/push-to-trunk/common_includes.py
b/tools/push-to-trunk/common_includes.py
index
acbb506b1688d131abadf1e4bca2cd5ec4744240..ed3b1fa62535615e8b4bd3d6845e842b76b854b6
100644
--- a/tools/push-to-trunk/common_includes.py
+++ b/tools/push-to-trunk/common_includes.py
@@ -277,6 +277,12 @@ class VCInterface(object):
def SvnGit(self, rev, branch=""):
raise NotImplementedError()
+ def MasterBranch(self):
+ raise NotImplementedError()
+
+ def CandidateBranch(self):
+ raise NotImplementedError()
+
def RemoteMasterBranch(self):
raise NotImplementedError()
@@ -331,6 +337,12 @@ class GitSvnInterface(VCInterface):
def SvnGit(self, rev, branch=""):
return self.step.GitSVNFindGitHash(rev, branch)
+ def MasterBranch(self):
+ return "bleeding_edge"
+
+ def CandidateBranch(self):
+ return "trunk"
+
def RemoteMasterBranch(self):
return "svn/bleeding_edge"
@@ -370,6 +382,12 @@ class GitTagsOnlyMixin(VCInterface):
# Remove 'origin/branch-heads/' prefix.
return map(lambda s: s[20:], branches)
+ def MasterBranch(self):
+ return "master"
+
+ def CandidateBranch(self):
+ return "candidates"
+
def RemoteMasterBranch(self):
return "origin/master"
Index: tools/push-to-trunk/releases.py
diff --git a/tools/push-to-trunk/releases.py
b/tools/push-to-trunk/releases.py
index
646e8c03cf4f2f079cf759fd605b2806af7f3da7..34a4e8c27022cf0fced221508ea050f55531d8a4
100755
--- a/tools/push-to-trunk/releases.py
+++ b/tools/push-to-trunk/releases.py
@@ -183,7 +183,7 @@ class RetrieveV8Releases(Step):
git_hash, self.GetBleedingEdgeFromPush(title), branch, version,
patches, body), self["patch"]
- def GetReleasesFromBleedingEdge(self):
+ def GetReleasesFromMaster(self):
tag_text = self.SVN("log https://v8.googlecode.com/svn/tags -v --limit
20")
releases = []
for (tag, revision) in re.findall(BLEEDING_EDGE_TAGS_RE, tag_text):
@@ -192,14 +192,13 @@ class RetrieveV8Releases(Step):
# Add bleeding edge release. It does not contain patches or a code
# review link, as tags are not uploaded.
releases.append(self.GetReleaseDict(
- git_hash, revision, "bleeding_edge", tag, "", ""))
+ git_hash, revision, self.vc.MasterBranch(), tag, "", ""))
return releases
def GetReleasesFromBranch(self, branch):
self.GitReset(self.vc.RemoteBranch(branch))
- # TODO(machenbach): Rename this when switching to the git mirror.
- if branch == 'bleeding_edge':
- return self.GetReleasesFromBleedingEdge()
+ if branch == self.vc.MasterBranch():
+ return self.GetReleasesFromMaster()
releases = []
try:
@@ -218,7 +217,7 @@ class RetrieveV8Releases(Step):
# TODO(machenbach): This omits patches if the version file wasn't
# manipulated correctly. Find a better way to detect the point
where
# the parent of the branch head leads to the trunk branch.
- if branch != "trunk" and patch_level == "0":
+ if branch != self.vc.CandidateBranch() and patch_level == "0":
break
# Allow Ctrl-C interrupt.
@@ -240,17 +239,18 @@ class RetrieveV8Releases(Step):
beta, stable = SortBranches(branches)[0:2]
releases += self.GetReleasesFromBranch(stable)
releases += self.GetReleasesFromBranch(beta)
- releases += self.GetReleasesFromBranch("trunk")
- releases += self.GetReleasesFromBranch("bleeding_edge")
+ releases += self.GetReleasesFromBranch(self.vc.CandidateBranch())
+ releases += self.GetReleasesFromBranch(self.vc.MasterBranch())
elif self._options.branch == 'all': # pragma: no cover
# Retrieve the full release history.
for branch in branches:
releases += self.GetReleasesFromBranch(branch)
- releases += self.GetReleasesFromBranch("trunk")
- releases += self.GetReleasesFromBranch("bleeding_edge")
+ releases += self.GetReleasesFromBranch(self.vc.CandidateBranch())
+ releases += self.GetReleasesFromBranch(self.vc.MasterBranch())
else: # pragma: no cover
# Retrieve history for a specified branch.
- assert self._options.branch in branches + ["trunk", "bleeding_edge"]
+ assert self._options.branch in (branches +
+ [self.vc.CandidateBranch(), self.vc.MasterBranch()])
releases += self.GetReleasesFromBranch(self._options.branch)
self["releases"] = sorted(releases,
@@ -295,7 +295,9 @@ class RetrieveChromiumV8Releases(Step):
def RunStep(self):
cwd = self._options.chromium
releases = filter(
- lambda r: r["branch"] in ["trunk", "bleeding_edge"],
self["releases"])
+ lambda r: r["branch"] in [self.vc.CandidateBranch(),
+ self.vc.MasterBranch()],
+ self["releases"])
if not releases: # pragma: no cover
print "No releases detected. Skipping chromium history."
return True
@@ -347,7 +349,8 @@ class RietrieveChromiumBranches(Step):
def RunStep(self):
cwd = self._options.chromium
- trunk_releases = filter(lambda r: r["branch"] == "trunk",
self["releases"])
+ trunk_releases = filter(lambda r: r["branch"] ==
self.vc.CandidateBranch(),
+ self["releases"])
if not trunk_releases: # pragma: no cover
print "No trunk releases detected. Skipping chromium history."
return True
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
