gerrit: inspect: fix *12345 syntax
BUG=chromium:746499
TEST=`gerrit inspect '*413728' 413728` returns details about the internal & external CLs
Change-Id: I7dbafae1fc3e79d71d43a2cfa75802786a9e0574
Reviewed-on: https://chromium-review.googlesource.com/578408
Commit-Ready: Mike Frysinger <vapier@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Aviv Keshet <akeshet@chromium.org>
diff --git a/scripts/gerrit.py b/scripts/gerrit.py
index 8f23d50..7932b33 100644
--- a/scripts/gerrit.py
+++ b/scripts/gerrit.py
@@ -177,7 +177,7 @@
return [git.GetProjectUserEmail(constants.CHROMITE_DIR)]
-def _Query(opts, query, raw=True):
+def _Query(opts, query, raw=True, helper=None):
"""Queries Gerrit with a query string built from the commandline options"""
if opts.branch is not None:
query += ' branch:%s' % opts.branch
@@ -186,16 +186,17 @@
if opts.topic is not None:
query += ' topic: %s' % opts.topic
- helper, _ = GetGerrit(opts)
+ if helper is None:
+ helper, _ = GetGerrit(opts)
return helper.Query(query, raw=raw, bypass_cache=False)
-def FilteredQuery(opts, query):
+def FilteredQuery(opts, query, helper=None):
"""Query gerrit and filter/clean up the results"""
ret = []
logging.debug('Running query: %s', query)
- for cl in _Query(opts, query, raw=True):
+ for cl in _Query(opts, query, raw=True, helper=helper):
# Gerrit likes to return a stats record too.
if not 'project' in cl:
continue
@@ -317,9 +318,10 @@
"""Inspect CL number <n> [n ...]"""
cls = []
for arg in args:
- cl = FilteredQuery(opts, arg)
- if cl:
- cls.extend(cl)
+ helper, cl = GetGerrit(opts, arg)
+ change = FilteredQuery(opts, 'change:%s' % cl, helper=helper)
+ if change:
+ cls.extend(change)
else:
logging.warning('no results found for CL %s', arg)
PrintCls(opts, cls)