Skip to content

Commit

Permalink
depot_tools: Remove rietvelt code.
Browse files Browse the repository at this point in the history 
Bug: 984182
Change-Id: I0ad2f612f681644b78353195e451e43da936ac9a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/1709640
Commit-Queue: Edward Lesmes <[email protected]>
Reviewed-by: Robbie Iannucci <[email protected]>
  • Loading branch information
Edward Lemur authored and Commit Bot committed Jul 18, 2019
1 parent 6ab53d9 commit f4e0cc6
Show file tree
Hide file tree
Showing 5 changed files with 4 additions and 3,949 deletions.
23 changes: 0 additions & 23 deletions README.testing
View file

This file was deleted.

183 changes: 4 additions & 179 deletions my_activity.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
import auth
import fix_encoding
import gerrit_util
import rietveld

from third_party import httplib2

Expand All @@ -77,36 +76,6 @@ def get_value(self, key, args, kwds):
return self.default
return Formatter.get_value(self, key, args, kwds)

rietveld_instances = [
{
'url': 'codereview.chromium.org',
'shorturl': 'crrev.com',
'supports_owner_modified_query': True,
'requires_auth': False,
'email_domain': 'chromium.org',
'short_url_protocol': 'https',
},
{
'url': 'chromereviews.googleplex.com',
'shorturl': 'go/chromerev',
'supports_owner_modified_query': True,
'requires_auth': True,
'email_domain': 'google.com',
},
{
'url': 'codereview.appspot.com',
'supports_owner_modified_query': True,
'requires_auth': False,
'email_domain': 'chromium.org',
},
{
'url': 'breakpad.appspot.com',
'supports_owner_modified_query': False,
'requires_auth': False,
'email_domain': 'chromium.org',
},
]

