From 9342ac02c1ce5b3f7f1f42c15636ce1d8a81bc82 Mon Sep 17 00:00:00 2001 From: "Peter K. Lee" Date: Tue, 28 Aug 2018 21:03:51 +0000 Subject: [PATCH] Adds --merged-only command line option Adds status:merged to gerrit filter. Bug: 878433 Change-Id: Ica081fa0cd0e8a267ec0a8d711f749b4e91faec5 Reviewed-on: https://chromium-review.googlesource.com/1194310 Reviewed-by: Andrii Shyshkalov Commit-Queue: Peter Lee --- my_activity.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/my_activity.py b/my_activity.py index 529754b8ff..418d8db0aa 100755 --- a/my_activity.py +++ b/my_activity.py @@ -375,13 +375,16 @@ class MyActivity(object): max_age = max_age.days * 24 * 3600 + max_age.seconds user_filter = 'owner:%s' % owner if owner else 'reviewer:%s' % reviewer filters = ['-age:%ss' % max_age, user_filter] + # TODO(cjhopman): Should abandoned changes be filtered out when + # merged_only is not enabled? + if self.options.merged_only: + filters.append('status:merged') issues = self.gerrit_changes_over_rest(instance, filters) self.show_progress() issues = [self.process_gerrit_issue(instance, issue) for issue in issues] - # TODO(cjhopman): should we filter abandoned changes? issues = filter(self.filter_issue, issues) issues = sorted(issues, key=lambda i: i['modified'], reverse=True) @@ -955,6 +958,12 @@ def main(): const=logging.ERROR, help='Suppress non-error messages.' ) + parser.add_option( + '-M', '--merged-only', + action='store_true', + dest='merged_only', + default=False, + help='Shows only changes that have been merged.') parser.add_option( '-o', '--output', metavar='', help='Where to output the results. By default prints to stdout.')