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 4eb33e92b7a09b28a7cdaa6a5239a5eb4c373063..f1d5e50117ccbed134ce9b30cace756585d838ad 100644 |
--- a/tools/push-to-trunk/common_includes.py |
+++ b/tools/push-to-trunk/common_includes.py |
@@ -227,6 +227,7 @@ class CommonOptions(object): |
self.force_readline_defaults = not manual |
self.force_upload = not manual |
self.manual = manual |
+ self.reviewer = getattr(options, 'reviewer', None) |
self.author = getattr(options, 'a', None) |
@@ -302,6 +303,10 @@ class Step(object): |
cmd = lambda: self._side_effect_handler.Command("git", args, prefix, pipe) |
return self.Retry(cmd, retry_on, [5, 30]) |
+ def SVN(self, args="", prefix="", pipe=True, retry_on=None): |
+ cmd = lambda: self._side_effect_handler.Command("svn", args, prefix, pipe) |
+ return self.Retry(cmd, retry_on, [5, 30]) |
+ |
def Editor(self, args): |
if self._options.requires_editor: |
return self._side_effect_handler.Command(os.environ["EDITOR"], args, |
@@ -462,9 +467,9 @@ class UploadStep(Step): |
MESSAGE = "Upload for code review." |
def RunStep(self): |
- if self._options.r: |
- print "Using account %s for review." % self._options.r |
- reviewer = self._options.r |
+ if self._options.reviewer: |
+ print "Using account %s for review." % self._options.reviewer |
+ reviewer = self._options.reviewer |
else: |
print "Please enter the email address of a V8 reviewer for your patch: ", |
self.DieNoManualMode("A reviewer must be specified in forced mode.") |