Reviewers: ulan,
Message:
PTAL
Description:
Let push-to-trunk script retry failing svn writes.
BUG=
TEST=python -m unittest test_scripts
Please review this at https://codereview.chromium.org/144463003/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+5, -3 lines):
M tools/push-to-trunk/push_to_trunk.py
Index: tools/push-to-trunk/push_to_trunk.py
diff --git a/tools/push-to-trunk/push_to_trunk.py
b/tools/push-to-trunk/push_to_trunk.py
index
06e277ee468c23b02ba2988722ac94657b244999..a9342283417ad067d6f98cbed982bd948a23ff91
100755
--- a/tools/push-to-trunk/push_to_trunk.py
+++ b/tools/push-to-trunk/push_to_trunk.py
@@ -256,7 +256,8 @@ class CommitRepository(Step):
if self.Git("cl presubmit", "PRESUBMIT_TREE_CHECK=\"skip\"") is None:
self.Die("'git cl presubmit' failed, please try again.")
- if self.Git("cl dcommit -f --bypass-hooks") is None:
+ if self.Git("cl dcommit -f --bypass-hooks",
+ retry_on=lambda x: x is None) is None:
self.Die("'git cl dcommit' failed, please try again.")
@@ -366,7 +367,7 @@ class CommitSVN(Step):
MESSAGE = "Commit to SVN."
def RunStep(self):
- result = self.Git("svn dcommit 2>&1")
+ result = self.Git("svn dcommit 2>&1", retry_on=lambda x: x is None)
if not result:
self.Die("'git svn dcommit' failed.")
result = filter(lambda x: re.search(r"^Committed r[0-9]+", x),
@@ -395,7 +396,8 @@ class TagRevision(Step):
ver = "%s.%s.%s" % (self._state["major"],
self._state["minor"],
self._state["build"])
- if self.Git("svn tag %s -m \"Tagging version %s\"" % (ver, ver)) is
None:
+ if self.Git("svn tag %s -m \"Tagging version %s\"" % (ver, ver),
+ retry_on=lambda x: x is None) is None:
self.Die("'git svn tag' failed.")
--
--
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/groups/opt_out.