gerrit_instances = [
{
'url': 'android-review.googlesource.com',
Expand Down Expand Up @@ -187,15 +156,6 @@ def datetime_from_gerrit(date_string):
return datetime.strptime(date_string, '%Y-%m-%d %H:%M:%S.%f000')


def datetime_from_rietveld(date_string):
try:
return datetime.strptime(date_string, '%Y-%m-%d %H:%M:%S.%f')
except ValueError:
# Sometimes rietveld returns a value without the milliseconds part, so we
# attempt to parse those cases as well.
return datetime.strptime(date_string, '%Y-%m-%d %H:%M:%S')


def datetime_from_monorail(date_string):
return datetime.strptime(date_string, '%Y-%m-%dT%H:%M:%S')

Expand All @@ -210,7 +170,6 @@ def __init__(self, options):
self.reviews = []
self.issues = []
self.referenced_issues = []
self.check_cookies()
self.google_code_auth_token = None
self.access_errors = set()

Expand All @@ -219,72 +178,6 @@ def show_progress(self, how='.'):
sys.stdout.write(how)
sys.stdout.flush()

# Check the codereview cookie jar to determine which Rietveld instances to
# authenticate to.
def check_cookies(self):
filtered_instances = []

def has_cookie(instance):
auth_config = auth.extract_auth_config_from_options(self.options)
a = auth.get_authenticator_for_host(instance['url'], auth_config)
return a.has_cached_credentials()

for instance in rietveld_instances:
instance['auth'] = has_cookie(instance)

if filtered_instances:
logging.warning('No cookie found for the following Rietveld instance%s:',
's' if len(filtered_instances) > 1 else '')
for instance in filtered_instances:
logging.warning('\t' + instance['url'])
logging.warning('Use --auth if you would like to authenticate to them.')

def rietveld_search(self, instance, owner=None, reviewer=None):
if instance['requires_auth'] and not instance['auth']:
return []


email = None if instance['auth'] else ''
auth_config = auth.extract_auth_config_from_options(self.options)
remote = rietveld.Rietveld('https://' + instance['url'], auth_config, email)

# See def search() in rietveld.py to see all the filters you can use.
query_modified_after = None

if instance['supports_owner_modified_query']:
query_modified_after = self.modified_after.strftime('%Y-%m-%d')

# Rietveld does not allow search by both created_before and modified_after.
# (And some instances don't allow search by both owner and modified_after)
owner_email = None
reviewer_email = None
if owner:
owner_email = owner + '@' + instance['email_domain']
if reviewer:
reviewer_email = reviewer + '@' + instance['email_domain']
issues = remote.search(
owner=owner_email,
reviewer=reviewer_email,
modified_after=query_modified_after,
with_messages=True)
self.show_progress()

issues = filter(
lambda i: (datetime_from_rietveld(i['created']) < self.modified_before),
issues)
issues = filter(
lambda i: (datetime_from_rietveld(i['modified']) > self.modified_after),
issues)

should_filter_by_user = True
issues = map(partial(self.process_rietveld_issue, remote, instance), issues)
issues = filter(
partial(self.filter_issue, should_filter_by_user=should_filter_by_user),
issues)
issues = sorted(issues, key=lambda i: i['modified'], reverse=True)

return issues

def extract_bug_numbers_from_description(self, issue):
description = None

Expand All @@ -311,63 +204,6 @@ def extract_bug_numbers_from_description(self, issue):

return sorted(set(bugs))

def process_rietveld_issue(self, remote, instance, issue):
ret = {}
if self.options.deltas:
patchset_props = remote.get_patchset_properties(
issue['issue'],
issue['patchsets'][-1])
self.show_progress()
ret['delta'] = '+%d,-%d' % (
sum(f['num_added'] for f in patchset_props['files'].itervalues()),
sum(f['num_removed'] for f in patchset_props['files'].itervalues()))

if issue['landed_days_ago'] != 'unknown':
ret['status'] = 'committed'
elif issue['closed']:
ret['status'] = 'closed'
elif len(issue['reviewers']) and issue['all_required_reviewers_approved']:
ret['status'] = 'ready'
else:
ret['status'] = 'open'

ret['owner'] = issue['owner_email']
ret['author'] = ret['owner']

ret['reviewers'] = set(issue['reviewers'])

if 'shorturl' in instance:
url = instance['shorturl']
protocol = instance.get('short_url_protocol', 'http')
else:
url = instance['url']
protocol = 'https'

ret['review_url'] = '%s://%s/%d' % (protocol, url, issue['issue'])

# Rietveld sometimes has '\r\n' instead of '\n'.
ret['header'] = issue['description'].replace('\r', '').split('\n')[0]

ret['modified'] = datetime_from_rietveld(issue['modified'])
ret['created'] = datetime_from_rietveld(issue['created'])
ret['replies'] = self.process_rietveld_replies(issue['messages'])

ret['bugs'] = self.extract_bug_numbers_from_description(issue)
ret['landed_days_ago'] = issue['landed_days_ago']

return ret

@staticmethod
def process_rietveld_replies(replies):
ret = []
for reply in replies:
r = {}
r['author'] = reply['sender']
r['created'] = datetime_from_rietveld(reply['date'])
r['content'] = ''
ret.append(r)
return ret

def gerrit_changes_over_rest(self, instance, filters):
# Convert the "key:value" filter to a list of (key, value) pairs.
req = list(f.split(':', 1) for f in filters)
Expand Down Expand Up @@ -694,17 +530,13 @@ def auth_for_reviews(self):
pass

def get_changes(self):
num_instances = len(rietveld_instances) + len(gerrit_instances)
num_instances = len(gerrit_instances)
with contextlib.closing(ThreadPool(num_instances)) as pool:
rietveld_changes = pool.map_async(
lambda instance: self.rietveld_search(instance, owner=self.user),
rietveld_instances)
gerrit_changes = pool.map_async(
lambda instance: self.gerrit_search(instance, owner=self.user),
gerrit_instances)
rietveld_changes = itertools.chain.from_iterable(rietveld_changes.get())
gerrit_changes = itertools.chain.from_iterable(gerrit_changes.get())
self.changes = list(rietveld_changes) + list(gerrit_changes)
self.changes = list(gerrit_changes)

def print_changes(self):
if self.changes:
Expand All @@ -719,17 +551,13 @@ def print_access_errors(self):
logging.error(error.rstrip())

def get_reviews(self):
num_instances = len(rietveld_instances) + len(gerrit_instances)
num_instances = len(gerrit_instances)
with contextlib.closing(ThreadPool(num_instances)) as pool:
rietveld_reviews = pool.map_async(
lambda instance: self.rietveld_search(instance, reviewer=self.user),
rietveld_instances)
gerrit_reviews = pool.map_async(
lambda instance: self.gerrit_search(instance, reviewer=self.user),
gerrit_instances)
rietveld_reviews = itertools.chain.from_iterable(rietveld_reviews.get())
gerrit_reviews = itertools.chain.from_iterable(gerrit_reviews.get())
self.reviews = list(rietveld_reviews) + list(gerrit_reviews)
self.reviews = list(gerrit_reviews)

def print_reviews(self):
if self.reviews:
Expand Down Expand Up @@ -861,9 +689,6 @@ def default(self, obj): # pylint: disable=method-hidden


def main():
# Silence upload.py.
rietveld.upload.verbosity = 0

parser = optparse.OptionParser(description=sys.modules[__name__].__doc__)
parser.add_option(
'-u', '--user', metavar='<email>',
Expand Down
Loading

0 comments on commit f4e0cc6

Please sign in to comment.