@ibgib/vcs-gib 0.0.21 → 0.0.23
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/AUTO-GENERATED-version.d.mts +1 -1
- package/dist/AUTO-GENERATED-version.mjs +1 -1
- package/dist/bootstrap/node-bootstrap.mjs +1 -1
- package/dist/cli/commands/merge-cmd.d.mts +21 -8
- package/dist/cli/commands/merge-cmd.d.mts.map +1 -1
- package/dist/cli/commands/merge-cmd.mjs +138 -70
- package/dist/cli/commands/merge-cmd.mjs.map +1 -1
- package/dist/cli/vcs-cli-main.mjs +2 -2
- package/dist/cli/vcs-cli-main.mjs.map +1 -1
- package/dist/engine/item/item-helper.d.mts +31 -1
- package/dist/engine/item/item-helper.d.mts.map +1 -1
- package/dist/engine/item/item-helper.mjs +39 -0
- package/dist/engine/item/item-helper.mjs.map +1 -1
- package/dist/engine/merge/{b2tfs-3way-merge-strategy.d.mts → b2tfs-3way-graft-strategy.d.mts} +9 -11
- package/dist/engine/merge/b2tfs-3way-graft-strategy.d.mts.map +1 -0
- package/dist/engine/merge/{b2tfs-3way-merge-strategy.mjs → b2tfs-3way-graft-strategy.mjs} +51 -294
- package/dist/engine/merge/b2tfs-3way-graft-strategy.mjs.map +1 -0
- package/dist/engine/merge/{b2tfs-3way-merge-types.d.mts → b2tfs-3way-graft-types.d.mts} +2 -9
- package/dist/engine/merge/b2tfs-3way-graft-types.d.mts.map +1 -0
- package/dist/engine/merge/b2tfs-3way-graft-types.mjs +2 -0
- package/dist/engine/merge/b2tfs-3way-graft-types.mjs.map +1 -0
- package/dist/test/test-helpers.d.mts +51 -0
- package/dist/test/test-helpers.d.mts.map +1 -0
- package/dist/test/test-helpers.mjs +135 -0
- package/dist/test/test-helpers.mjs.map +1 -0
- package/package.json +4 -4
- package/src/AUTO-GENERATED-version.mts +1 -1
- package/src/bootstrap/node-bootstrap.mts +1 -1
- package/src/cli/commands/branch-checkout-cmd.respec.log +8 -101
- package/src/cli/commands/branch-checkout-cmd.respec.mts +11 -10
- package/src/cli/commands/merge-cmd.mts +154 -76
- package/src/cli/vcs-cli-main.mts +3 -3
- package/src/engine/item/item-helper.mts +71 -1
- package/src/engine/merge/{b2tfs-3way-merge-strategy.mts → b2tfs-3way-graft-strategy.mts} +66 -367
- package/src/engine/merge/{b2tfs-3way-merge-strategy.respec.mts → b2tfs-3way-graft-strategy.respec.mts} +27 -122
- package/src/engine/merge/{b2tfs-3way-merge-types.mts → b2tfs-3way-graft-types.mts} +34 -42
- package/src/test/test-helpers.mts +168 -0
- package/tsconfig.test.tsbuildinfo +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/dist/engine/merge/b2tfs-3way-merge-strategy.d.mts.map +0 -1
- package/dist/engine/merge/b2tfs-3way-merge-strategy.mjs.map +0 -1
- package/dist/engine/merge/b2tfs-3way-merge-types.d.mts.map +0 -1
- package/dist/engine/merge/b2tfs-3way-merge-types.mjs +0 -2
- package/dist/engine/merge/b2tfs-3way-merge-types.mjs.map +0 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"b2tfs-3way-graft-strategy.mjs","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-strategy.mts"],"names":[],"mappings":"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"}
|
|
@@ -1,14 +1,7 @@
|
|
|
1
1
|
import { IbGibAddr } from "@ibgib/ts-gib/dist/types.mjs";
|
|
2
2
|
import { AddlGraftDetails } from "@ibgib/core-gib/dist/sync/graft-info/graft-info-types.mjs";
|
|
3
3
|
/**
|
|
4
|
-
* Contains references to key b2tfs item ibgibs and their corresponding binary ibgibs
|
|
5
|
-
*
|
|
6
|
-
* ## note on "Details"
|
|
7
|
-
*
|
|
8
|
-
* stupid word "details" is plural and I have this set to be an
|
|
9
|
-
* array. don't have the ability to refactor right now, so this will
|
|
10
|
-
* be mildly confusing unfortunately. Agents should not try to just
|
|
11
|
-
* refactor this on the fly.
|
|
4
|
+
* Contains references to key b2tfs item ibgibs and their corresponding binary ibgibs.
|
|
12
5
|
*/
|
|
13
6
|
export interface B2tFS3WayAddlGraftDetails extends AddlGraftDetails {
|
|
14
7
|
/**
|
|
@@ -38,4 +31,4 @@ export interface B2tFS3WayAddlGraftDetails extends AddlGraftDetails {
|
|
|
38
31
|
*/
|
|
39
32
|
orphanTextBinAddr: IbGibAddr | undefined;
|
|
40
33
|
}
|
|
41
|
-
//# sourceMappingURL=b2tfs-3way-
|
|
34
|
+
//# sourceMappingURL=b2tfs-3way-graft-types.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"b2tfs-3way-graft-types.d.mts","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-types.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,2DAA2D,CAAC;AAE7F;;GAEG;AACH,MAAM,WAAW,yBAA0B,SAAQ,gBAAgB;IAC/D;;;;;OAKG;IACH,qBAAqB,EAAE,SAAS,CAAC;IACjC;;;;OAIG;IACH,eAAe,EAAE,SAAS,GAAG,SAAS,CAAC;IACvC;;;;;OAKG;IACH,uBAAuB,EAAE,SAAS,CAAC;IACnC;;;;OAIG;IACH,iBAAiB,EAAE,SAAS,GAAG,SAAS,CAAC;CAC5C"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"b2tfs-3way-graft-types.mjs","sourceRoot":"","sources":["../../../src/engine/merge/b2tfs-3way-graft-types.mts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,51 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module test-helpers
|
|
3
|
+
*
|
|
4
|
+
* Pure-function diagnostic helpers for logging and inspecting b2tfs ibgib
|
|
5
|
+
* state during tests. These are NOT production code — they are imported only
|
|
6
|
+
* by test files (*.respec.mts) and the handful of vcs-gib commands that
|
|
7
|
+
* temporarily wire in diagnostic logging.
|
|
8
|
+
*
|
|
9
|
+
* Usage pattern:
|
|
10
|
+
*
|
|
11
|
+
* ```ts
|
|
12
|
+
* import { logBranchState, logItemState } from '../../test/test-helpers.mjs';
|
|
13
|
+
* await logBranchState({ label: 'after commit', branchIbGib, space });
|
|
14
|
+
* ```
|
|
15
|
+
*/
|
|
16
|
+
import { IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
|
|
17
|
+
import { IbGibAddr } from '@ibgib/ts-gib/dist/types.mjs';
|
|
18
|
+
import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
|
|
19
|
+
import { B2tFSBranchIbGib_V1 } from '../engine/branch/branch-types.mjs';
|
|
20
|
+
import { B2tFSItemIbGib_V1 } from '../engine/item/item-types.mjs';
|
|
21
|
+
/**
|
|
22
|
+
* Logs a compact snapshot of a b2tfs branch ibgib and the latest addr for its
|
|
23
|
+
* b2tfs_item timeline as known by the given space.
|
|
24
|
+
*/
|
|
25
|
+
export declare function logBranchState({ label, branchIbGib, space, }: {
|
|
26
|
+
label: string;
|
|
27
|
+
branchIbGib: B2tFSBranchIbGib_V1 | IbGib_V1 | undefined;
|
|
28
|
+
space?: IbGibSpaceAny;
|
|
29
|
+
}): Promise<void>;
|
|
30
|
+
/**
|
|
31
|
+
* Logs a compact snapshot of a b2tfs item ibgib and optionally the latest addr
|
|
32
|
+
* for its timeline as known by the given space.
|
|
33
|
+
*/
|
|
34
|
+
export declare function logItemState({ label, itemIbGib, space, }: {
|
|
35
|
+
label: string;
|
|
36
|
+
itemIbGib: B2tFSItemIbGib_V1 | IbGib_V1 | undefined;
|
|
37
|
+
space?: IbGibSpaceAny;
|
|
38
|
+
}): Promise<void>;
|
|
39
|
+
/**
|
|
40
|
+
* Logs a one-line separator to make log sections visually scannable.
|
|
41
|
+
*/
|
|
42
|
+
export declare function logCheckpoint(label: string): void;
|
|
43
|
+
/**
|
|
44
|
+
* Logs the full addr (no shortening) for debugging addr comparison issues.
|
|
45
|
+
*/
|
|
46
|
+
export declare function logAddr(label: string, addr: IbGibAddr | undefined): void;
|
|
47
|
+
/**
|
|
48
|
+
* Logs a set of addrs with short formatting.
|
|
49
|
+
*/
|
|
50
|
+
export declare function logAddrs(label: string, addrs: IbGibAddr[] | undefined): void;
|
|
51
|
+
//# sourceMappingURL=test-helpers.d.mts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-helpers.d.mts","sourceRoot":"","sources":["../../src/test/test-helpers.mts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AAEzD,OAAO,EAAE,aAAa,EAAE,MAAM,sDAAsD,CAAC;AAErF,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAgClE;;;GAGG;AACH,wBAAsB,cAAc,CAAC,EACjC,KAAK,EACL,WAAW,EACX,KAAK,GACR,EAAE;IACC,KAAK,EAAE,MAAM,CAAC;IACd,WAAW,EAAE,mBAAmB,GAAG,QAAQ,GAAG,SAAS,CAAC;IACxD,KAAK,CAAC,EAAE,aAAa,CAAC;CACzB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BhB;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,EAC/B,KAAK,EACL,SAAS,EACT,KAAK,GACR,EAAE;IACC,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,iBAAiB,GAAG,QAAQ,GAAG,SAAS,CAAC;IACpD,KAAK,CAAC,EAAE,aAAa,CAAC;CACzB,GAAG,OAAO,CAAC,IAAI,CAAC,CAiChB;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAGjD;AAED;;GAEG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,IAAI,CAExE;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,SAAS,GAAG,IAAI,CAE5E"}
|
|
@@ -0,0 +1,135 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @module test-helpers
|
|
3
|
+
*
|
|
4
|
+
* Pure-function diagnostic helpers for logging and inspecting b2tfs ibgib
|
|
5
|
+
* state during tests. These are NOT production code — they are imported only
|
|
6
|
+
* by test files (*.respec.mts) and the handful of vcs-gib commands that
|
|
7
|
+
* temporarily wire in diagnostic logging.
|
|
8
|
+
*
|
|
9
|
+
* Usage pattern:
|
|
10
|
+
*
|
|
11
|
+
* ```ts
|
|
12
|
+
* import { logBranchState, logItemState } from '../../test/test-helpers.mjs';
|
|
13
|
+
* await logBranchState({ label: 'after commit', branchIbGib, space });
|
|
14
|
+
* ```
|
|
15
|
+
*/
|
|
16
|
+
import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
|
|
17
|
+
import { getLatestAddrs } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
|
|
18
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
19
|
+
// Internal helpers
|
|
20
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
21
|
+
function shortAddr(addr) {
|
|
22
|
+
if (!addr) {
|
|
23
|
+
return '(none)';
|
|
24
|
+
}
|
|
25
|
+
// show the first 12 chars of the gib portion for easy visual matching
|
|
26
|
+
const caretIdx = addr.lastIndexOf('^');
|
|
27
|
+
if (caretIdx === -1) {
|
|
28
|
+
return addr.slice(0, 40);
|
|
29
|
+
}
|
|
30
|
+
const ib = addr.slice(0, caretIdx);
|
|
31
|
+
const gib = addr.slice(caretIdx + 1);
|
|
32
|
+
// gib may be punctiliarHash.tjpGib — show first 8 of each
|
|
33
|
+
const dotIdx = gib.indexOf('.');
|
|
34
|
+
const gibShort = dotIdx === -1
|
|
35
|
+
? gib.slice(0, 8)
|
|
36
|
+
: `${gib.slice(0, 8)}.${gib.slice(dotIdx + 1, dotIdx + 9)}`;
|
|
37
|
+
return `${ib}^${gibShort}`;
|
|
38
|
+
}
|
|
39
|
+
function shortAddrs(addrs) {
|
|
40
|
+
if (!addrs || addrs.length === 0) {
|
|
41
|
+
return '[]';
|
|
42
|
+
}
|
|
43
|
+
return `[\n ${addrs.map(shortAddr).join('\n ')}\n ]`;
|
|
44
|
+
}
|
|
45
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
46
|
+
// Exported diagnostic helpers
|
|
47
|
+
// ─────────────────────────────────────────────────────────────────────────────
|
|
48
|
+
/**
|
|
49
|
+
* Logs a compact snapshot of a b2tfs branch ibgib and the latest addr for its
|
|
50
|
+
* b2tfs_item timeline as known by the given space.
|
|
51
|
+
*/
|
|
52
|
+
export async function logBranchState({ label, branchIbGib, space, }) {
|
|
53
|
+
const lc = `[logBranchState][${label}]`;
|
|
54
|
+
if (!branchIbGib) {
|
|
55
|
+
console.log(`${lc} branchIbGib: (UNDEFINED)`);
|
|
56
|
+
return;
|
|
57
|
+
}
|
|
58
|
+
const b = branchIbGib;
|
|
59
|
+
const addr = getIbGibAddr({ ibGib: b });
|
|
60
|
+
const n = b.data?.n ?? '?';
|
|
61
|
+
const name = b.data?.name ?? '?';
|
|
62
|
+
const tjpAddr = b.rel8ns?.tjp?.at(0);
|
|
63
|
+
const itemAddrs = b.rel8ns?.b2tfs_item ?? [];
|
|
64
|
+
console.log(`${lc}
|
|
65
|
+
addr : ${shortAddr(addr)}
|
|
66
|
+
name : ${name}
|
|
67
|
+
n : ${n}
|
|
68
|
+
tjp : ${shortAddr(tjpAddr)}
|
|
69
|
+
b2tfs_item: ${shortAddrs(itemAddrs)} (${itemAddrs.length} total, tip: ${shortAddr(itemAddrs.at(-1))})`);
|
|
70
|
+
if (space && tjpAddr) {
|
|
71
|
+
try {
|
|
72
|
+
const res = await getLatestAddrs({ addrs: [tjpAddr], space });
|
|
73
|
+
const latest = res?.data?.latestAddrs?.[0];
|
|
74
|
+
console.log(` [space ${space.ib ?? space.constructor.name}] latestAddr for branch TJP: ${shortAddr(latest)}`);
|
|
75
|
+
}
|
|
76
|
+
catch (e) {
|
|
77
|
+
console.log(` [space] getLatestAddrs for branch TJP THREW: ${e}`);
|
|
78
|
+
}
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Logs a compact snapshot of a b2tfs item ibgib and optionally the latest addr
|
|
83
|
+
* for its timeline as known by the given space.
|
|
84
|
+
*/
|
|
85
|
+
export async function logItemState({ label, itemIbGib, space, }) {
|
|
86
|
+
const lc = `[logItemState][${label}]`;
|
|
87
|
+
if (!itemIbGib) {
|
|
88
|
+
console.log(`${lc} itemIbGib: (UNDEFINED)`);
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
91
|
+
const item = itemIbGib;
|
|
92
|
+
const addr = getIbGibAddr({ ibGib: item });
|
|
93
|
+
const n = item.data?.n ?? '?';
|
|
94
|
+
const fsType = item.data?.fsType ?? '?';
|
|
95
|
+
const filename = item.data?.filename ?? item.data?.name ?? '?';
|
|
96
|
+
const tjpAddr = item.rel8ns?.tjp?.at(0);
|
|
97
|
+
const textContent = item.data?.textContent;
|
|
98
|
+
const binRel8n = item.rel8ns?.bin ?? item.rel8ns?.binary;
|
|
99
|
+
console.log(`${lc}
|
|
100
|
+
addr : ${shortAddr(addr)}
|
|
101
|
+
filename : ${filename} fsType: ${fsType}
|
|
102
|
+
n : ${n}
|
|
103
|
+
tjp : ${shortAddr(tjpAddr)}
|
|
104
|
+
text : ${textContent !== undefined ? JSON.stringify(textContent.slice(0, 120)) : binRel8n ? `(binary, bin rel8n: ${shortAddrs(binRel8n)})` : '(none)'}`);
|
|
105
|
+
if (space && tjpAddr) {
|
|
106
|
+
try {
|
|
107
|
+
const res = await getLatestAddrs({ addrs: [tjpAddr], space });
|
|
108
|
+
const latest = res?.data?.latestAddrs?.[0];
|
|
109
|
+
console.log(` [space ${space.ib ?? space.constructor.name}] latestAddr for item TJP: ${shortAddr(latest)}`);
|
|
110
|
+
}
|
|
111
|
+
catch (e) {
|
|
112
|
+
console.log(` [space] getLatestAddrs for item TJP THREW: ${e}`);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
/**
|
|
117
|
+
* Logs a one-line separator to make log sections visually scannable.
|
|
118
|
+
*/
|
|
119
|
+
export function logCheckpoint(label) {
|
|
120
|
+
const bar = '─'.repeat(60);
|
|
121
|
+
console.log(`\n${bar}\n CHECKPOINT: ${label}\n${bar}`);
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* Logs the full addr (no shortening) for debugging addr comparison issues.
|
|
125
|
+
*/
|
|
126
|
+
export function logAddr(label, addr) {
|
|
127
|
+
console.log(`[ADDR][${label}]: ${addr ?? '(undefined)'}`);
|
|
128
|
+
}
|
|
129
|
+
/**
|
|
130
|
+
* Logs a set of addrs with short formatting.
|
|
131
|
+
*/
|
|
132
|
+
export function logAddrs(label, addrs) {
|
|
133
|
+
console.log(`[ADDRS][${label}]: ${shortAddrs(addrs)}`);
|
|
134
|
+
}
|
|
135
|
+
//# sourceMappingURL=test-helpers.mjs.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"test-helpers.mjs","sourceRoot":"","sources":["../../src/test/test-helpers.mts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ibgib/vcs-gib",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.23",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.mjs",
|
|
@@ -20,9 +20,9 @@
|
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
22
|
"@ibgib/helper-gib": "^0.0.37",
|
|
23
|
-
"@ibgib/ts-gib": "^0.5.
|
|
23
|
+
"@ibgib/ts-gib": "^0.5.34",
|
|
24
24
|
"@ibgib/encrypt-gib": "^0.3.1",
|
|
25
|
-
"@ibgib/core-gib": "^0.1.
|
|
26
|
-
"@ibgib/node-gib": "^0.0.
|
|
25
|
+
"@ibgib/core-gib": "^0.1.74",
|
|
26
|
+
"@ibgib/node-gib": "^0.0.19"
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -19,7 +19,7 @@ import { DEFAULT_NODE_FILESYSTEM_SPACE_DATA_V1 } from '@ibgib/node-gib/dist/witn
|
|
|
19
19
|
import { fnCreateNewLocalSpace, fnDtoToSpace_nodeFilesystem } from '@ibgib/node-gib/dist/witness/space/metaspace/metaspace-nodespace/metaspace-nodespace-helper.mjs';
|
|
20
20
|
|
|
21
21
|
import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
|
|
22
|
-
import { B2tFS3WayGraftStrategy } from '../engine/merge/b2tfs-3way-
|
|
22
|
+
import { B2tFS3WayGraftStrategy } from '../engine/merge/b2tfs-3way-graft-strategy.mjs';
|
|
23
23
|
|
|
24
24
|
const lcFile = `[node-bootstrap]`;
|
|
25
25
|
const logalot = GLOBAL_LOG_A_LOT;
|
|
@@ -1,111 +1,18 @@
|
|
|
1
|
-
|
|
2
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
3
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
4
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
5
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
6
|
-
[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
|
|
1
|
+
PS C:\Users\billm\antigravity\ibgib> npm run test:vcs-gib > vcs-gib-test.log
|
|
7
2
|
[branch-cmd][executeBranchCmd] Branch 'feature-auth' already exists (E: 7f6a5b4c3d2e1f0a9b8c7d6e5f4a3b2c) (E: 1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a)
|
|
8
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
9
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
10
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
11
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
12
|
-
[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
|
|
13
3
|
[checkout-cmd][executeCheckoutCmd] Branch name is required for checkout (E: 4a5b6c7d8e9f0a1b2c3d4e5f6a7b8c9d) (E: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)
|
|
14
4
|
[checkout-cmd][executeCheckoutCmd] Branch 'non-existent-branch' does not exist (E: 7d8e9f0a1b2c3d4e5f6a7b8c9d0e1f2a) (E: 0a1b2c3d4e5f6a7b8c9d0e1f2a3b4c5d)
|
|
15
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
16
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
17
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
18
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
19
|
-
[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
|
|
20
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
21
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
22
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
23
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
24
|
-
[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
|
|
25
5
|
[branch-cmd][executeBranchCmd] Item 'src/utils/non-existent.js' not found in active branch snapshot (E: 8f9a0b1c2d3e4f5a6b7c8d9e0f1a2b3c) (E: 1d2e3f4a5b6c7d8e9f0a1b2c3d4e5f6a)
|
|
26
|
-
[
|
|
27
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
28
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
29
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
30
|
-
[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
|
|
31
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
32
|
-
[isPastFrame] couldn't get newerAddr (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8FA10E71C35A8602C2AE3604A5EEE956B43697A8FDD5ED0A31E0D38B8869A3DD.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) from space (witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined). (E: 36c758c22b181b2c89a1cd28937a6826)
|
|
33
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
34
|
-
[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] file: app.ts
|
|
35
|
-
[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] textLCA:
|
|
36
|
-
line 1
|
|
37
|
-
line 2
|
|
38
|
-
line 3
|
|
39
|
-
[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] textBase:
|
|
40
|
-
line 1 modified by main
|
|
41
|
-
line 2
|
|
42
|
-
line 3
|
|
43
|
-
[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] textOrphan:
|
|
44
|
-
line 1
|
|
45
|
-
line 2
|
|
46
|
-
line 3 modified by secondary
|
|
47
|
-
[DEBUG 3WAY] textLCA: "line 1\nline 2\nline 3"
|
|
48
|
-
[DEBUG 3WAY] textBase: "line 1 modified by main\nline 2\nline 3"
|
|
49
|
-
[DEBUG 3WAY] textOrphan: "line 1\nline 2\nline 3 modified by secondary"
|
|
50
|
-
[b2tfs-3way-merge-strategy][mergeTreeNodes] [MERGE DIAGNOSTIC] mergedText:
|
|
51
|
-
line 1 modified by main
|
|
52
|
-
line 2
|
|
53
|
-
line 3 modified by secondary
|
|
54
|
-
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 6. n_existingLatest: 6. space.ib: witness space NodeFilesystemSpace_V1 tmp_sync_recv_8824a3c1 4aae17ecb57f9c235a33ec106e718f0d763509b8ab4e4aa580b344a5a0fb419d undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
55
|
-
[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
|
|
56
|
-
[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
|
|
57
|
-
[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
|
|
6
|
+
[isPastFrame] couldn't get newerAddr (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^EECBAA61C78180F78656F821E1271816E9449F56FEFB664AA9F27ED81948D27E.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) from space (witness space NodeFilesystemSpace_V1 b2s_main 510b55e61edfcfb0553ff7f0f16afa038cf19fdcf511ed834c032dcf7f3e56d0 undefined undefined). (E: 36c758c22b181b2c89a1cd28937a6826)
|
|
58
7
|
[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
|
|
59
|
-
[
|
|
60
|
-
[
|
|
61
|
-
[
|
|
62
|
-
[
|
|
63
|
-
[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
|
|
64
|
-
[SyncPeerInnerspace_V1][sendContextRequest] ARTIFICIALLY DELAYING PAYLOADS TO MIMIC TRANSFER LATENCY. REMOVE THIS DELAY!! (W: 5e7b28f1daa82d955897e9d8cdb16f26)
|
|
65
|
-
[authenticateContextIntrinsically][NAG][not thrown] sagaFrame.data.sessionIdentityTjpAddr logic needs to be added in coordinator (E: 4fc47800a1086c917a47381824280826)
|
|
66
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
67
|
-
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A62BEA427F99F5806F111753A9145DF893AAA9B382E40586BC86AA55C7962A8C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A62BEA427F99F5806F111753A9145DF893AAA9B382E40586BC86AA55C7962A8C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 1. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
68
|
-
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^E1A8D6487C603E8F81454C5DA229ADD2B5069D05668761E0A0D01D43864CE7AC.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^E1A8D6487C603E8F81454C5DA229ADD2B5069D05668761E0A0D01D43864CE7AC.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 2. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
69
|
-
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 6. n_existingLatest: 6. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 7ce86fbcc93998107962baa4905bc49230a2d5fe615c8158a22ec49b1f13bb06 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
70
|
-
[validateFullSyncSagaHistory] NAG ERROR (NOT THROWN) need to implement more validation on full saga history. (E: 9bfcc9247a1c783fd361a4a8216fef26)
|
|
71
|
-
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^4C8827B1BF2250F746A901497990F4E93E1799A3416F306054C5713C006261F3.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^4C8827B1BF2250F746A901497990F4E93E1799A3416F306054C5713C006261F3.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8FA10E71C35A8602C2AE3604A5EEE956B43697A8FDD5ED0A31E0D38B8869A3DD.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 3. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge c0554c86c8384a509cf2065bd284faed725c393865c45a405be3838f87f65929 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
72
|
-
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8B097A2BBED5F7A3CE3B4DDEC37BA72026308CE95EFD262C99DC9C26D69F3860.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^8FA10E71C35A8602C2AE3604A5EEE956B43697A8FDD5ED0A31E0D38B8869A3DD.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 4. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge c0554c86c8384a509cf2065bd284faed725c393865c45a405be3838f87f65929 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
73
|
-
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^D071DAE71F2CC6A5C36A579A7BB0E3207A75939622497711DC9DE2BC71F27EAF.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^A1C371DA5F28DCFDA4DC1202AF89930BFF918406A8893FAFA6A7F9584B7B6B4C.07374FCD253DEDF2065710534F50CF8A03B06E6EA7930932E742D686D9A01559). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 6. n_existingLatest: 6. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge c0554c86c8384a509cf2065bd284faed725c393865c45a405be3838f87f65929 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
74
|
-
[SyncSagaCoordinator][handleCommitFrame] NAG ERROR (NOT THROWN): implement cleanup logic, including add a cleanup method to the peer (E: 3a9a24befb98a981a88fbdbf52920e26)
|
|
75
|
-
💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists default branch main for new repository] ALL 3 of 3 reckonings were respecful
|
|
76
|
-
💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][creates new branch from active branch root item and rejects duplicates]
|
|
77
|
-
ALL 9 of 9 reckonings were respecful
|
|
78
|
-
💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][switches active branch with checkout and projects branch snapshot onto worktree subfolder] ALL 15 of 15 reckonings were respecful
|
|
79
|
-
💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][rejects checkout when branch does not exist or branchName missing] ALL 4 of 4 reckonings were respecful
|
|
80
|
-
💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists branches silently on secondary branch without error noise] ALL 3 of 3 reckonings were respecful
|
|
81
|
-
💚 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][branches single file-root item and projects into file-branch worktree on checkout] ALL 6 of 6 reckonings were respecful
|
|
8
|
+
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^6F40767E6A17082316510C68CCBEE7CCB43B803EF8DE7C4B378D91F5BED745E6.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^6F40767E6A17082316510C68CCBEE7CCB43B803EF8DE7C4B378D91F5BED745E6.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^88FFB649AEB6B6329AB5777A82691EFB72D82014D00D9E0DCCF22196C20363BF.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 1. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 510b55e61edfcfb0553ff7f0f16afa038cf19fdcf511ed834c032dcf7f3e56d0 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
9
|
+
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^DBD0E2D09136F8F5A35036656D8BEF33CF70F4050C73BA7AAD1787E87A7BEB15.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^DBD0E2D09136F8F5A35036656D8BEF33CF70F4050C73BA7AAD1787E87A7BEB15.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^88FFB649AEB6B6329AB5777A82691EFB72D82014D00D9E0DCCF22196C20363BF.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 2. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_main 510b55e61edfcfb0553ff7f0f16afa038cf19fdcf511ed834c032dcf7f3e56d0 undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
10
|
+
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^C4054DC802F94A59398CCFD06453B265F2A3DEEDC637D9670CE16C3293C6B1AC.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^C4054DC802F94A59398CCFD06453B265F2A3DEEDC637D9670CE16C3293C6B1AC.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^EECBAA61C78180F78656F821E1271816E9449F56FEFB664AA9F27ED81948D27E.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 3. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge 5eba6ce1c88e7e09c146f83d88d91c5031f21ff7b987806d52d7e56dbe41190a undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
11
|
+
[registerNewIbGib][b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^88FFB649AEB6B6329AB5777A82691EFB72D82014D00D9E0DCCF22196C20363BF.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527] incoming ibGib (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^88FFB649AEB6B6329AB5777A82691EFB72D82014D00D9E0DCCF22196C20363BF.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527) is NOT NEWER than existing latest (b2tfs_item file app.ts v1 84dd6a83459413d5bb638cd885f20ef0dbebf2ebf10d0f35d1c9ca424b0ca06a^EECBAA61C78180F78656F821E1271816E9449F56FEFB664AA9F27ED81948D27E.1585E564AA472F176E546EC18CFD836106414CAC4814B078B1A8670DA1B98527). multiple branches for the same timeline? ignoring incoming ibGibAddr. n_ibGib: 4. n_existingLatest: 4. space.ib: witness space NodeFilesystemSpace_V1 b2s_feature-merge 5eba6ce1c88e7e09c146f83d88d91c5031f21ff7b987806d52d7e56dbe41190a undefined undefined (W: 057baadca494473dabb26fb4fb879774)
|
|
82
12
|
💔 [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch][includes] Uh oh. this.value (line 1 modified by main
|
|
83
13
|
line 2
|
|
84
14
|
line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
|
|
85
15
|
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DISrespec. 1 out of 5 DISrespecful reckonings 💔
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
line 2
|
|
89
|
-
line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
|
|
90
|
-
line 2
|
|
91
|
-
line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
|
|
92
|
-
line 2
|
|
93
|
-
line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
|
|
94
|
-
line 2
|
|
95
|
-
line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
|
|
96
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DIline 2
|
|
97
|
-
line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
|
|
98
|
-
line 2
|
|
99
|
-
line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
|
|
100
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DIline 2
|
|
101
|
-
line 3) does NOT include line 3 modified by secondary (E: 28b572ece3364c669377f5431a5dcba8)
|
|
102
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] PARTIAL DISrespec. 1 out of 5 DISrespecful reckonings 💔
|
|
103
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists default branch main for new repository] ✅
|
|
104
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][creates new branch from active branch root item and rejects duplicates] ✅[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][rejects checkout when branch does not exist or branchName missing] ✅
|
|
105
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][switches active branch with checkout and projects branch snapshot onto worktree subfolder] ✅
|
|
106
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][rejects checkout when branch does not exist or branchName missing] ✅ [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][branches single file-root item and projects into file-branch worktree on
|
|
107
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][lists branches silently on secondary branch without error noise] ✅ [branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] 🟥
|
|
108
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][branches single file-root item and projects into file-branch worktree on
|
|
109
|
-
checkout] ✅
|
|
110
|
-
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers][performs vcs merge end-to-end between main and secondary branch] 🟥 4 respec files completely skipped.
|
|
16
|
+
14 respec files completely skipped.
|
|
17
|
+
💔💔 DISrespec found 💔💔
|
|
111
18
|
[branch-checkout-cmd.respec.node.mts][vcs branch, checkout, and merge Command Handlers] DISrespec 💔
|
|
@@ -19,12 +19,13 @@ import { executeBranchCmd } from './branch-cmd.mjs';
|
|
|
19
19
|
import { executeCheckoutCmd } from './checkout-cmd.mjs';
|
|
20
20
|
import { executeMergeCmd } from './merge-cmd.mjs';
|
|
21
21
|
import { executeStatusCmd } from './status-cmd.mjs';
|
|
22
|
+
import { logCheckpoint } from '../../test/test-helpers.mjs';
|
|
22
23
|
|
|
23
24
|
const lc = `[apps/vcs-gib/src/cli/commands/branch-checkout-cmd.respec.node.mts]`;
|
|
24
25
|
|
|
25
26
|
await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async () => {
|
|
26
27
|
|
|
27
|
-
await
|
|
28
|
+
await ifWe(lc, `lists default branch main for new repository`, async () => {
|
|
28
29
|
const testDir = path.join(process.cwd(), '.test_branch_checkout_1');
|
|
29
30
|
const vcsFolderName = '.vcsgib_test_bc_1';
|
|
30
31
|
try {
|
|
@@ -48,7 +49,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
|
|
|
48
49
|
}
|
|
49
50
|
});
|
|
50
51
|
|
|
51
|
-
await
|
|
52
|
+
await ifWe(lc, `creates new branch from active branch root item and rejects duplicates`, async () => {
|
|
52
53
|
const testDir = path.join(process.cwd(), '.test_branch_checkout_2');
|
|
53
54
|
const vcsFolderName = '.vcsgib_test_bc_2';
|
|
54
55
|
try {
|
|
@@ -112,7 +113,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
|
|
|
112
113
|
}
|
|
113
114
|
});
|
|
114
115
|
|
|
115
|
-
await
|
|
116
|
+
await ifWe(lc, `switches active branch with checkout and projects branch snapshot onto worktree subfolder`, async () => {
|
|
116
117
|
const testDir = path.join(process.cwd(), '.test_branch_checkout_3');
|
|
117
118
|
const vcsFolderName = '.vcsgib_test_bc_3';
|
|
118
119
|
try {
|
|
@@ -238,7 +239,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
|
|
|
238
239
|
}
|
|
239
240
|
});
|
|
240
241
|
|
|
241
|
-
await
|
|
242
|
+
await ifWe(lc, `rejects checkout when branch does not exist or branchName missing`, async () => {
|
|
242
243
|
const testDir = path.join(process.cwd(), '.test_branch_checkout_4');
|
|
243
244
|
const vcsFolderName = '.vcsgib_test_bc_4';
|
|
244
245
|
try {
|
|
@@ -280,7 +281,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
|
|
|
280
281
|
}
|
|
281
282
|
});
|
|
282
283
|
|
|
283
|
-
await
|
|
284
|
+
await ifWe(lc, `lists branches silently on secondary branch without error noise`, async () => {
|
|
284
285
|
const testDir = path.join(process.cwd(), '.test_branch_checkout_secondary');
|
|
285
286
|
const vcsFolderName = '.vcsgib_test_bc_sec';
|
|
286
287
|
try {
|
|
@@ -322,7 +323,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
|
|
|
322
323
|
}
|
|
323
324
|
});
|
|
324
325
|
|
|
325
|
-
await
|
|
326
|
+
await ifWe(lc, `branches single file-root item and projects into file-branch worktree on checkout`, async () => {
|
|
326
327
|
const testDir = path.join(process.cwd(), '.test_branch_checkout_file_root');
|
|
327
328
|
const vcsFolderName = '.vcsgib_test_bc_file';
|
|
328
329
|
try {
|
|
@@ -401,7 +402,7 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
|
|
|
401
402
|
}
|
|
402
403
|
});
|
|
403
404
|
|
|
404
|
-
await
|
|
405
|
+
await ifWe(lc, `performs vcs merge end-to-end between main and secondary branch`, async () => {
|
|
405
406
|
const testDir = path.join(process.cwd(), '.test_vcs_merge_e2e');
|
|
406
407
|
const vcsFolderName = '.vcsgib_test_merge_e2e';
|
|
407
408
|
try {
|
|
@@ -482,14 +483,14 @@ await respecfully(lc, `vcs branch, checkout, and merge Command Handlers`, async
|
|
|
482
483
|
|
|
483
484
|
// 5. Execute vcs merge feature-merge into main
|
|
484
485
|
const mergeRes = await executeMergeCmd({
|
|
485
|
-
|
|
486
|
+
incomingBranchName: 'feature-merge',
|
|
486
487
|
targetDir: testDir,
|
|
487
488
|
vcsFolderName,
|
|
488
489
|
quiet: true,
|
|
489
490
|
});
|
|
490
491
|
|
|
491
|
-
iReckon(lc, mergeRes.
|
|
492
|
-
iReckon(lc, mergeRes.
|
|
492
|
+
iReckon(lc, mergeRes.baseBranch).willEqual('main');
|
|
493
|
+
iReckon(lc, mergeRes.incomingBranch).willEqual('feature-merge');
|
|
493
494
|
|
|
494
495
|
// 6. Verify projected file on physical worktree disk contains merged lines
|
|
495
496
|
const mergedAppTs = await fs.readFile(path.join(testDir, 'app.ts'), 'utf8');
|