@toon-protocol/rig 5.2.0 → 5.3.0
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/dist/{chunk-S5R44MMB.js → chunk-DGF7WCRW.js} +18 -2
- package/dist/{chunk-S5R44MMB.js.map → chunk-DGF7WCRW.js.map} +1 -1
- package/dist/{chunk-Y7TUE7JT.js → chunk-KQ4NQV7T.js} +754 -305
- package/dist/chunk-KQ4NQV7T.js.map +1 -0
- package/dist/{chunk-JX5P2KAA.js → chunk-OVZJ5P6E.js} +11 -2
- package/dist/chunk-OVZJ5P6E.js.map +1 -0
- package/dist/{chunk-FX5GPZYU.js → chunk-UXRWMKXV.js} +0 -0
- package/dist/{ci-serve-CA37KQVC.js → ci-serve-R7ZQ7GJQ.js} +5 -5
- package/dist/cli/rig.js +4 -4
- package/dist/index.d.ts +2 -2
- package/dist/index.js +2 -2
- package/dist/{publisher-CQi69Nwg.d.ts → publisher-rblR_O9q.d.ts} +9 -1
- package/dist/standalone/index.d.ts +1 -1
- package/dist/{standalone-mode-NWCCRFCL.js → standalone-mode-E7TNMWGO.js} +3 -3
- package/package.json +1 -1
- package/dist/chunk-JX5P2KAA.js.map +0 -1
- package/dist/chunk-Y7TUE7JT.js.map +0 -1
- /package/dist/{chunk-FX5GPZYU.js.map → chunk-UXRWMKXV.js.map} +0 -0
- /package/dist/{ci-serve-CA37KQVC.js.map → ci-serve-R7ZQ7GJQ.js.map} +0 -0
- /package/dist/{standalone-mode-NWCCRFCL.js.map → standalone-mode-E7TNMWGO.js.map} +0 -0
|
@@ -12,7 +12,7 @@ import {
|
|
|
12
12
|
parseMaintainers,
|
|
13
13
|
queryRelay,
|
|
14
14
|
resolveIdentity
|
|
15
|
-
} from "./chunk-
|
|
15
|
+
} from "./chunk-OVZJ5P6E.js";
|
|
16
16
|
import {
|
|
17
17
|
defaultDaemonPort,
|
|
18
18
|
standaloneForced,
|
|
@@ -3188,6 +3188,14 @@ rig can create one for you: re-run \`rig init --git-init\` (in a terminal, plain
|
|
|
3188
3188
|
this.name = "NotAGitRepositoryError";
|
|
3189
3189
|
}
|
|
3190
3190
|
};
|
|
3191
|
+
var PrMergeError = class extends Error {
|
|
3192
|
+
constructor(code, message) {
|
|
3193
|
+
super(message);
|
|
3194
|
+
this.code = code;
|
|
3195
|
+
this.name = "PrMergeError";
|
|
3196
|
+
}
|
|
3197
|
+
code;
|
|
3198
|
+
};
|
|
3191
3199
|
function nonFastForwardLines(refs) {
|
|
3192
3200
|
return [
|
|
3193
3201
|
"Push rejected: non-fast-forward update for:",
|
|
@@ -3267,6 +3275,13 @@ function describeError(err, command = "push") {
|
|
|
3267
3275
|
json: { error: "missing_identity", detail: err.message }
|
|
3268
3276
|
};
|
|
3269
3277
|
}
|
|
3278
|
+
if (err instanceof PrMergeError) {
|
|
3279
|
+
return {
|
|
3280
|
+
code: err.code,
|
|
3281
|
+
lines: err.message.split("\n"),
|
|
3282
|
+
json: { error: err.code, detail: err.message }
|
|
3283
|
+
};
|
|
3284
|
+
}
|
|
3270
3285
|
if (err instanceof NonFastForwardError) {
|
|
3271
3286
|
return {
|
|
3272
3287
|
code: "non_fast_forward",
|
|
@@ -4308,6 +4323,7 @@ export {
|
|
|
4308
4323
|
UnknownRemoteError,
|
|
4309
4324
|
MultiUrlRemoteError,
|
|
4310
4325
|
NotAGitRepositoryError,
|
|
4326
|
+
PrMergeError,
|
|
4311
4327
|
emitCliError,
|
|
4312
4328
|
resolveRepoRoot,
|
|
4313
4329
|
initGitRepository,
|
|
@@ -4325,4 +4341,4 @@ export {
|
|
|
4325
4341
|
assembleCiStatus,
|
|
4326
4342
|
runCiStatus
|
|
4327
4343
|
};
|
|
4328
|
-
//# sourceMappingURL=chunk-
|
|
4344
|
+
//# sourceMappingURL=chunk-DGF7WCRW.js.map
|