my_activity: Port gerrit to the new gerrit_util API.

my_activity.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Get stats about your activity.
 
 Example:
   - my_activity.py  for stats for the current week (last week on mondays).
   - my_activity.py -Q  for stats for last quarter.
@@ skipping 17 matching lines @@
 from functools import partial
 import json
 import optparse
 import os
 import re
 import subprocess
 import sys
 import urllib
 import urllib2
 
+import gerrit_util
 import rietveld
 from third_party import upload
 
 # Imported later, once options are set.
 webkitpy = None
 
 try:
   from dateutil.relativedelta import relativedelta # pylint: disable=F0401
 except ImportError:
   print 'python-dateutil package required'
@@ skipping 64 matching lines @@
     'requires_auth': False,
     'email_domain': 'chromium.org',
   },
 ]
 
 gerrit_instances = [
   {
     'url': 'chromium-review.googlesource.com',
     'shorturl': 'crosreview.com',
   },
-  # TODO(deymo): chrome-internal-review requires login credentials. Enable once
-  # login support is added to this client. See crbug.com/281695.
-  #{
-  #  'url': 'chrome-internal-review.googlesource.com',
-  #  'shorturl': 'crosreview.com/i',
-  #},
+  {
+    'url': 'chrome-internal-review.googlesource.com',
+    'shorturl': 'crosreview.com/i',
+  },
   {
     'host': 'gerrit.chromium.org',
     'port': 29418,
   },
   {
     'host': 'gerrit-int.chromium.org',
     'port': 29419,
   },
 ]
 
@@ skipping 260 matching lines @@
                   '--comments',
                   '--'] + filters
     (stdout, _) = subprocess.Popen(gquery_cmd, stdout=subprocess.PIPE,
                                    stderr=subprocess.PIPE).communicate()
     # Drop the last line of the output with the stats.
     issues = stdout.splitlines()[:-1]
     return map(json.loads, issues)
 
   @staticmethod
   def gerrit_changes_over_rest(instance, filters):
-    # See https://gerrit-review.googlesource.com/Documentation/rest-api.html
-    # Gerrit doesn't allow filtering by created time, only modified time.
-    args = urllib.urlencode([
-        ('q', ' '.join(filters)),
-        ('o', 'MESSAGES'),
-        ('o', 'LABELS')])
-    rest_url = 'https://%s/changes/?%s' % (instance['url'], args)
-
-    req = urllib2.Request(rest_url, headers={'Accept': 'text/plain'})
+    # Convert the "key:value" filter to a dictionary.
+    req = dict(f.split(':', 1) for f in filters)
     try:
-      response = urllib2.urlopen(req)
-      stdout = response.read()
-    except urllib2.HTTPError, e:
-      print 'ERROR: Looking up %r: %s' % (rest_url, e)
+      # Instanciate the generator to force all the requests now and catch the

[szager1, 2013/10/31 18:15:45]

s/Instanciate/Instantiate/

+      # errors here.
+      return list(gerrit_util.QueryAllChanges(instance['url'], req,
+          o_params=['MESSAGES', 'LABELS', 'DETAILED_ACCOUNTS']))
+    except gerrit_util.GerritError, e:
+      print 'ERROR: Looking up %r: %s' % (instance['url'], e)
       return []
 
-    # Check that the returned JSON starts with the right marker.
-    if stdout[:5] != ")]}'\n":
-      print 'ERROR: Marker not found on REST API response: %r' % stdout[:5]
-      return []
-    return json.loads(stdout[5:])
-
   def gerrit_search(self, instance, owner=None, reviewer=None):
     max_age = datetime.today() - self.modified_after
     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]
 
     # Determine the gerrit interface to use: SSH or REST API:
     if 'host' in instance:
       issues = self.gerrit_changes_over_ssh(instance, filters)
       issues = [self.process_gerrit_ssh_issue(instance, issue)
@@ skipping 59 matching lines @@
       ret['replies'] = self.process_gerrit_rest_issue_replies(issue['messages'])
     else:
       ret['replies'] = []
     ret['reviewers'] = set(r['author'] for r in ret['replies'])
     ret['reviewers'].discard(ret['author'])
     return ret
 
   @staticmethod
   def process_gerrit_rest_issue_replies(replies):
     ret = []
-    replies = filter(lambda r: 'email' in r['author'], replies)
+    replies = filter(lambda r: 'author' in r and 'email' in r['author'],
+        replies)
     for reply in replies:
       ret.append({
         'author': reply['author']['email'],
         'created': datetime_from_gerrit(reply['date']),
         'content': reply['message'],
       })
     return ret
 
   def google_code_issue_search(self, instance):
     time_format = '%Y-%m-%dT%T'
@@ skipping 585 matching lines @@
   print '\n\n\n'
 
   my_activity.print_changes()
   my_activity.print_reviews()
   my_activity.print_issues()
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())