Chromium Code Reviews| 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 4cbfa5435e3651802e4a9b935871b640f62da63f..914599f14f737984332836ecd1780cdc97d2cefb 100644 |
| --- a/tools/push-to-trunk/common_includes.py |
| +++ b/tools/push-to-trunk/common_includes.py |
| @@ -405,7 +405,7 @@ class GitTagsOnlyMixin(VCInterface): |
| # is the case for all automated merge and push commits - also no title is |
| # the prefix of another title). |
| commit = None |
| - for wait_interval in [3, 7, 15, 35]: |
| + for wait_interval in [3, 7, 15, 35, 35]: |
| self.step.Git("fetch") |
| commit = self.step.GitLog(n=1, format="%H", grep=message, branch=remote) |
| if commit: |
| @@ -425,9 +425,27 @@ class GitReadSvnWriteInterface(GitTagsOnlyMixin, GitSvnInterface): |
| pass |
| +class GitInterface(GitTagsOnlyMixin): |
| + def Fetch(self): |
| + self.step.Git("fetch") |
| + |
| + def GitSvn(self, hsh, branch=""): |
|
Michael Achenbach
2014/11/01 21:49:24
Not so sure here. Thoughts: some scripts show svn
|
| + return "" |
| + |
| + def SvnGit(self, rev, branch=""): |
| + raise NotImplementedError() |
| + |
| + def Land(self): |
| + self.step.Git("push origin") |
| + |
| + def CLLand(self): |
| + self.step.GitCLLand() |
| + |
| + |
| VC_INTERFACES = { |
| "git_svn": GitSvnInterface, |
| "git_read_svn_write": GitReadSvnWriteInterface, |
| + "git": GitInterface, |
| } |