Skip to content

Commit 1faff8b

Browse files
wilzbachwilzbach
committed
Query keywords from bugzilla too
1 parent 8cd9914 commit 1faff8b

7 files changed

+38
-37
lines changed

‎data/payloads/bugzilla_buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority renamed to ‎data/payloads/bugzilla_buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
bug_id,"short_desc","bug_status","resolution","bug_severity","priority"
2-
16794,"dmd not working on Ubuntu 16.10 because of default PIE linking","RESOLVED","FIXED","critical","P1"
1+
bug_id,"short_desc","bug_status","resolution","bug_severity","priority","keywords"
2+
16794,"dmd not working on Ubuntu 16.10 because of default PIE linking","RESOLVED","FIXED","critical","P1",

‎data/payloads/bugzilla_buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority renamed to ‎data/payloads/bugzilla_buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
bug_id,"short_desc","bug_status","resolution","bug_severity","priority"
2-
17564,"std.experimental.allocator.theAllocator is null within shared static this","NEW","---","normal","P1"
1+
bug_id,"short_desc","bug_status","resolution","bug_severity","priority","keywords"
2+
17564,"std.experimental.allocator.theAllocator is null within shared static this","NEW","---","normal","P1",

‎data/payloads/bugzilla_buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority renamed to ‎data/payloads/bugzilla_buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
bug_id,"short_desc","bug_status","resolution","bug_severity","priority"
2-
8573,"A simpler Phobos function that returns the index of the mix or max item","NEW","---","enhancement","P2"
1+
bug_id,"short_desc","bug_status","resolution","bug_severity","priority","keywords"
2+
8573,"A simpler Phobos function that returns the index of the mix or max item","NEW","---","enhancement","P2",

‎source/dlangbot/bugzilla.d

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ struct Issue
8484
string resolution;
8585
string severity;
8686
string priority;
87+
string keywords;
8788
}
8889

8990
// get pairs of (issue number, short descriptions) from bugzilla
@@ -95,7 +96,7 @@ Issue[] getDescriptions(R)(R issueRefs)
9596

9697
if (issueRefs.empty)
9798
return null;
98-
return "%s/buglist.cgi?bug_id=%(%d,%)&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority"
99+
return "%s/buglist.cgi?bug_id=%(%d,%)&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords"
99100
.format(bugzillaURL, issueRefs.map!(r => r.id))
100101
.request
101102
.bodyReader.readAllUTF8

