From 3c0c3fc5a887cd3e57c14b0cacf4b57d3b8fe005 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: May 18 2016 22:29:58 +0000
Subject: [PATCH 1/2] query history by cg


---

diff --git a/hub/kojihub.py b/hub/kojihub.py
index d3aec72..c88946c 100644
--- a/hub/kojihub.py
+++ b/hub/kojihub.py
@@ -6016,7 +6016,8 @@ def query_history(tables=None, **kwargs):
     permission: only relating to a given permission
     external_repo: only relateing to an external repo
     build_target: only relating to a build target
-    group: only relating to a (comps) group)
+    group: only relating to a (comps) group
+    cg: only relating to a content generator
     """
     common_fields = {
         #fields:aliases common to all versioned tables
@@ -6177,6 +6178,12 @@ def query_history(tables=None, **kwargs):
                     break
                 data['perm_id'] = get_perm_id(value, strict=True)
                 clauses.append("%s.id = %%(perm_id)i" % joined['permissions'])
+            elif arg == 'cg':
+                if 'content_generator' not in joined:
+                    skip = True
+                    break
+                data['cg_id'] = lookup_name('content_generator', value, strict=True)['id']
+                clauses.append("%s.id = %%(cg_id)i" % joined['content_generator'])
             elif arg == 'external_repo':
                 if 'external_repo' not in joined:
                     skip = True

From c9f78235f51630ee9130658d2612090cd0b67664 Mon Sep 17 00:00:00 2001
From: Mike McLean <mikem@redhat.com>
Date: May 18 2016 22:29:58 +0000
Subject: [PATCH 2/2] cli support for querying by cg


---

diff --git a/cli/koji b/cli/koji
index 811dce4..cd952d4 100755
--- a/cli/koji
+++ b/cli/koji
@@ -4130,6 +4130,7 @@ def anon_handle_list_history(options, session, args):
     parser.add_option("--editor", "--by", metavar="USER", help=_("Only show entries modified by user"))
     parser.add_option("--user", help=_("Only show entries affecting a user"))
     parser.add_option("--permission", help=_("Only show entries relating to a given permission"))
+    parser.add_option("--cg", help=_("Only show entries relating to a given permission"))
     parser.add_option("--external-repo", "--erepo", help=_("Only show entries relating to a given external repo"))
     parser.add_option("--build-target", "--target", help=_("Only show entries relating to a given build target"))
     parser.add_option("--group", help=_("Only show entries relating to a given group"))
@@ -4152,8 +4153,9 @@ def anon_handle_list_history(options, session, args):
         assert False
     kwargs = {}
     limited = False
-    for opt in 'package', 'tag', 'build', 'editor', 'user', 'permission', 'external_repo', \
-               'build_target', 'group', 'before', 'after':
+    for opt in ('package', 'tag', 'build', 'editor', 'user', 'permission',
+                'cg', 'external_repo', 'build_target', 'group', 'before',
+                'after'):
         val = getattr(options, opt)
         if val:
             kwargs[opt] = val