commit 8cd8e8feef5800f8b81954959ee93f2108622a9b
author Aaron Massey <aaronmassey@chromium.org> Fri Jul 31 22:16:42 2020 +0000
committer Commit Bot <commit-bot@chromium.org> Fri Jul 31 22:39:58 2020 +0000
tree 254b708b9a8f969f9229d812907e770d49c5c4a4
parent 2fc0af6f9af1e55bc381cd0ef6afb0a55d7b8b97

emacs: Multi-host configuration.

Now users can pull recent changes and comments from multiple Gerrit
hosts.

BUG=chromium:111177
TEST=Tested with changes from internal and external Gerrit hosts.

Change-Id: I0783ae1d0b7c82e739bd7921d322216fee000b78
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/dev-util/+/2331866
Tested-by: Aaron Massey <aaronmassey@chromium.org>
Commit-Queue: Aaron Massey <aaronmassey@chromium.org>
Reviewed-by: Jack Rosenthal <jrosenth@chromium.org>

contrib/emacs/gerrit.el

diff --git a/contrib/emacs/gerrit.el b/contrib/emacs/gerrit.el
index 322f5c1..96ab6b9 100644
--- a/contrib/emacs/gerrit.el
+++ b/contrib/emacs/gerrit.el
@@ -22,10 +22,12 @@
   "Path to gitcookies associated with your Gerrit account."
   :type 'string)
 
-(defcustom gerrit-host
+(defcustom gerrit-hosts
+  ;; TODO extract this variable from the
+  ;; repo manifest instead of user configuration.
   nil
-  "Gerrit host you're interested in reviewing comments."
-  :type 'string)
+  "Gerrit hosts you're interested in reviewing comments."
+  :type '(string))
 
 (defconst gerrit--manifest-parser
   (expand-file-name
@@ -60,7 +62,7 @@
   (let ((request-curl-options
          `("-b" ,gerrit-git-cookies)))
 
-    (gerrit--init-global-comment-map gerrit-host)
+    (gerrit--init-global-comment-map)
     (gerrit--init-global-repo-project-path-map gerrit--manifest-parser
                                                gerrit-repo-manifest)))
 
@@ -88,7 +90,7 @@
      ;; We don't use "status:reviewed" because that
      ;; only counts reviews after latest patch,
      ;; but we may want reviews before the latest patch too.
-     :params `(("q" . "owner:self+status:open")
+     :params `(("q" . "owner:self status:open")
                ("n" . ,(format "%d" count)))
      :sync t
      :parser 'gerrit--request-response-json-parser)))
@@ -116,25 +118,26 @@
      :parser 'gerrit--request-response-json-parser)))
 
 
-(defun gerrit--fetch-change-to-file-to-comments (host)
+(defun gerrit--fetch-change-to-file-to-comments ()
   "Returns a map of maps of the form:
 change => filepath => array(CommentInfo Map),
 where filepath is from the nearest git root for a file.
 Only fetches recent changes for open CLs."
   (let ((out-map (make-hash-table :test 'equal)))
-    (loop for change across (gerrit--fetch-recent-changes host) do
-          (setf (gethash (gethash "change_id" change)
-                         gerrit--change-to-host)
-                host)
-          (setf (gethash change out-map)
-                (gerrit--fetch-comments host change)))
+    (loop for host in gerrit-hosts do
+          (loop for change across (gerrit--fetch-recent-changes host) do
+                (setf (gethash (gethash "change_id" change)
+                               gerrit--change-to-host)
+                      host)
+                (setf (gethash change out-map)
+                      (gerrit--fetch-comments host change))))
     out-map))
 
 
-(defun gerrit--init-global-comment-map (host)
+(defun gerrit--init-global-comment-map ()
   "Inits `gerrit--change-to-filepath-comments`."
   (setf gerrit--change-to-filepath-comments
-        (gerrit--fetch-change-to-file-to-comments host)))
+        (gerrit--fetch-change-to-file-to-comments)))
 
 
 (cl-defun gerrit--project-branch-pair-to-path-map (path-to-manifest-parser-exec