‎test/bugzilla.d

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ unittest
1919
res.writeVoidBody;
2020
},
2121
"/trello/1/search?query=name:%22Issue%2017564%22&"~trelloAuth,
22-
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
22+
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
2323
"/bugzilla/jsonrpc.cgi",
2424
(scope HTTPServerRequest req, scope HTTPServerResponse res){
2525
assert(req.json["method"].get!string == "Bug.comments");
@@ -69,7 +69,7 @@ unittest
6969
},
7070
"/github/repos/dlang/phobos/issues/4963/comments",
7171
"/trello/1/search?query=name:%22Issue%2017564%22&"~trelloAuth,
72-
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
72+
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
7373
"/bugzilla/jsonrpc.cgi",
7474
(scope HTTPServerRequest req, scope HTTPServerResponse res){
7575
assert(req.json["method"].get!string == "Bug.comments");
@@ -127,7 +127,7 @@ unittest
127127
res.writeVoidBody;
128128
},
129129
"/trello/1/search?query=name:%22Issue%2017564%22&"~trelloAuth,
130-
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
130+
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
131131
"/bugzilla/jsonrpc.cgi",
132132
(scope HTTPServerRequest req, scope HTTPServerResponse res){
133133
assert(req.json["method"].get!string == "Bug.comments");
@@ -166,11 +166,11 @@ unittest
166166
setAPIExpectations(
167167
"/github/repos/dlang/dmd/pulls/6359/commits",
168168
"/github/repos/dlang/dmd/issues/6359/comments",
169-
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
169+
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
170170
(scope HTTPServerRequest req, scope HTTPServerResponse res){
171171
res.writeBody(
172-
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority"
173-
16794,"dmd not working on Ubuntu 16.10 because of default PIE linking","NEW","---","critical","P1"`);
172+
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority","keywords"
173+
16794,"dmd not working on Ubuntu 16.10 because of default PIE linking","NEW","---","critical","P1",`);
174174
},
175175
"/github/orgs/dlang/public_members?per_page=100",
176176
"/github/repos/dlang/dmd/issues/6359/comments",
@@ -222,7 +222,7 @@ unittest
222222
setAPIExpectations(
223223
"/github/repos/dlang/dmd/pulls/6359/commits",
224224
"/github/repos/dlang/dmd/issues/6359/comments",
225-
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority", // "RESOLVED"/"FIXED"
225+
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords", // "RESOLVED"/"FIXED"
226226
"/github/orgs/dlang/public_members?per_page=100",
227227
"/github/repos/dlang/dmd/issues/6359/comments",
228228
"/github/repos/dlang/dmd/issues/6359/labels",
@@ -250,7 +250,7 @@ unittest
250250
"/github/repos/dlang/phobos/issues/4921/labels",
251251
"/github/repos/dlang/phobos/issues/4921/comments",
252252
"/github/orgs/dlang/public_members?per_page=100",
253-
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority", // "NEW"/"---"
253+
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords", // "NEW"/"---"
254254
"/github/repos/dlang/phobos/issues/comments/262784442",
255255
(scope HTTPServerRequest req, scope HTTPServerResponse res) {},
256256
"/trello/1/search?query=name:%22Issue%208573%22&"~trelloAuth,

‎test/comments.d

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ unittest
1010
"/github/repos/dlang/phobos/issues/4921/labels",
1111
"/github/repos/dlang/phobos/issues/4921/comments",
1212
"/github/orgs/dlang/public_members?per_page=100",
13-
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
13+
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
1414
"/github/repos/dlang/phobos/issues/comments/262784442",
1515
(scope HTTPServerRequest req, scope HTTPServerResponse res){
1616
assert(req.method == HTTPMethod.PATCH);
@@ -41,7 +41,7 @@ unittest
4141
j = Json.emptyArray;
4242
},
4343
"/github/orgs/dlang/public_members?per_page=100",
44-
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
44+
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
4545
// no bug fix label, since Issues are only referenced but not fixed according to commit messages
4646
"/github/repos/dlang/phobos/issues/4921/comments",
4747
(scope HTTPServerRequest req, scope HTTPServerResponse res){
@@ -124,11 +124,11 @@ unittest
124124
j[0]["commit"]["message"] = "Fix Issue 8573";
125125
},
126126
"/github/repos/dlang/phobos/issues/4921/comments",
127-
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
127+
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
128128
(scope HTTPServerRequest req, scope HTTPServerResponse res){
129129
res.writeBody(
130-
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority"
131-
8573,"A simpler Phobos function that returns the index of the mix or max item","NEW","---","enhancement","P2"`);
130+
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority","keywords"
131+
8573,"A simpler Phobos function that returns the index of the mix or max item","NEW","---","enhancement","P2",`);
132132
},
133133
"/github/repos/dlang/phobos/issues/4921/labels",
134134
"/github/repos/dlang/phobos/issues/4921/labels", (ref Json j) {
@@ -161,7 +161,7 @@ unittest
161161
j[0]["commit"]["message"] = "Fix Issue 8573";
162162
},
163163
"/github/repos/dlang/phobos/issues/4921/comments",
164-
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
164+
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
165165
"/github/repos/dlang/phobos/issues/4921/labels",
166166
"/github/repos/dlang/phobos/issues/4921/labels", (ref Json j) {
167167
j[0]["name"] = "Enhancement";
@@ -228,11 +228,11 @@ unittest
228228
"/github/repos/dlang/phobos/issues/4921/comments", (ref Json j) {
229229
j = Json.emptyArray;
230230
},
231-
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
231+
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
232232
(scope HTTPServerRequest req, scope HTTPServerResponse res){
233233
res.writeBody(
234-
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority"
235-
8573,"A simpler Phobos function that returns the index of the mix or max item","NEW","---","regression","P2"`);
234+
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority","keywords"
235+
8573,"A simpler Phobos function that returns the index of the mix or max item","NEW","---","regression","P2",`);
236236
},
237237
"/github/orgs/dlang/public_members?per_page=100",
238238
"/github/repos/dlang/phobos/issues/4921/labels",
@@ -299,7 +299,7 @@ unittest
299299
(scope HTTPServerRequest req, scope HTTPServerResponse res){
300300
assert(req.method == HTTPMethod.DELETE);
301301
},
302-
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
302+
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
303303
"/github/repos/dlang/phobos/issues/5519/comments",
304304
"/github/orgs/dlang/public_members?per_page=100",
305305
"/github/repos/dlang/phobos/issues/comments/311653375",
@@ -320,7 +320,7 @@ unittest
320320
{
321321
setAPIExpectations(
322322
"/github/repos/dlang/phobos/pulls/5519/commits",
323-
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
323+
"/bugzilla/buglist.cgi?bug_id=17564&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
324324
"/github/repos/dlang/phobos/issues/5519/comments",
325325
"/github/orgs/dlang/public_members?per_page=100",
326326
"/github/repos/dlang/phobos/issues/comments/311653375",
@@ -344,7 +344,7 @@ unittest
344344
"/github/repos/dlang/phobos/pulls/4921/commits",
345345
"/github/repos/dlang/phobos/issues/4921/labels",
346346
"/github/repos/dlang/phobos/issues/4921/comments",
347-
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
347+
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
348348
"/trello/1/search?query=name:%22Issue%208573%22&"~trelloAuth,
349349
"/bugzilla/jsonrpc.cgi", // Bug.comments
350350
"/bugzilla/jsonrpc.cgi", // Bug.update
@@ -366,11 +366,11 @@ unittest
366366
"/github/repos/dlang/phobos/issues/4921/comments", (ref Json j) {
367367
j = Json.emptyArray;
368368
},
369-
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
369+
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
370370
(scope HTTPServerRequest req, scope HTTPServerResponse res){
371371
res.writeBody(
372-
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority"
373-
8573,"A simpler Phobos function that returns the index of the mix or max item","NEW","---","regression","P2"`);
372+
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority","keywords"
373+
8573,"A simpler Phobos function that returns the index of the mix or max item","NEW","---","regression","P2",`);
374374
},
375375
"/github/orgs/dlang/public_members?per_page=100",
376376
"/github/repos/dlang/phobos/issues/4921/comments",
@@ -397,11 +397,11 @@ unittest
397397
"/github/repos/dlang/phobos/issues/4921/comments", (ref Json j) {
398398
j = Json.emptyArray;
399399
},
400-
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
400+
"/bugzilla/buglist.cgi?bug_id=8573&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
401401
(scope HTTPServerRequest req, scope HTTPServerResponse res){
402402
res.writeBody(
403-
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority"
404-
8573,"A simpler Phobos function that returns the index of the mix or max item","CLOSED","---","regression","P2"`);
403+
`bug_id,"short_desc","bug_status","resolution","bug_severity","priority","keywords"
404+
8573,"A simpler Phobos function that returns the index of the mix or max item","CLOSED","---","regression","P2",`);
405405
},
406406
"/github/repos/dlang/phobos/issues/4921/labels",
407407
"/github/repos/dlang/phobos/issues/4921/labels",

‎test/trello.d

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import std.stdio, std.format : format;
66
unittest
77
{
88
setAPIExpectations(
9-
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
9+
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
1010
"/trello/1/cards/583f517a333add7c28e0cec7/actions?filter=commentCard&"~trelloAuth,
1111
(ref Json j) { j = Json.emptyArray; },
1212
"/trello/1/cards/583f517a333add7c28e0cec7/actions/comments?"~trelloAuth,
@@ -25,7 +25,7 @@ unittest
2525
unittest
2626
{
2727
setAPIExpectations(
28-
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
28+
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
2929
"/trello/1/cards/583f517a333add7c28e0cec7/actions?filter=commentCard&"~trelloAuth,
3030
(ref Json j) { j[0]["data"]["text"] = "- [Issue 16794 - bla bla](https://issues.dlang.org/show_bug.cgi?id=16794)\n"; },
3131
"/trello/1/cards/583f517a333add7c28e0cec7/actions/583f517b91413ef81f1f9d34/comments?"~trelloAuth,
@@ -46,7 +46,7 @@ unittest
4646
setAPIExpectations(
4747
"/github/repos/dlang/dmd/pulls/6359/commits",
4848
"/github/repos/dlang/dmd/issues/6359/comments",
49-
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
49+
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
5050
"/github/orgs/dlang/public_members?per_page=100",
5151
"/github/repos/dlang/dmd/issues/6359/comments",
5252
"/github/repos/dlang/dmd/issues/6359/labels", (ref Json j){
@@ -84,7 +84,7 @@ unittest
8484
setAPIExpectations(
8585
"/github/repos/dlang/dmd/pulls/6359/commits",
8686
"/github/repos/dlang/dmd/issues/6359/comments",
87-
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority",
87+
"/bugzilla/buglist.cgi?bug_id=16794&ctype=csv&columnlist=short_desc,bug_status,resolution,bug_severity,priority,keywords",
8888
"/github/orgs/dlang/public_members?per_page=100",
8989
"/github/repos/dlang/dmd/issues/6359/comments",
9090
"/github/repos/dlang/dmd/issues/6359/labels", (ref Json j){

0 commit comments

Comments
 (0)