@ibgib/vcs-gib 0.0.47 → 0.0.51
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/README.md +1 -1
- package/VCS_CLI_USER_GUIDE.md +12 -7
- package/dist/AUTO-GENERATED-version.d.mts +1 -1
- package/dist/AUTO-GENERATED-version.mjs +1 -1
- package/dist/bootstrap/node-bootstrap.mjs +6 -6
- package/dist/bootstrap/node-bootstrap.mjs.map +1 -1
- package/dist/cli/cli-arg-parser.d.mts +2 -0
- package/dist/cli/cli-arg-parser.d.mts.map +1 -1
- package/dist/cli/cli-arg-parser.mjs +12 -1
- package/dist/cli/cli-arg-parser.mjs.map +1 -1
- package/dist/cli/cli-constants.d.mts +2 -0
- package/dist/cli/cli-constants.d.mts.map +1 -1
- package/dist/cli/cli-constants.mjs +15 -1
- package/dist/cli/cli-constants.mjs.map +1 -1
- package/dist/cli/commands/cli-add-cmd.mjs +3 -3
- package/dist/cli/commands/cli-add-cmd.mjs.map +1 -1
- package/dist/cli/commands/cli-branch-cmd.mjs +3 -3
- package/dist/cli/commands/cli-branch-cmd.mjs.map +1 -1
- package/dist/cli/commands/cli-commit-cmd.d.mts +2 -1
- package/dist/cli/commands/cli-commit-cmd.d.mts.map +1 -1
- package/dist/cli/commands/cli-commit-cmd.mjs +4 -3
- package/dist/cli/commands/cli-commit-cmd.mjs.map +1 -1
- package/dist/cli/commands/cli-init-cmd.mjs +6 -6
- package/dist/cli/commands/cli-init-cmd.mjs.map +1 -1
- package/dist/cli/commands/cli-log-cmd.d.mts.map +1 -1
- package/dist/cli/commands/cli-log-cmd.mjs +2 -18
- package/dist/cli/commands/cli-log-cmd.mjs.map +1 -1
- package/dist/cli/commands/cli-merge-cmd.mjs +3 -3
- package/dist/cli/commands/cli-merge-cmd.mjs.map +1 -1
- package/dist/cli/commands/cli-reset-cmd.d.mts +1 -1
- package/dist/cli/commands/cli-reset-cmd.mjs +9 -9
- package/dist/cli/commands/cli-reset-cmd.mjs.map +1 -1
- package/dist/cli/commands/cli-restore-cmd.mjs +3 -3
- package/dist/cli/commands/cli-restore-cmd.mjs.map +1 -1
- package/dist/cli/commands/cli-status-cmd.d.mts +1 -1
- package/dist/cli/commands/cli-status-cmd.d.mts.map +1 -1
- package/dist/cli/commands/cli-status-cmd.mjs +5 -2
- package/dist/cli/commands/cli-status-cmd.mjs.map +1 -1
- package/dist/cli/vcs-cli-main.d.mts.map +1 -1
- package/dist/cli/vcs-cli-main.mjs +6 -5
- package/dist/cli/vcs-cli-main.mjs.map +1 -1
- package/dist/cli/vcs-repo-helper.d.mts.map +1 -1
- package/dist/cli/vcs-repo-helper.mjs +7 -7
- package/dist/cli/vcs-repo-helper.mjs.map +1 -1
- package/package.json +6 -6
- package/src/AUTO-GENERATED-version.mts +1 -1
- package/src/bootstrap/node-bootstrap.mts +6 -6
- package/src/cli/cli-arg-parser.mts +14 -0
- package/src/cli/cli-constants.mts +19 -2
- package/src/cli/cli-e2e.respec.mts +7 -7
- package/src/cli/commands/cli-add-cmd.mts +3 -3
- package/src/cli/commands/cli-branch-cmd.mts +3 -3
- package/src/cli/commands/cli-commit-cmd.mts +5 -2
- package/src/cli/commands/cli-init-cmd.mts +6 -6
- package/src/cli/commands/cli-log-cmd.mts +2 -23
- package/src/cli/commands/cli-merge-cmd.mts +3 -3
- package/src/cli/commands/cli-reset-cmd.mts +9 -9
- package/src/cli/commands/cli-restore-cmd.mts +3 -3
- package/src/cli/commands/cli-status-cmd.mts +5 -2
- package/src/cli/commands/commit-log-cmd.respec.mts +11 -11
- package/src/cli/commands/delete-files.respec.mts +366 -0
- package/src/cli/commands/init-cmd.respec.mts +1 -1
- package/src/cli/commands/reset-restore-cmd.respec.mts +3 -3
- package/src/cli/commands/status-add-cmd.respec.mts +4 -4
- package/src/cli/vcs-cli-main.mts +6 -5
- package/src/cli/vcs-repo-helper.mts +7 -8
- package/src/vcs-gib.respec.mts +9 -9
- package/tsconfig.test.tsbuildinfo +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/vcs-gib_test_output.md +18 -18
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @module reset-cmd
|
|
3
3
|
*
|
|
4
4
|
* CLI command handler for `vcs reset [path...]`.
|
|
5
|
-
* Unstages specified files (or all files) from active branch
|
|
5
|
+
* Unstages specified files (or all files) from active branch galaxy in localSpace.
|
|
6
6
|
*/
|
|
7
7
|
import path from 'node:path';
|
|
8
8
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
@@ -15,26 +15,26 @@ export async function executeResetCmd({ paths = [], targetDir = process.cwd(), v
|
|
|
15
15
|
const lc = `${lcFile}[${executeResetCmd.name}]`;
|
|
16
16
|
try {
|
|
17
17
|
if (logalot) {
|
|
18
|
-
console.log(`${lc} starting... (I:
|
|
18
|
+
console.log(`${lc} starting... (I: 1cd248c3453365b299a5de8aaa83cd26)`);
|
|
19
19
|
}
|
|
20
20
|
const absTargetDir = path.resolve(targetDir);
|
|
21
21
|
const { repo, activeWorktreeDir } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
22
|
-
const
|
|
23
|
-
const activeBranchSpace = await repo.getActiveBranchSpace(
|
|
22
|
+
const galaxyIbGib = await repo.getGalaxyIbGib();
|
|
23
|
+
const activeBranchSpace = await repo.getActiveBranchSpace(galaxyIbGib);
|
|
24
24
|
const skipPrompt = yes || force || quiet || !process.stdin.isTTY;
|
|
25
25
|
if (!skipPrompt) {
|
|
26
|
-
const confirmed = await promptForConfirm({ msg: 'Unstage specified files from
|
|
26
|
+
const confirmed = await promptForConfirm({ msg: 'Unstage specified files from galaxy?' });
|
|
27
27
|
if (!confirmed) {
|
|
28
28
|
if (!quiet) {
|
|
29
29
|
console.log('Operation cancelled.');
|
|
30
30
|
}
|
|
31
|
-
const stagedCount = Object.keys(
|
|
31
|
+
const stagedCount = Object.keys(galaxyIbGib.data.stagedPaths || {}).length;
|
|
32
32
|
return { unstagedPaths: [], stagedCount };
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
35
|
const resetRes = await repo.reset({
|
|
36
36
|
activeBranchSpace,
|
|
37
|
-
|
|
37
|
+
galaxyIbGib,
|
|
38
38
|
paths,
|
|
39
39
|
all,
|
|
40
40
|
targetDir: absTargetDir,
|
|
@@ -51,12 +51,12 @@ export async function executeResetCmd({ paths = [], targetDir = process.cwd(), v
|
|
|
51
51
|
};
|
|
52
52
|
}
|
|
53
53
|
catch (error) {
|
|
54
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E:
|
|
54
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: baac0f845bb883f4555f2d482cfca826)`);
|
|
55
55
|
throw error;
|
|
56
56
|
}
|
|
57
57
|
finally {
|
|
58
58
|
if (logalot) {
|
|
59
|
-
console.log(`${lc} complete. (I:
|
|
59
|
+
console.log(`${lc} complete. (I: 6a21182695fd4b5e08ae518119929826)`);
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-reset-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-reset-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,aAAa,CAAC;AAC7B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAiBjC,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAClC,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,GAAG,GAAG,KAAK,EACX,GAAG,GAAG,KAAK,EACX,KAAK,GAAG,KAAK,EACb,KAAK,GAAG,KAAK,GAChB,GAAiB,EAAE;IAChB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,eAAe,CAAC,IAAI,GAAG,CAAC;IAChD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"cli-reset-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-reset-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gDAAgD,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,aAAa,CAAC;AAC7B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAiBjC,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,EAClC,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,GAAG,GAAG,KAAK,EACX,GAAG,GAAG,KAAK,EACX,KAAK,GAAG,KAAK,EACb,KAAK,GAAG,KAAK,GAChB,GAAiB,EAAE;IAChB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,eAAe,CAAC,IAAI,GAAG,CAAC;IAChD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,oDAAoD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;QAExG,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;QAChD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAEvE,MAAM,UAAU,GAAG,GAAG,IAAI,KAAK,IAAI,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;QACjE,IAAI,CAAC,UAAU,EAAE,CAAC;YACd,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,EAAE,GAAG,EAAE,sCAAsC,EAAE,CAAC,CAAC;YAC1F,IAAI,CAAC,SAAS,EAAE,CAAC;gBACb,IAAI,CAAC,KAAK,EAAE,CAAC;oBACT,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;gBACxC,CAAC;gBACD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;gBAC3E,OAAO,EAAE,aAAa,EAAE,EAAE,EAAE,WAAW,EAAE,CAAC;YAC9C,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC;YAC9B,iBAAiB;YACjB,WAAW;YACX,KAAK;YACL,GAAG;YACH,SAAS,EAAE,YAAY;YACvB,iBAAiB;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,KAAK,MAAM,YAAY,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;gBAChD,OAAO,CAAC,GAAG,CAAC,aAAa,YAAY,EAAE,CAAC,CAAC;YAC7C,CAAC;QACL,CAAC;QAED,OAAO;YACH,aAAa,EAAE,QAAQ,CAAC,aAAa;YACrC,WAAW,EAAE,QAAQ,CAAC,WAAW;SACpC,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvF,MAAM,KAAK,CAAC;IAChB,CAAC;YAAS,CAAC;QACP,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;AACL,CAAC"}
|
|
@@ -14,7 +14,7 @@ export async function executeRestoreCmd({ paths = [], staged = false, worktree =
|
|
|
14
14
|
const lc = `${lcFile}[${executeRestoreCmd.name}]`;
|
|
15
15
|
try {
|
|
16
16
|
if (logalot) {
|
|
17
|
-
console.log(`${lc} starting... (I:
|
|
17
|
+
console.log(`${lc} starting... (I: f2ec77129a713122ed9ee0ff8246d826)`);
|
|
18
18
|
}
|
|
19
19
|
const absTargetDir = path.resolve(targetDir);
|
|
20
20
|
const { repo, activeWorktreeDir } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
@@ -43,12 +43,12 @@ export async function executeRestoreCmd({ paths = [], staged = false, worktree =
|
|
|
43
43
|
};
|
|
44
44
|
}
|
|
45
45
|
catch (error) {
|
|
46
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E:
|
|
46
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: 0b423fc29e538c25988e9ac8f3674726)`);
|
|
47
47
|
throw error;
|
|
48
48
|
}
|
|
49
49
|
finally {
|
|
50
50
|
if (logalot) {
|
|
51
|
-
console.log(`${lc} complete. (I:
|
|
51
|
+
console.log(`${lc} complete. (I: ba5d22e40298355f44077da8823da826)`);
|
|
52
52
|
}
|
|
53
53
|
}
|
|
54
54
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-restore-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-restore-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,eAAe,CAAC;AAC/B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAmBjC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACpC,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,KAAK,EACd,QAAQ,GAAG,KAAK,EAChB,GAAG,GAAG,KAAK,EACX,GAAG,GAAG,KAAK,EACX,KAAK,GAAG,KAAK,EACb,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAmB,EAAE;IAClB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,iBAAiB,CAAC,IAAI,GAAG,CAAC;IAClD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"cli-restore-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-restore-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,eAAe,CAAC;AAC/B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAmBjC,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,EACpC,KAAK,GAAG,EAAE,EACV,MAAM,GAAG,KAAK,EACd,QAAQ,GAAG,KAAK,EAChB,GAAG,GAAG,KAAK,EACX,GAAG,GAAG,KAAK,EACX,KAAK,GAAG,KAAK,EACb,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAmB,EAAE;IAClB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,iBAAiB,CAAC,IAAI,GAAG,CAAC;IAClD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,oDAAoD,CAAC,CAAC;QAC3E,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,GAAG,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;QAExG,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC;YAClC,KAAK;YACL,MAAM;YACN,GAAG;YACH,SAAS,EAAE,YAAY;YACvB,iBAAiB;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,IAAI,MAAM,EAAE,CAAC;gBACT,KAAK,MAAM,YAAY,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;oBAClD,OAAO,CAAC,GAAG,CAAC,aAAa,YAAY,EAAE,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,KAAK,MAAM,YAAY,IAAI,UAAU,CAAC,aAAa,EAAE,CAAC;oBAClD,OAAO,CAAC,GAAG,CAAC,aAAa,YAAY,EAAE,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;QACL,CAAC;QAED,OAAO;YACH,aAAa,EAAE,UAAU,CAAC,aAAa;YACvC,aAAa,EAAE,UAAU,CAAC,aAAa;SAC1C,CAAC;IACN,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,eAAe,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACvF,MAAM,KAAK,CAAC;IAChB,CAAC;YAAS,CAAC;QACP,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QACzE,CAAC;IACL,CAAC;AACL,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @module status-cmd
|
|
3
3
|
*
|
|
4
4
|
* CLI command handler for `vcs status`.
|
|
5
|
-
* Compares physical workspace state against active branch snapshot tip and in-band
|
|
5
|
+
* Compares physical workspace state against active branch snapshot tip and in-band galaxy staging area.
|
|
6
6
|
*/
|
|
7
7
|
import { VcsStatusItem, PendingCommentInfo } from '@ibgib/core-gib/dist/vcs/status/status-types.mjs';
|
|
8
8
|
export { VcsStatusItem, PendingCommentInfo };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-status-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AAOrG,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,eAAe,EAAE,kBAAkB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAyB,EACzB,aAAyB,EACzB,KAAa,EACb,QAAgB,GACnB,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,
|
|
1
|
+
{"version":3,"file":"cli-status-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAKH,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,kDAAkD,CAAC;AAOrG,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,CAAC;AAE7C,MAAM,WAAW,eAAe;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,aAAa,EAAE,CAAC;IAC1B,OAAO,EAAE,aAAa,EAAE,CAAC;IACzB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,eAAe,EAAE,kBAAkB,EAAE,CAAC;CACzC;AAED,MAAM,WAAW,aAAa;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,gBAAgB,CAAC,EACnC,SAAyB,EACzB,aAAyB,EACzB,KAAa,EACb,QAAgB,GACnB,GAAE,aAAkB,GAAG,OAAO,CAAC,eAAe,CAAC,CA6F/C"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* @module status-cmd
|
|
3
3
|
*
|
|
4
4
|
* CLI command handler for `vcs status`.
|
|
5
|
-
* Compares physical workspace state against active branch snapshot tip and in-band
|
|
5
|
+
* Compares physical workspace state against active branch snapshot tip and in-band galaxy staging area.
|
|
6
6
|
*/
|
|
7
7
|
import path from 'node:path';
|
|
8
8
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
@@ -39,7 +39,10 @@ export async function executeStatusCmd({ targetDir = process.cwd(), vcsFolderNam
|
|
|
39
39
|
console.log(' (use "vcs reset <file>..." to unstage)');
|
|
40
40
|
for (const item of staged) {
|
|
41
41
|
const typePrefix = item.fsType === 'folder' ? 'directory: ' : '';
|
|
42
|
-
|
|
42
|
+
const label = item.stagedType === 'deleted'
|
|
43
|
+
? 'deleted: '
|
|
44
|
+
: (item.stagedType === 'modified' ? 'modified: ' : 'new file: ');
|
|
45
|
+
console.log(`\t${label}${typePrefix}${item.path}`);
|
|
43
46
|
}
|
|
44
47
|
}
|
|
45
48
|
if (modified.length > 0 || deleted.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-status-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-status-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAElF,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,MAAM,GAAG,cAAc,CAAC;AAC9B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAoBjC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACnC,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,EACb,QAAQ,GAAG,KAAK,GACnB,GAAkB,EAAE;IACjB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC;IAEjD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kEAAkE,CAAC,CAAC;QACzF,CAAC;QAED,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;QAErF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;YAChC,SAAS,EAAE,YAAY;SAC1B,CAAC,CAAC;QAEH,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,GAAG,SAAS,CAAC;QAE5E,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAgC,CAAC;QACjE,KAAK,MAAM,CAAC,IAAI,eAAe,EAAE,CAAC;YAC9B,MAAM,IAAI,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC;YACzD,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACb,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAChD,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,aAAa,SAAS,CAAC,UAAU,wCAAwC,CAAC,CAAC;YAEvF,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACjI,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;YACzD,CAAC;iBAAM,CAAC;gBACJ,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACpB,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;oBAC1C,OAAO,CAAC,GAAG,CAAC,0CAA0C,CAAC,CAAC;oBACxD,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;wBACxB,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,CAAC;wBACjE,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"cli-status-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-status-cmd.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vcs-cli-main.d.mts","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":";AACA;;;;;GAKG;AAuBH,MAAM,WAAW,WAAW;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAiC/B;AAED,wBAAgB,WAAW,IAAI,IAAI,CAElC;AAED,wBAAsB,IAAI,CAAC,EACvB,IAA4B,GAC/B,GAAE,WAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"vcs-cli-main.d.mts","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":";AACA;;;;;GAKG;AAuBH,MAAM,WAAW,WAAW;IACxB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAiC/B;AAED,wBAAgB,WAAW,IAAI,IAAI,CAElC;AAED,wBAAsB,IAAI,CAAC,EACvB,IAA4B,GAC/B,GAAE,WAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CA2IpC"}
|
|
@@ -40,7 +40,7 @@ Commands:
|
|
|
40
40
|
branch [name] List or create branches
|
|
41
41
|
checkout <branch> Switch to a specified branch and project worktree
|
|
42
42
|
merge <branch> Merge specified branch into active branch
|
|
43
|
-
reset [path...] Unstage specified files from
|
|
43
|
+
reset [path...] Unstage specified files from galaxy (-a, --all for all)
|
|
44
44
|
restore [path...] Restore working tree files or unstage (--staged)
|
|
45
45
|
|
|
46
46
|
Flags:
|
|
@@ -50,7 +50,7 @@ Flags:
|
|
|
50
50
|
-b <branch> Target branch name
|
|
51
51
|
-c, --comments Show full comment content in status
|
|
52
52
|
-a, --all Stage all tracked/untracked files (for add/reset)
|
|
53
|
-
-s, --staged Unstage specified files from
|
|
53
|
+
-s, --staged Unstage specified files from galaxy (for restore)
|
|
54
54
|
-w, --worktree Revert physical working tree files (for restore)
|
|
55
55
|
-y, --yes Automatically confirm interactive prompts
|
|
56
56
|
-f, --force Force operation execution
|
|
@@ -64,7 +64,7 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
|
|
|
64
64
|
const lc = `${lcFile}[${main.name}]`;
|
|
65
65
|
try {
|
|
66
66
|
if (logalot) {
|
|
67
|
-
console.log(`${lc} starting... (I:
|
|
67
|
+
console.log(`${lc} starting... (I: 600b85201b637bb3581aa4eff3c37826)`);
|
|
68
68
|
}
|
|
69
69
|
const parsed = parseVcsArgs(argv);
|
|
70
70
|
if (parsed.flags.help) {
|
|
@@ -105,6 +105,7 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
|
|
|
105
105
|
case VCS_SUBCOMMANDS.COMMIT: {
|
|
106
106
|
await executeCommitCmd({
|
|
107
107
|
message: parsed.flags.message,
|
|
108
|
+
keepEmptyFolders: parsed.flags.keepEmptyFolders,
|
|
108
109
|
});
|
|
109
110
|
break;
|
|
110
111
|
}
|
|
@@ -184,7 +185,7 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
|
|
|
184
185
|
const name = branchMatch ? branchMatch[1] : '';
|
|
185
186
|
console.error(name ? `fatal: a branch named '${name}' already exists.` : `fatal: ${cleanMsg}`);
|
|
186
187
|
}
|
|
187
|
-
else if (cleanMsg.toLowerCase().includes('not found in
|
|
188
|
+
else if (cleanMsg.toLowerCase().includes('not found in galaxyIbgib') || cleanMsg.toLowerCase().includes('not found on branch')) {
|
|
188
189
|
const branchMatch = cleanMsg.match(/\(([^)]+)\)/) || cleanMsg.match(/['"]([^'"]+)['"]/);
|
|
189
190
|
const name = branchMatch ? branchMatch[1] : '';
|
|
190
191
|
console.error(name ? `error: pathspec '${name}' did not match any file(s) known to ibgib` : `error: ${cleanMsg}`);
|
|
@@ -196,7 +197,7 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
|
|
|
196
197
|
}
|
|
197
198
|
finally {
|
|
198
199
|
if (logalot) {
|
|
199
|
-
console.log(`${lc} complete. (I:
|
|
200
|
+
console.log(`${lc} complete. (I: d68908b0f736b838ef4ac3b8d266d826)`);
|
|
200
201
|
}
|
|
201
202
|
}
|
|
202
203
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vcs-cli-main.mjs","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":";AACA;;;;;GAKG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAElF,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACrE,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,gCAAgC,CAAC;AACnE,OAAO,EAAE,yBAAyB,EAAE,MAAM,yCAAyC,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAE5D,MAAM,MAAM,GAAG,gBAAgB,CAAC;AAChC,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAMjC,MAAM,UAAU,QAAQ;IACpB,MAAM,QAAQ,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8BpB,CAAC;IACE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,WAAW;IACvB,OAAO,CAAC,GAAG,CAAC,mBAAmB,sBAAsB,EAAE,CAAC,CAAC;AAC7D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,EACvB,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAC/B,GAAgB,EAAE;IACf,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC;IACrC,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"vcs-cli-main.mjs","sourceRoot":"","sources":["../../src/cli/vcs-cli-main.mts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vcs-repo-helper.d.mts","sourceRoot":"","sources":["../../src/cli/vcs-repo-helper.mts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"vcs-repo-helper.d.mts","sourceRoot":"","sources":["../../src/cli/vcs-repo-helper.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAE,aAAa,EAAmC,MAAM,6CAA6C,CAAC;AAY7G,MAAM,WAAW,qBAAqB;IAClC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,uBAAuB;IACpC,IAAI,EAAE,aAAa,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAsB,iBAAiB,CAAC,EACpC,SAAyB,EACzB,aAAyB,EACzB,UAAU,GACb,GAAE,qBAA0B,GAAG,OAAO,CAAC,uBAAuB,CAAC,CA8E/D"}
|
|
@@ -7,12 +7,12 @@ import path from 'node:path';
|
|
|
7
7
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
8
8
|
import { VcsRepository } from '@ibgib/core-gib/dist/vcs/vcs-repository.mjs';
|
|
9
9
|
import { resolveContextualBranchName } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
|
|
10
|
-
import {
|
|
10
|
+
import { getB2tFSGalaxyIbGib } from '@ibgib/core-gib/dist/vcs/galaxy/galaxy-helper.mjs';
|
|
11
11
|
import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
|
|
12
|
+
import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/vcs/branch/branch-constants.mjs';
|
|
12
13
|
import { getOrCreateWorkspaceProjectionSpace } from '@ibgib/node-gib/dist/vcs/workspace-space-helper.mjs';
|
|
13
14
|
import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
|
|
14
15
|
import { bootstrapVcsMetaspace } from '../bootstrap/node-bootstrap.mjs';
|
|
15
|
-
import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/vcs/branch/branch-constants.mjs';
|
|
16
16
|
const logalot = GLOBAL_LOG_A_LOT;
|
|
17
17
|
export async function openVcsRepository({ targetDir = process.cwd(), vcsFolderName = '.vcsgib', branchName, } = {}) {
|
|
18
18
|
const lc = `[${openVcsRepository.name}]`;
|
|
@@ -30,16 +30,16 @@ export async function openVcsRepository({ targetDir = process.cwd(), vcsFolderNa
|
|
|
30
30
|
if (!foundVcsPath) {
|
|
31
31
|
throw new Error(`fatal: not an ibgib repository (or any of the parent directories): ${vcsFolderName}`);
|
|
32
32
|
}
|
|
33
|
-
// 2. Fetch authoritative in-band
|
|
34
|
-
const
|
|
35
|
-
if (!
|
|
36
|
-
throw new Error(`fatal: not an ibgib repository (
|
|
33
|
+
// 2. Fetch authoritative in-band galaxy from localSpace
|
|
34
|
+
const galaxyIbGib = await getB2tFSGalaxyIbGib({ space: localSpace, metaspace });
|
|
35
|
+
if (!galaxyIbGib) {
|
|
36
|
+
throw new Error(`fatal: not an ibgib repository (galaxy not found in ${vcsPath}) (E: 615a88627ba8daf8cbb9684bbd8d3826)`);
|
|
37
37
|
}
|
|
38
38
|
// 3. Determine active branch and worktree directory
|
|
39
39
|
const activeBranchName = branchName || resolveContextualBranchName({
|
|
40
40
|
targetDir: absTargetDir,
|
|
41
41
|
repoRoot,
|
|
42
|
-
|
|
42
|
+
galaxyIbGib,
|
|
43
43
|
});
|
|
44
44
|
const activeWorktreeDir = activeBranchName === B2TFS_BRANCH_DEFAULT_NAME
|
|
45
45
|
? repoRoot
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vcs-repo-helper.mjs","sourceRoot":"","sources":["../../src/cli/vcs-repo-helper.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"vcs-repo-helper.mjs","sourceRoot":"","sources":["../../src/cli/vcs-repo-helper.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.51",
|
|
4
4
|
"private": false,
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.mjs",
|
|
@@ -19,10 +19,10 @@
|
|
|
19
19
|
"prepare:publish": "npm version patch && node ../../build/dist/concrete-build/build-vcs-gib.mjs --prod && npm run pack"
|
|
20
20
|
},
|
|
21
21
|
"dependencies": {
|
|
22
|
-
"@ibgib/helper-gib": "^0.0.
|
|
23
|
-
"@ibgib/ts-gib": "^0.5.
|
|
24
|
-
"@ibgib/encrypt-gib": "^0.3.
|
|
25
|
-
"@ibgib/core-gib": "^0.1.
|
|
26
|
-
"@ibgib/node-gib": "^0.0.
|
|
22
|
+
"@ibgib/helper-gib": "^0.0.40",
|
|
23
|
+
"@ibgib/ts-gib": "^0.5.37",
|
|
24
|
+
"@ibgib/encrypt-gib": "^0.3.4",
|
|
25
|
+
"@ibgib/core-gib": "^0.1.88",
|
|
26
|
+
"@ibgib/node-gib": "^0.0.35"
|
|
27
27
|
}
|
|
28
28
|
}
|
|
@@ -61,7 +61,7 @@ export async function bootstrapVcsMetaspace(
|
|
|
61
61
|
): Promise<BootstrapVcsMetaspaceResult> {
|
|
62
62
|
const lc = `${lcFile}[${bootstrapVcsMetaspace.name}]`;
|
|
63
63
|
try {
|
|
64
|
-
if (logalot) { console.log(`${lc} starting... (I:
|
|
64
|
+
if (logalot) { console.log(`${lc} starting... (I: 022c3a0b1aa42f4c98f13499ef46d826)`); }
|
|
65
65
|
|
|
66
66
|
GraftStrategyService.instance.registerStrategy(new B2tFS3WayGraftStrategy());
|
|
67
67
|
|
|
@@ -111,7 +111,7 @@ export async function bootstrapVcsMetaspace(
|
|
|
111
111
|
const safeRepoDir = path.basename(repoRoot).replace(/[^a-zA-Z0-9_\-]/g, '_');
|
|
112
112
|
const defaultSpaceName = opts.defaultSpaceName || `vcs_${safeRepoDir}`;
|
|
113
113
|
|
|
114
|
-
if (logalot) { console.log(`${lc} initializing vcsMetaspace at vcsPath: ${vcsPath}, repoRoot: ${repoRoot} (I:
|
|
114
|
+
if (logalot) { console.log(`${lc} initializing vcsMetaspace at vcsPath: ${vcsPath}, repoRoot: ${repoRoot} (I: 1c9b38684cdf77226dc77ebbb9d59226)`); }
|
|
115
115
|
|
|
116
116
|
// Instantiate Metaspace_Nodespace
|
|
117
117
|
const metaspace = new Metaspace_Nodespace(undefined);
|
|
@@ -153,7 +153,7 @@ export async function bootstrapVcsMetaspace(
|
|
|
153
153
|
if (logalot) { console.log(`${lc} [Alert] ${title}: ${msg} (I: 7e6f5d4c3b2a1f0e9d8c7b6a5f4e3d2c)`); }
|
|
154
154
|
},
|
|
155
155
|
getFnPrompt: () => async ({ title, msg }) => {
|
|
156
|
-
if (logalot) { console.log(`${lc} [Prompt] ${title}: ${msg} (I:
|
|
156
|
+
if (logalot) { console.log(`${lc} [Prompt] ${title}: ${msg} (I: 1b8c483495728d1618d71c13c7ea3826)`); }
|
|
157
157
|
return defaultSpaceName;
|
|
158
158
|
},
|
|
159
159
|
getFnPromptPassword: () => async (title, msg) => {
|
|
@@ -182,7 +182,7 @@ export async function bootstrapVcsMetaspace(
|
|
|
182
182
|
|
|
183
183
|
if (logalot) {
|
|
184
184
|
const spaceName = localSpace.data?.name || localSpace.ib;
|
|
185
|
-
console.log(`${lc} Metaspace ready. LocalSpace name/ib: ${spaceName} (I:
|
|
185
|
+
console.log(`${lc} Metaspace ready. LocalSpace name/ib: ${spaceName} (I: 1f0c6168a3630b230976c368b229c826)`);
|
|
186
186
|
}
|
|
187
187
|
|
|
188
188
|
return {
|
|
@@ -193,9 +193,9 @@ export async function bootstrapVcsMetaspace(
|
|
|
193
193
|
foundVcsPath,
|
|
194
194
|
};
|
|
195
195
|
} catch (error: any) {
|
|
196
|
-
console.error(`${lc} ${error?.message || error} (E:
|
|
196
|
+
console.error(`${lc} ${error?.message || error} (E: 7cd7c8960f0aceedb8116e27e5eb5826)`);
|
|
197
197
|
throw error;
|
|
198
198
|
} finally {
|
|
199
|
-
if (logalot) { console.log(`${lc} complete. (I:
|
|
199
|
+
if (logalot) { console.log(`${lc} complete. (I: f182211ae627bfc9c5529c48a09aca26)`); }
|
|
200
200
|
}
|
|
201
201
|
}
|
|
@@ -19,6 +19,8 @@ import {
|
|
|
19
19
|
VCS_PARAM_STAGED,
|
|
20
20
|
VCS_PARAM_WORKTREE,
|
|
21
21
|
VCS_PARAM_COMMENTS,
|
|
22
|
+
VCS_PARAM_KEEP_EMPTY_FOLDERS,
|
|
23
|
+
VCS_PARAM_RM_EMPTY_FOLDERS,
|
|
22
24
|
} from './cli-constants.mjs';
|
|
23
25
|
|
|
24
26
|
export type VcsSubcommand = typeof VCS_SUBCOMMANDS[keyof typeof VCS_SUBCOMMANDS];
|
|
@@ -38,6 +40,8 @@ export interface ParsedVcsArgs {
|
|
|
38
40
|
staged?: boolean;
|
|
39
41
|
worktree?: boolean;
|
|
40
42
|
comments?: boolean;
|
|
43
|
+
keepEmptyFolders?: boolean;
|
|
44
|
+
rmEmptyFolders?: boolean;
|
|
41
45
|
};
|
|
42
46
|
rawArgs: string[];
|
|
43
47
|
}
|
|
@@ -109,6 +113,12 @@ export function parseVcsArgs(argv: string[]): ParsedVcsArgs {
|
|
|
109
113
|
} else if (matchesParam(arg, VCS_PARAM_COMMENTS)) {
|
|
110
114
|
flags.comments = true;
|
|
111
115
|
i++;
|
|
116
|
+
} else if (matchesParam(arg, VCS_PARAM_KEEP_EMPTY_FOLDERS)) {
|
|
117
|
+
flags.keepEmptyFolders = true;
|
|
118
|
+
i++;
|
|
119
|
+
} else if (matchesParam(arg, VCS_PARAM_RM_EMPTY_FOLDERS)) {
|
|
120
|
+
flags.rmEmptyFolders = true;
|
|
121
|
+
i++;
|
|
112
122
|
} else if (!arg.startsWith('-')) {
|
|
113
123
|
if (command === VCS_SUBCOMMANDS.HELP) {
|
|
114
124
|
const normalized = arg.toLowerCase();
|
|
@@ -126,6 +136,10 @@ export function parseVcsArgs(argv: string[]): ParsedVcsArgs {
|
|
|
126
136
|
}
|
|
127
137
|
}
|
|
128
138
|
|
|
139
|
+
if (flags.keepEmptyFolders && flags.rmEmptyFolders) {
|
|
140
|
+
throw new Error(`Cannot specify both --keep-empty-folders and --rm-empty-folders (E: 8f31920c7a524a87b21e89df90ab3126)`);
|
|
141
|
+
}
|
|
142
|
+
|
|
129
143
|
if (flags.help && command !== VCS_SUBCOMMANDS.VERSION) {
|
|
130
144
|
command = VCS_SUBCOMMANDS.HELP;
|
|
131
145
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/**
|
|
2
2
|
* @module cli-constants
|
|
3
|
-
*
|
|
3
|
+
*
|
|
4
4
|
* Constants and RCLIParamInfo parameter definitions for vcs CLI commands.
|
|
5
5
|
*/
|
|
6
6
|
|
|
@@ -103,7 +103,7 @@ export const VCS_PARAM_YES: RCLIParamInfo = {
|
|
|
103
103
|
export const VCS_PARAM_STAGED: RCLIParamInfo = {
|
|
104
104
|
name: 'staged',
|
|
105
105
|
synonyms: ['s'],
|
|
106
|
-
description: 'Unstage specified files from
|
|
106
|
+
description: 'Unstage specified files from galaxy',
|
|
107
107
|
isFlag: true,
|
|
108
108
|
argTypeName: 'boolean',
|
|
109
109
|
};
|
|
@@ -115,3 +115,20 @@ export const VCS_PARAM_WORKTREE: RCLIParamInfo = {
|
|
|
115
115
|
isFlag: true,
|
|
116
116
|
argTypeName: 'boolean',
|
|
117
117
|
};
|
|
118
|
+
|
|
119
|
+
export const VCS_PARAM_KEEP_EMPTY_FOLDERS: RCLIParamInfo = {
|
|
120
|
+
name: 'keep-empty-folders',
|
|
121
|
+
synonyms: ['keep-empty-dirs'],
|
|
122
|
+
description: 'Retain empty folder nodes in Merkle tree upon child deletion',
|
|
123
|
+
isFlag: true,
|
|
124
|
+
argTypeName: 'boolean',
|
|
125
|
+
};
|
|
126
|
+
|
|
127
|
+
export const VCS_PARAM_RM_EMPTY_FOLDERS: RCLIParamInfo = {
|
|
128
|
+
name: 'rm-empty-folders',
|
|
129
|
+
synonyms: ['rm-empty-dirs'],
|
|
130
|
+
description: 'Prune empty folder nodes from Merkle tree upon child deletion (default)',
|
|
131
|
+
isFlag: true,
|
|
132
|
+
argTypeName: 'boolean',
|
|
133
|
+
};
|
|
134
|
+
|
|
@@ -23,7 +23,7 @@ import { executeBranchCmd } from './commands/cli-branch-cmd.mjs';
|
|
|
23
23
|
import { executeCheckoutCmd } from './commands/cli-checkout-cmd.mjs';
|
|
24
24
|
import { executeMergeCmd } from './commands/cli-merge-cmd.mjs';
|
|
25
25
|
import { bootstrapVcsMetaspace } from '../bootstrap/node-bootstrap.mjs';
|
|
26
|
-
import {
|
|
26
|
+
import { getB2tFSGalaxyIbGib } from '@ibgib/core-gib/dist/vcs/galaxy/galaxy-helper.mjs';
|
|
27
27
|
|
|
28
28
|
const lc = `[apps/vcs-gib/src/cli/cli-e2e.respec.mts]`;
|
|
29
29
|
|
|
@@ -113,9 +113,9 @@ await respecfully(lc, `Full E2E CLI Integration Spec`, async () => {
|
|
|
113
113
|
repoPath: testDir,
|
|
114
114
|
vcsFolderName,
|
|
115
115
|
});
|
|
116
|
-
const
|
|
117
|
-
iReckon(lc, Boolean(
|
|
118
|
-
iReckon(lc,
|
|
116
|
+
const e2eGalaxyAdd = await getB2tFSGalaxyIbGib({ space: e2eSpaceAdd, metaspace: e2eMetaspaceAdd });
|
|
117
|
+
iReckon(lc, Boolean(e2eGalaxyAdd?.data?.staged_item && e2eGalaxyAdd.data.staged_item.length >= 2)).isGonnaBeTrue();
|
|
118
|
+
iReckon(lc, e2eGalaxyAdd?.rel8ns?.staged_item).isGonnaBeFalsy();
|
|
119
119
|
|
|
120
120
|
const status2 = await executeStatusCmd({
|
|
121
121
|
targetDir: testDir,
|
|
@@ -136,9 +136,9 @@ await respecfully(lc, `Full E2E CLI Integration Spec`, async () => {
|
|
|
136
136
|
repoPath: testDir,
|
|
137
137
|
vcsFolderName,
|
|
138
138
|
});
|
|
139
|
-
const
|
|
140
|
-
iReckon(lc,
|
|
141
|
-
iReckon(lc,
|
|
139
|
+
const e2eGalaxyCommit = await getB2tFSGalaxyIbGib({ space: e2eSpaceCommit, metaspace: e2eMetaspaceCommit });
|
|
140
|
+
iReckon(lc, e2eGalaxyCommit?.data?.staged_item).willEqual([]);
|
|
141
|
+
iReckon(lc, e2eGalaxyCommit?.rel8ns?.staged_item).isGonnaBeFalsy();
|
|
142
142
|
|
|
143
143
|
iReckon(lc, Boolean(commitRes.commitAddr)).isGonnaBeTrue();
|
|
144
144
|
iReckon(lc, Boolean(commitRes.commentAddr)).isGonnaBeTrue();
|
|
@@ -36,7 +36,7 @@ export async function executeAddCmd({
|
|
|
36
36
|
}: AddCmdOpts = {}): Promise<AddCmdResult> {
|
|
37
37
|
const lc = `${lcFile}[${executeAddCmd.name}]`;
|
|
38
38
|
try {
|
|
39
|
-
if (logalot) { console.log(`${lc} starting... (I:
|
|
39
|
+
if (logalot) { console.log(`${lc} starting... (I: 1720d235dcd8c4873843fafc922f3126)`); }
|
|
40
40
|
|
|
41
41
|
const absTargetDir = path.resolve(targetDir);
|
|
42
42
|
const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
@@ -57,9 +57,9 @@ export async function executeAddCmd({
|
|
|
57
57
|
stagedCount: addRes.stagedCount,
|
|
58
58
|
};
|
|
59
59
|
} catch (error) {
|
|
60
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E:
|
|
60
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: 25551515dd5889fac898b8f87e834826)`);
|
|
61
61
|
throw error;
|
|
62
62
|
} finally {
|
|
63
|
-
if (logalot) { console.log(`${lc} complete. (I:
|
|
63
|
+
if (logalot) { console.log(`${lc} complete. (I: 79bc2688bc087dad878f4528eba18826)`); }
|
|
64
64
|
}
|
|
65
65
|
}
|
|
@@ -44,7 +44,7 @@ export async function executeBranchCmd({
|
|
|
44
44
|
}: BranchCmdOpts = {}): Promise<BranchCmdResult> {
|
|
45
45
|
const lc = `${lcFile}[${executeBranchCmd.name}]`;
|
|
46
46
|
try {
|
|
47
|
-
if (logalot) { console.log(`${lc} starting... (I:
|
|
47
|
+
if (logalot) { console.log(`${lc} starting... (I: bc1cd7cf5a79327a6807d81812f2d326)`); }
|
|
48
48
|
|
|
49
49
|
const absTargetDir = path.resolve(targetDir);
|
|
50
50
|
const { repo, } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
@@ -79,9 +79,9 @@ export async function executeBranchCmd({
|
|
|
79
79
|
createdBranchAddr: branchRes.createdBranchAddr,
|
|
80
80
|
};
|
|
81
81
|
} catch (error) {
|
|
82
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E:
|
|
82
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: f2ff7c0bb2a81b21aefbbb7726b2bb26)`);
|
|
83
83
|
throw error;
|
|
84
84
|
} finally {
|
|
85
|
-
if (logalot) { console.log(`${lc} complete. (I:
|
|
85
|
+
if (logalot) { console.log(`${lc} complete. (I: 3f86a81c5ea8c945f364be484c533826)`); }
|
|
86
86
|
}
|
|
87
87
|
}
|
|
@@ -21,6 +21,7 @@ export interface CommitCmdOpts {
|
|
|
21
21
|
vcsFolderName?: string;
|
|
22
22
|
author?: string;
|
|
23
23
|
quiet?: boolean;
|
|
24
|
+
keepEmptyFolders?: boolean;
|
|
24
25
|
}
|
|
25
26
|
|
|
26
27
|
export interface CommitCmdResult {
|
|
@@ -38,10 +39,11 @@ export async function executeCommitCmd({
|
|
|
38
39
|
vcsFolderName = '.vcsgib',
|
|
39
40
|
author = 'vcs-user',
|
|
40
41
|
quiet = false,
|
|
42
|
+
keepEmptyFolders = false,
|
|
41
43
|
}: CommitCmdOpts = {}): Promise<CommitCmdResult> {
|
|
42
44
|
const lc = `${lcFile}[${executeCommitCmd.name}]`;
|
|
43
45
|
try {
|
|
44
|
-
if (logalot) { console.log(`${lc} starting... (I:
|
|
46
|
+
if (logalot) { console.log(`${lc} starting... (I: 7ff973ef1a14aaa2feee7f9b69f12826)`); }
|
|
45
47
|
|
|
46
48
|
const absTargetDir = path.resolve(targetDir);
|
|
47
49
|
const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
@@ -50,6 +52,7 @@ export async function executeCommitCmd({
|
|
|
50
52
|
message,
|
|
51
53
|
author,
|
|
52
54
|
targetDir: absTargetDir,
|
|
55
|
+
keepEmptyFolders,
|
|
53
56
|
});
|
|
54
57
|
|
|
55
58
|
if (!quiet) {
|
|
@@ -72,6 +75,6 @@ export async function executeCommitCmd({
|
|
|
72
75
|
console.error(`${lc} ${extractErrorMsg(error)} (E: 4c453a4e7648a5f6058edf489254c826)`);
|
|
73
76
|
throw error;
|
|
74
77
|
} finally {
|
|
75
|
-
if (logalot) { console.log(`${lc} complete. (I:
|
|
78
|
+
if (logalot) { console.log(`${lc} complete. (I: c935a86ff47fd9f43e11c5688942ba26)`); }
|
|
76
79
|
}
|
|
77
80
|
}
|
|
@@ -11,7 +11,7 @@ import fs from 'node:fs/promises';
|
|
|
11
11
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
12
12
|
import { VcsRepository } from '@ibgib/core-gib/dist/vcs/vcs-repository.mjs';
|
|
13
13
|
import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/vcs/branch/branch-constants.mjs';
|
|
14
|
-
import {
|
|
14
|
+
import { getB2tFSGalaxyIbGib } from '@ibgib/core-gib/dist/vcs/galaxy/galaxy-helper.mjs';
|
|
15
15
|
|
|
16
16
|
import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
|
|
17
17
|
import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
|
|
@@ -53,15 +53,15 @@ export async function executeInitCmd({
|
|
|
53
53
|
});
|
|
54
54
|
|
|
55
55
|
if (foundVcsPath) {
|
|
56
|
-
const
|
|
57
|
-
if (
|
|
56
|
+
const existingGalaxyIbGib = await getB2tFSGalaxyIbGib({ space: localSpace, metaspace });
|
|
57
|
+
if (existingGalaxyIbGib) {
|
|
58
58
|
if (!quiet) {
|
|
59
|
-
console.log(`Reinitialized existing ibgib repository in ${vcsPath}`);
|
|
59
|
+
console.log(`Reinitialized existing ibgib repository in ${vcsPath} (I: 7c6058dcc958eb2ff8d984b317346826)`);
|
|
60
60
|
}
|
|
61
61
|
return {
|
|
62
62
|
vcsPath,
|
|
63
|
-
spaceId:
|
|
64
|
-
branchName:
|
|
63
|
+
spaceId: existingGalaxyIbGib.data.activeSpaceId,
|
|
64
|
+
branchName: existingGalaxyIbGib.data.activeBranchName || defaultBranchName,
|
|
65
65
|
rootItemIb: '',
|
|
66
66
|
};
|
|
67
67
|
}
|