@rigxyz/tapd 0.6.7 → 0.6.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/dist/bin.js +12 -2
- package/dist/bin.js.map +1 -1
- package/dist/{chunk-32K6ANXS.js → chunk-S5AVBVLP.js} +0 -0
- package/dist/chunk-S5AVBVLP.js.map +1 -0
- package/dist/index.d.ts +94 -10
- package/dist/index.js +5 -1
- package/package.json +3 -2
- package/dist/chunk-32K6ANXS.js.map +0 -1
package/dist/bin.js
CHANGED
|
@@ -25,12 +25,13 @@ import {
|
|
|
25
25
|
openStateDb,
|
|
26
26
|
quarantineFiles,
|
|
27
27
|
readBindingConfig,
|
|
28
|
+
readMerges,
|
|
28
29
|
readNotSynced,
|
|
29
30
|
removeImport,
|
|
30
31
|
revoke,
|
|
31
32
|
safeResolveRigPath,
|
|
32
33
|
start
|
|
33
|
-
} from "./chunk-
|
|
34
|
+
} from "./chunk-S5AVBVLP.js";
|
|
34
35
|
|
|
35
36
|
// src/bin.ts
|
|
36
37
|
import { join as pathJoin, resolve } from "path";
|
|
@@ -284,7 +285,7 @@ import { existsSync as existsSync4 } from "fs";
|
|
|
284
285
|
import { join as join4 } from "path";
|
|
285
286
|
|
|
286
287
|
// src/version.ts
|
|
287
|
-
var TAPD_VERSION = "0.6.
|
|
288
|
+
var TAPD_VERSION = "0.6.8";
|
|
288
289
|
|
|
289
290
|
// src/status.ts
|
|
290
291
|
var STATE_KEY_LAST_APPLY_ERROR = "last_apply_error";
|
|
@@ -307,6 +308,7 @@ function statusToJson(report) {
|
|
|
307
308
|
pendingUploads: report.pendingUploads,
|
|
308
309
|
notSynced: report.notSynced,
|
|
309
310
|
conflicts: report.conflicts,
|
|
311
|
+
merged: report.merged,
|
|
310
312
|
lastApplyError: report.lastApplyError,
|
|
311
313
|
offline: report.offline,
|
|
312
314
|
mounts: report.mounts
|
|
@@ -363,6 +365,7 @@ async function status(opts) {
|
|
|
363
365
|
notSynced: [],
|
|
364
366
|
conflicts: [],
|
|
365
367
|
conflictCount: 0,
|
|
368
|
+
merged: [],
|
|
366
369
|
lastApplyError: null,
|
|
367
370
|
daemon,
|
|
368
371
|
offline: false,
|
|
@@ -424,6 +427,7 @@ async function status(opts) {
|
|
|
424
427
|
notSynced: readNotSynced(db),
|
|
425
428
|
conflicts,
|
|
426
429
|
conflictCount,
|
|
430
|
+
merged: readMerges(db),
|
|
427
431
|
lastApplyError,
|
|
428
432
|
daemon,
|
|
429
433
|
offline,
|
|
@@ -1138,6 +1142,12 @@ async function runStatus(flags2) {
|
|
|
1138
1142
|
} else {
|
|
1139
1143
|
console.log(` conflicts: ${C.dim("none")}`);
|
|
1140
1144
|
}
|
|
1145
|
+
if (report.merged.length > 0) {
|
|
1146
|
+
console.log(` merged: ${report.merged.length} ${C.dim("(local + remote edits merged automatically, recent)")}`);
|
|
1147
|
+
for (const m of report.merged.slice(-5)) {
|
|
1148
|
+
console.log(C.dim(` ${m.path} with ${m.theirsChangeId}${m.changeId ? ` \u2192 ${m.changeId}` : " (upload pending)"} ${m.at}`));
|
|
1149
|
+
}
|
|
1150
|
+
}
|
|
1141
1151
|
if (report.lastApplyError) {
|
|
1142
1152
|
const e = report.lastApplyError;
|
|
1143
1153
|
console.log(
|