summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Borowitz <dborowitz@google.com>2013-07-25 23:31:17 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2013-07-25 23:31:17 +0000
commit8e615b7c57cb32b37fb7dcdf36353c4011a15fc9 (patch)
tree7a31978b7161ae057928fa1e013f0d9d06000e96
parent9e3b08d015e0f73480fb5e678d54f3bbc907a123 (diff)
parent4af8c8ff61c0c816da18b8953dbba56f6280917e (diff)
Merge "TrivialRebase: Support custom labels" into stable-2.7
-rwxr-xr-xcontrib/trivial_rebase.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/trivial_rebase.py b/contrib/trivial_rebase.py
index 7764470430..538a7e02ac 100755
--- a/contrib/trivial_rebase.py
+++ b/contrib/trivial_rebase.py
@@ -222,18 +222,17 @@ class TrivialRebase:
# approval_categories DB table might want different behavior here.
# Additional categories should also be added if desired.
if approval["category_id"] == "Code-Review" and approval['value'] != '-2':
- self.AppendAcctApproval(approval['account_id'], '--code-review %s' % approval['value'])
+ self.AppendAcctApproval(approval['account_id'], '--label Code-Review=%s' % approval['value'])
elif approval["category_id"] == "Verified":
# Don't re-add verifies
- # self.AppendAcctApproval(approval['account_id'], '--verified %s' % approval['value'])
+ # self.AppendAcctApproval(approval['account_id'], '--label Verified=%s' % approval['value'])
continue
elif approval["category_id"] == "SUBM":
# We don't care about previous submit attempts
continue
else:
- self.AppendAcctApproval(approval['account_id'], '--%s %s' %
- (approval['category_id'].lower().replace(' ', '-'),
- approval['value']))
+ self.AppendAcctApproval(approval['account_id'], '--label %s=%s' %
+ (approval['category_id'], approval['value']))
gerrit_review_msg = ("\'Automatically re-added by Gerrit trivial rebase "
"detection script.\'")