Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(132)

Unified Diff: tools/push-to-trunk/push_to_trunk.py

Issue 144463003: Let push-to-trunk script retry failing svn writes. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.")
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698