Revision: 25022
Author: [email protected]
Date: Thu Oct 30 15:05:11 2014 UTC
Log: Make releases script more git friendly.
BUG=410721
LOG=n
TEST=script_test.py
[email protected]
Review URL: https://codereview.chromium.org/682863006
https://code.google.com/p/v8/source/detail?r=25022
Modified:
/branches/bleeding_edge/tools/push-to-trunk/releases.py
=======================================
--- /branches/bleeding_edge/tools/push-to-trunk/releases.py Thu Oct 16
13:21:13 2014 UTC
+++ /branches/bleeding_edge/tools/push-to-trunk/releases.py Thu Oct 30
15:05:11 2014 UTC
@@ -26,7 +26,8 @@
}
# Expression for retrieving the bleeding edge revision from a commit
message.
-PUSH_MESSAGE_RE = re.compile(r".* \(based on bleeding_edge revision
r(\d+)\)$")
+PUSH_MSG_SVN_RE = re.compile(r".* \(based on bleeding_edge revision
r(\d+)\)$")
+PUSH_MSG_GIT_RE = re.compile(r".* \(based on ([a-fA-F0-9]+)\)$")
# Expression for retrieving the merged patches from a merge commit message
# (old and new format).
@@ -128,7 +129,10 @@
and len(releases) > self._options.max_releases)
def GetBleedingEdgeFromPush(self, title):
- return MatchSafe(PUSH_MESSAGE_RE.match(title))
+ return MatchSafe(PUSH_MSG_SVN_RE.match(title))
+
+ def GetBleedingEdgeGitFromPush(self, title):
+ return MatchSafe(PUSH_MSG_GIT_RE.match(title))
def GetMergedPatches(self, body):
patches = MatchSafe(MERGE_MESSAGE_RE.search(body))
@@ -189,6 +193,8 @@
if bleeding_edge_revision:
bleeding_edge_git = self.vc.SvnGit(bleeding_edge_revision,
self.vc.RemoteMasterBranch())
+ else:
+ bleeding_edge_git = self.GetBleedingEdgeGitFromPush(title)
return self.GetReleaseDict(
git_hash, bleeding_edge_revision, bleeding_edge_git, branch,
version,
patches, body), self["patch"]
--
--
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.
