opendev/gerrit
Code Issues Proposed changes

Merge "TrivialRebase: Call gerrit review instead of approve" into stable-2.6

Browse Source
This commit is contained in:
David Pursehouse
2013-04-20 05:13:24 +00:00
committed by Gerrit Code Review
parent 737680a026 7d3f63c3b6
commit baa1432f81
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contrib/trivial_rebase.py
View File

@@ -204,7 +204,7 @@ class TrivialRebase:
comment_msg = ("\'--message=New patchset patch-id matches previous patchset"
", but commit message has changed.'")
comment_cmd = [self.ssh, self.ssh_port_flag, self.port, self.server, 'gerrit',
'approve', '--project', self.project, comment_msg, self.commit]
'review', '--project', self.project, comment_msg, self.commit]
self.CheckCall(comment_cmd)
return
@@ -229,13 +229,13 @@ class TrivialRebase:
print "Unsupported category: %s" % approval
continue
gerrit_approve_msg = ("\'Automatically re-added by Gerrit trivial rebase "
gerrit_review_msg = ("\'Automatically re-added by Gerrit trivial rebase "
"detection script.\'")
for acct, flags in self.acct_approvals.items():
gerrit_approve_cmd = ['gerrit', 'approve', '--project', self.project,
'--message', gerrit_approve_msg, flags, self.commit]
gerrit_review_cmd = ['gerrit', 'review', '--project', self.project,
'--message', gerrit_review_msg, flags, self.commit]
email_addr = self.GetEmailFromAcctId(acct)
self.SuExec(email_addr, ' '.join(gerrit_approve_cmd))
self.SuExec(email_addr, ' '.join(gerrit_review_cmd))
if __name__ == "__main__":
try: