@feigi/fleet-ctl 3.136.6 → 3.136.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/scripts/main-gain.mjs +6 -3
package/package.json
CHANGED
package/scripts/main-gain.mjs
CHANGED
|
@@ -62,7 +62,8 @@
|
|
|
62
62
|
// GitHub's merge subject for PR n, otherwise that commit's 12-character
|
|
63
63
|
// abbreviated SHA. A PR-body line `main-gain-removal: <path> <key> - <why>`
|
|
64
64
|
// acknowledges every hit in that file with that key, and nothing else; one
|
|
65
|
-
// with an empty reason
|
|
65
|
+
// with an empty reason, or a reason that is only an angle-bracket placeholder
|
|
66
|
+
// such as the printed `<why>`, does not count. Acknowledged hits move from `hits[]`
|
|
66
67
|
// to `acknowledged[]` and both are reported.
|
|
67
68
|
//
|
|
68
69
|
// Stdout: one JSON line, `{head, base, closes, since, hits, acknowledged,
|
|
@@ -380,12 +381,14 @@ function blame(path, lines) {
|
|
|
380
381
|
}
|
|
381
382
|
|
|
382
383
|
// `main-gain-removal: <path> <key> - <why>`, one per line. The key is the
|
|
383
|
-
// token before ` - `, so a path may carry spaces; a blank <why> never matches
|
|
384
|
+
// token before ` - `, so a path may carry spaces; a blank <why> never matches,
|
|
385
|
+
// and neither does one that is a single angle-bracket placeholder, the line
|
|
386
|
+
// the gate prints for the author to copy included.
|
|
384
387
|
function acknowledgements(text) {
|
|
385
388
|
const acks = [];
|
|
386
389
|
for (const raw of text.split(/\r?\n/)) {
|
|
387
390
|
const m = /^main-gain-removal: (.+) (#[1-9][0-9]*|[0-9a-f]{12}) - (\S.*)$/.exec(raw.trim());
|
|
388
|
-
if (m) acks.push({ path: m[1], key: m[2], reason: m[3] });
|
|
391
|
+
if (m && !/^<[^<>]*>$/.test(m[3])) acks.push({ path: m[1], key: m[2], reason: m[3] });
|
|
389
392
|
}
|
|
390
393
|
return acks;
|
|
391
394
|
}
|