cli: Add --comment-tag option

crobinso · crobinso · commit f535954bc53b · 2018-03-05T15:57:34.000-05:00
This seems to be a bugzilla5 extension, although redhat's instance doesn't seem to support it yet Resolves: #62
diff --git a/bugzilla.1 b/bugzilla.1
@@ -67,6 +67,8 @@ Component name
 Bug summary
 .IP "--comment=DESCRIPTION, -l DESCRIPTION"
 Set initial bug comment/description
+.IP "--comment-tag=TAG"
+Comment tag for the new comment
 .IP "--sub-component=SUB_COMPONENT"
 RHBZ sub component name
 .IP "--os=OS, -o OS"
diff --git a/bugzilla/_cli.py b/bugzilla/_cli.py
@@ -214,6 +214,9 @@ def _parser_add_bz_fields(rootp, command):
     p.add_argument('-c', '--component', help="Component name")
     p.add_argument('-t', '--summary', '--short_desc', help="Bug summary")
     p.add_argument('-l', '--comment', '--long_desc', help=comment_help)
+    if not cmd_query:
+        p.add_argument("--comment-tag", action="append",
+                help="Comment tag for the new comment")
     p.add_argument("--sub-component", action="append",
         help="RHBZ sub component field")
     p.add_argument('-o', '--os', help="Operating system")
@@ -779,6 +782,7 @@ def parse_multi(val):
         qa_contact=opt.qa_contact or None,
         sub_component=opt.sub_component or None,
         alias=opt.alias or None,
+        comment_tags=opt.comment_tag or None,
     )
 
     _merge_field_opts(ret, opt, parser)
@@ -864,6 +868,7 @@ def _do_modify(bz, parser, opt):
         sub_component=opt.sub_component or None,
         alias=opt.alias or None,
         flags=flags or None,
+        comment_tags=opt.comment_tag or None,
     )
 
     # We make this a little convoluted to facilitate unit testing
diff --git a/bugzilla/base.py b/bugzilla/base.py
@@ -1338,7 +1338,8 @@ def build_update(self,
                      devel_whiteboard=None,
                      internal_whiteboard=None,
                      sub_component=None,
-                     flags=None):
+                     flags=None,
+                     comment_tags=None):
         """
         Returns a python dict() with properly formatted parameters to
         pass to update_bugs(). See bugzilla documentation for the format
@@ -1414,6 +1415,7 @@ def c(val):
         s("whiteboard", whiteboard)
         s("work_time", work_time, float)
         s("flags", flags)
+        s("comment_tags", comment_tags, self._listify)
 
         add_dict("blocks", blocks_add, blocks_remove, blocks_set,
                  convert=int)
@@ -1601,7 +1603,8 @@ def build_createbug(self,
         target_release=None,
         url=None,
         sub_component=None,
-        alias=None):
+        alias=None,
+        comment_tags=None):
         """"
         Returns a python dict() with properly formatted parameters to
         pass to createbug(). See bugzilla documentation for the format
@@ -1635,7 +1638,7 @@ def build_createbug(self,
                 target_milestone=target_milestone,
                 target_release=target_release, url=url,
                 assigned_to=assigned_to, sub_component=sub_component,
-                alias=alias)
+                alias=alias, comment_tags=comment_tags)
 
         ret.update(localdict)
         return ret
diff --git a/tests/createbug.py b/tests/createbug.py
@@ -59,10 +59,12 @@ def testSeverity(self):
         )
 
     def testMisc(self):
-        self.clicomm(
-            "--alias some-alias",
+        self.clicomm("--alias some-alias",
             {"alias": "some-alias"}
         )
+        self.clicomm("--comment 'foo bar' --comment-tag tag1 "
+                "--comment-tag tag2",
+                {'comment_tags': ['tag1', 'tag2'], 'description': 'foo bar'})
 
     def testMultiOpts(self):
         # Test all opts that can take lists
diff --git a/tests/modify.py b/tests/modify.py
@@ -139,6 +139,8 @@ def testMisc(self):
             "--alias some-alias",
             {"alias": "some-alias"}
         )
+        self.clicomm("--comment 'foo bar' --comment-tag tag1 ",
+                {'comment': {'comment': 'foo bar'}, 'comment_tags': ['tag1']})
 
 
     def testField(self):

Original file line number	Diff line number	Diff line change
`@@ -59,10 +59,12 @@ def testSeverity(self):`
`59`	`59`	`)`
`60`	`60`
`61`	`61`	`def testMisc(self):`
`62`		`- self.clicomm(`
`63`		`- "--alias some-alias",`
	`62`	`+ self.clicomm("--alias some-alias",`
`64`	`63`	`{"alias": "some-alias"}`
`65`	`64`	`)`
	`65`	`+ self.clicomm("--comment 'foo bar' --comment-tag tag1 "`
	`66`	`+ "--comment-tag tag2",`
	`67`	`+ {'comment_tags': ['tag1', 'tag2'], 'description': 'foo bar'})`
`66`	`68`
`67`	`69`	`def testMultiOpts(self):`
`68`	`70`	`# Test all opts that can take lists`
Original file line number	Diff line number	Diff line change
`@@ -139,6 +139,8 @@ def testMisc(self):`
`139`	`139`	`"--alias some-alias",`
`140`	`140`	`{"alias": "some-alias"}`
`141`	`141`	`)`
	`142`	`+ self.clicomm("--comment 'foo bar' --comment-tag tag1 ",`
	`143`	`+ {'comment': {'comment': 'foo bar'}, 'comment_tags': ['tag1']})`
`142`	`144`
`143`	`145`
`144`	`146`	`def testField(self):`