@ibgib/vcs-gib 0.0.49 → 0.0.52
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 +7 -7
- package/dist/bootstrap/node-bootstrap.mjs.map +1 -1
- package/dist/cli/cli-constants.mjs +1 -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.mjs +2 -2
- package/dist/cli/commands/cli-commit-cmd.mjs.map +1 -1
- package/dist/cli/commands/cli-init-cmd.mjs +8 -8
- 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 +4 -4
- 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 +2 -2
- package/dist/cli/commands/cli-status-cmd.d.mts.map +1 -1
- package/dist/cli/commands/cli-status-cmd.mjs +1 -1
- package/dist/cli/vcs-cli-main.mjs +5 -5
- package/dist/cli/vcs-cli-main.mjs.map +1 -1
- package/dist/cli/vcs-repo-helper.d.mts +1 -1
- package/dist/cli/vcs-repo-helper.d.mts.map +1 -1
- package/dist/cli/vcs-repo-helper.mjs +10 -10
- package/dist/cli/vcs-repo-helper.mjs.map +1 -1
- package/dist/test/test-helpers.d.mts +2 -2
- package/dist/test/test-helpers.d.mts.map +1 -1
- package/dist/test/test-helpers.mjs +1 -1
- package/dist/test/test-helpers.mjs.map +1 -1
- package/package.json +6 -6
- package/src/AUTO-GENERATED-version.mts +1 -1
- package/src/bootstrap/node-bootstrap.mts +7 -7
- package/src/cli/cli-constants.mts +2 -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 +2 -2
- package/src/cli/commands/cli-init-cmd.mts +8 -8
- package/src/cli/commands/cli-log-cmd.mts +2 -23
- package/src/cli/commands/cli-merge-cmd.mts +4 -4
- 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 +2 -2
- package/src/cli/commands/commit-log-cmd.respec.mts +14 -14
- 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 +5 -5
- package/src/cli/vcs-repo-helper.mts +10 -11
- package/src/engine/branch/branch-space.respec.mts +4 -4
- package/src/engine/merge/b2tfs-sync-comments.respec.mts +4 -4
- package/src/test/test-helpers.mts +2 -2
- package/src/vcs-gib.respec.mts +12 -12
- package/tsconfig.test.tsbuildinfo +1 -1
- package/tsconfig.tsbuildinfo +1 -1
- package/vcs-gib_test_output.md +18 -18
|
@@ -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) {
|
|
@@ -185,7 +185,7 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
|
|
|
185
185
|
const name = branchMatch ? branchMatch[1] : '';
|
|
186
186
|
console.error(name ? `fatal: a branch named '${name}' already exists.` : `fatal: ${cleanMsg}`);
|
|
187
187
|
}
|
|
188
|
-
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')) {
|
|
189
189
|
const branchMatch = cleanMsg.match(/\(([^)]+)\)/) || cleanMsg.match(/['"]([^'"]+)['"]/);
|
|
190
190
|
const name = branchMatch ? branchMatch[1] : '';
|
|
191
191
|
console.error(name ? `error: pathspec '${name}' did not match any file(s) known to ibgib` : `error: ${cleanMsg}`);
|
|
@@ -197,7 +197,7 @@ export async function main({ argv = process.argv.slice(2), } = {}) {
|
|
|
197
197
|
}
|
|
198
198
|
finally {
|
|
199
199
|
if (logalot) {
|
|
200
|
-
console.log(`${lc} complete. (I:
|
|
200
|
+
console.log(`${lc} complete. (I: d68908b0f736b838ef4ac3b8d266d826)`);
|
|
201
201
|
}
|
|
202
202
|
}
|
|
203
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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"}
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Helper to bootstrap Node environment and open a VcsRepository session.
|
|
5
5
|
*/
|
|
6
|
-
import { VcsRepository } from '@ibgib/core-gib/dist/
|
|
6
|
+
import { VcsRepository } from '@ibgib/core-gib/dist/cosmology/branching/branching-facade.mjs';
|
|
7
7
|
export interface OpenVcsRepositoryOpts {
|
|
8
8
|
targetDir?: string;
|
|
9
9
|
vcsFolderName?: string;
|
|
@@ -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,+DAA+D,CAAC;AAY/H,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"}
|
|
@@ -5,14 +5,14 @@
|
|
|
5
5
|
*/
|
|
6
6
|
import path from 'node:path';
|
|
7
7
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
8
|
-
import { VcsRepository } from '@ibgib/core-gib/dist/
|
|
9
|
-
import { resolveContextualBranchName } from '@ibgib/core-gib/dist/
|
|
10
|
-
import {
|
|
11
|
-
import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/
|
|
8
|
+
import { VcsRepository } from '@ibgib/core-gib/dist/cosmology/branching/branching-facade.mjs';
|
|
9
|
+
import { resolveContextualBranchName } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
|
|
10
|
+
import { getB2tFSGalaxyIbGib } from '@ibgib/core-gib/dist/cosmology/branching/repo/b2tfs-repo-helpers.mjs';
|
|
11
|
+
import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
|
|
12
|
+
import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/cosmology/branching/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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"}
|
|
@@ -16,8 +16,8 @@
|
|
|
16
16
|
import { IbGib_V1 } from '@ibgib/ts-gib/dist/V1/types.mjs';
|
|
17
17
|
import { IbGibAddr } from '@ibgib/ts-gib/dist/types.mjs';
|
|
18
18
|
import { IbGibSpaceAny } from '@ibgib/core-gib/dist/witness/space/space-base-v1.mjs';
|
|
19
|
-
import { B2tFSBranchIbGib_V1 } from '@ibgib/core-gib/dist/
|
|
20
|
-
import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/
|
|
19
|
+
import { B2tFSBranchIbGib_V1 } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-types.mjs';
|
|
20
|
+
import { B2tFSItemIbGib_V1 } from '@ibgib/core-gib/dist/cosmology/branching/item/item-types.mjs';
|
|
21
21
|
/**
|
|
22
22
|
* Logs a compact snapshot of a b2tfs branch ibgib and the latest addr for its
|
|
23
23
|
* b2tfs_item timeline as known by the given space.
|
|
@@ -1 +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,
|
|
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,kEAAkE,CAAC;AACvG,OAAO,EAAE,iBAAiB,EAA+B,MAAM,8DAA8D,CAAC;AAiC9H;;;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;AAED;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,EACnC,KAAK,EACL,YAAY,EACZ,KAAK,EACL,SAAS,GACZ,EAAE;IACC,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,GAAG,CAAC;IACX,SAAS,CAAC,EAAE,GAAG,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CA+BhB"}
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
*/
|
|
16
16
|
import { getIbGibAddr } from '@ibgib/ts-gib/dist/helper.mjs';
|
|
17
17
|
import { getLatestAddrs } from '@ibgib/core-gib/dist/witness/space/space-helper.mjs';
|
|
18
|
-
import { B2TFS_CHILD_ITEM_REL8N_NAME } from '@ibgib/core-gib/dist/
|
|
18
|
+
import { B2TFS_CHILD_ITEM_REL8N_NAME } from '@ibgib/core-gib/dist/cosmology/branching/item/item-types.mjs';
|
|
19
19
|
import { getIbGibFromSpace } from '@ibgib/core-gib/dist/common/other/ibgib-helper.mjs';
|
|
20
20
|
// ─────────────────────────────────────────────────────────────────────────────
|
|
21
21
|
// Internal helpers
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"test-helpers.mjs","sourceRoot":"","sources":["../../src/test/test-helpers.mts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAG7D,OAAO,EAAE,cAAc,EAAE,MAAM,qDAAqD,CAAC;AAIrF,OAAO,EAAqB,2BAA2B,EAAE,MAAM,
|
|
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.52",
|
|
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.41",
|
|
23
|
+
"@ibgib/ts-gib": "^0.5.38",
|
|
24
|
+
"@ibgib/encrypt-gib": "^0.3.5",
|
|
25
|
+
"@ibgib/core-gib": "^0.1.89",
|
|
26
|
+
"@ibgib/node-gib": "^0.0.36"
|
|
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 '@ibgib/core-gib/dist/
|
|
22
|
+
import { B2tFS3WayGraftStrategy } from '@ibgib/core-gib/dist/cosmology/branching/merge/b2tfs-3way-graft-strategy.mjs';
|
|
23
23
|
|
|
24
24
|
const lcFile = `[node-bootstrap]`;
|
|
25
25
|
const logalot = GLOBAL_LOG_A_LOT;
|
|
@@ -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
|
}
|
|
@@ -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
|
};
|
|
@@ -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/cosmology/branching/repo/b2tfs-repo-helpers.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
|
}
|
|
@@ -43,7 +43,7 @@ export async function executeCommitCmd({
|
|
|
43
43
|
}: CommitCmdOpts = {}): Promise<CommitCmdResult> {
|
|
44
44
|
const lc = `${lcFile}[${executeCommitCmd.name}]`;
|
|
45
45
|
try {
|
|
46
|
-
if (logalot) { console.log(`${lc} starting... (I:
|
|
46
|
+
if (logalot) { console.log(`${lc} starting... (I: 7ff973ef1a14aaa2feee7f9b69f12826)`); }
|
|
47
47
|
|
|
48
48
|
const absTargetDir = path.resolve(targetDir);
|
|
49
49
|
const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
@@ -75,6 +75,6 @@ export async function executeCommitCmd({
|
|
|
75
75
|
console.error(`${lc} ${extractErrorMsg(error)} (E: 4c453a4e7648a5f6058edf489254c826)`);
|
|
76
76
|
throw error;
|
|
77
77
|
} finally {
|
|
78
|
-
if (logalot) { console.log(`${lc} complete. (I:
|
|
78
|
+
if (logalot) { console.log(`${lc} complete. (I: c935a86ff47fd9f43e11c5688942ba26)`); }
|
|
79
79
|
}
|
|
80
80
|
}
|
|
@@ -9,9 +9,9 @@ import path from 'node:path';
|
|
|
9
9
|
import fs from 'node:fs/promises';
|
|
10
10
|
|
|
11
11
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
12
|
-
import { VcsRepository } from '@ibgib/core-gib/dist/
|
|
13
|
-
import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/
|
|
14
|
-
import {
|
|
12
|
+
import { VcsRepository } from '@ibgib/core-gib/dist/cosmology/branching/branching-facade.mjs';
|
|
13
|
+
import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-constants.mjs';
|
|
14
|
+
import { getB2tFSGalaxyIbGib } from '@ibgib/core-gib/dist/cosmology/branching/repo/b2tfs-repo-helpers.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
|
}
|
|
@@ -6,10 +6,8 @@
|
|
|
6
6
|
*/
|
|
7
7
|
|
|
8
8
|
import path from 'node:path';
|
|
9
|
-
import fs from 'node:fs/promises';
|
|
10
9
|
|
|
11
10
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
12
|
-
import { getAllBranchInfosFromIndex } from '@ibgib/core-gib/dist/vcs/branch/branch-helper.mjs';
|
|
13
11
|
|
|
14
12
|
import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
|
|
15
13
|
import { openVcsRepository } from '../vcs-repo-helper.mjs';
|
|
@@ -61,30 +59,11 @@ export async function executeLogCmd({
|
|
|
61
59
|
|
|
62
60
|
const absTargetDir = path.resolve(targetDir);
|
|
63
61
|
const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
64
|
-
const
|
|
65
|
-
|
|
66
|
-
// let resolvedBranchName = branchName;
|
|
67
|
-
// let resolvedFilePath = filePath;
|
|
68
|
-
|
|
69
|
-
// if (!resolvedBranchName && resolvedFilePath) {
|
|
70
|
-
// const branchInfos = await getAllBranchInfosFromIndex({ indexIbGib });
|
|
71
|
-
// if (branchInfos.some(b => b.branchName === resolvedFilePath)) {
|
|
72
|
-
// resolvedBranchName = resolvedFilePath;
|
|
73
|
-
// resolvedFilePath = undefined;
|
|
74
|
-
// }
|
|
75
|
-
// }
|
|
76
|
-
|
|
77
|
-
// const activeBranchSpace = await repo.getActiveBranchSpace({
|
|
78
|
-
// indexIbGib,
|
|
79
|
-
// targetDir: absTargetDir,
|
|
80
|
-
// branchName: resolvedBranchName,
|
|
81
|
-
// });
|
|
62
|
+
const galaxyIbGib = await repo.getGalaxyIbGib();
|
|
82
63
|
|
|
83
64
|
const logRes = await repo.log({
|
|
84
|
-
|
|
85
|
-
// branchName: resolvedBranchName,
|
|
65
|
+
galaxyIbGib,
|
|
86
66
|
branchName,
|
|
87
|
-
// filePath: resolvedFilePath,
|
|
88
67
|
filePath,
|
|
89
68
|
allComments,
|
|
90
69
|
targetDir: absTargetDir,
|
|
@@ -8,7 +8,7 @@
|
|
|
8
8
|
import path from 'node:path';
|
|
9
9
|
|
|
10
10
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
11
|
-
import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/
|
|
11
|
+
import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
|
|
12
12
|
import { getSpaceIdFromIb } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-innerspace/metaspace-innerspace-helper.mjs';
|
|
13
13
|
|
|
14
14
|
import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
|
|
@@ -54,15 +54,15 @@ export async function executeMergeCmd({
|
|
|
54
54
|
const { repo, vcsPath, activeWorktreeDir } =
|
|
55
55
|
await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
56
56
|
|
|
57
|
-
const
|
|
58
|
-
const baseBranchName = await repo.getActiveBranchName({
|
|
57
|
+
const galaxyIbGib = await repo.getGalaxyIbGib();
|
|
58
|
+
const baseBranchName = await repo.getActiveBranchName({ galaxyIbGib, targetDir: absTargetDir });
|
|
59
59
|
|
|
60
60
|
const incomingSpaceRes = await getOrCreateBranchSpace({
|
|
61
61
|
metaspace: repo.metaspace,
|
|
62
62
|
branchName: trimmedIncomingBranchName,
|
|
63
63
|
});
|
|
64
64
|
|
|
65
|
-
const activeBranchSpace = await repo.getActiveBranchSpace({
|
|
65
|
+
const activeBranchSpace = await repo.getActiveBranchSpace({ galaxyIbGib, targetDir: absTargetDir });
|
|
66
66
|
const activeBranchSpaceId = getSpaceIdFromIb(activeBranchSpace.ib);
|
|
67
67
|
|
|
68
68
|
const mergeRes = await repo.merge({
|
|
@@ -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
|
|
|
8
8
|
import path from 'node:path';
|
|
@@ -43,30 +43,30 @@ export async function executeResetCmd({
|
|
|
43
43
|
const lc = `${lcFile}[${executeResetCmd.name}]`;
|
|
44
44
|
try {
|
|
45
45
|
if (logalot) {
|
|
46
|
-
console.log(`${lc} starting... (I:
|
|
46
|
+
console.log(`${lc} starting... (I: 1cd248c3453365b299a5de8aaa83cd26)`);
|
|
47
47
|
}
|
|
48
48
|
|
|
49
49
|
const absTargetDir = path.resolve(targetDir);
|
|
50
50
|
const { repo, activeWorktreeDir } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
51
51
|
|
|
52
|
-
const
|
|
53
|
-
const activeBranchSpace = await repo.getActiveBranchSpace(
|
|
52
|
+
const galaxyIbGib = await repo.getGalaxyIbGib();
|
|
53
|
+
const activeBranchSpace = await repo.getActiveBranchSpace(galaxyIbGib);
|
|
54
54
|
|
|
55
55
|
const skipPrompt = yes || force || quiet || !process.stdin.isTTY;
|
|
56
56
|
if (!skipPrompt) {
|
|
57
|
-
const confirmed = await promptForConfirm({ msg: 'Unstage specified files from
|
|
57
|
+
const confirmed = await promptForConfirm({ msg: 'Unstage specified files from galaxy?' });
|
|
58
58
|
if (!confirmed) {
|
|
59
59
|
if (!quiet) {
|
|
60
60
|
console.log('Operation cancelled.');
|
|
61
61
|
}
|
|
62
|
-
const stagedCount = Object.keys(
|
|
62
|
+
const stagedCount = Object.keys(galaxyIbGib.data.stagedPaths || {}).length;
|
|
63
63
|
return { unstagedPaths: [], stagedCount };
|
|
64
64
|
}
|
|
65
65
|
}
|
|
66
66
|
|
|
67
67
|
const resetRes = await repo.reset({
|
|
68
68
|
activeBranchSpace,
|
|
69
|
-
|
|
69
|
+
galaxyIbGib,
|
|
70
70
|
paths,
|
|
71
71
|
all,
|
|
72
72
|
targetDir: absTargetDir,
|
|
@@ -84,11 +84,11 @@ export async function executeResetCmd({
|
|
|
84
84
|
stagedCount: resetRes.stagedCount,
|
|
85
85
|
};
|
|
86
86
|
} catch (error) {
|
|
87
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E:
|
|
87
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: baac0f845bb883f4555f2d482cfca826)`);
|
|
88
88
|
throw error;
|
|
89
89
|
} finally {
|
|
90
90
|
if (logalot) {
|
|
91
|
-
console.log(`${lc} complete. (I:
|
|
91
|
+
console.log(`${lc} complete. (I: 6a21182695fd4b5e08ae518119929826)`);
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
94
|
}
|
|
@@ -46,7 +46,7 @@ export async function executeRestoreCmd({
|
|
|
46
46
|
const lc = `${lcFile}[${executeRestoreCmd.name}]`;
|
|
47
47
|
try {
|
|
48
48
|
if (logalot) {
|
|
49
|
-
console.log(`${lc} starting... (I:
|
|
49
|
+
console.log(`${lc} starting... (I: f2ec77129a713122ed9ee0ff8246d826)`);
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
const absTargetDir = path.resolve(targetDir);
|
|
@@ -77,11 +77,11 @@ export async function executeRestoreCmd({
|
|
|
77
77
|
unstagedPaths: restoreRes.unstagedPaths,
|
|
78
78
|
};
|
|
79
79
|
} catch (error) {
|
|
80
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E:
|
|
80
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: 0b423fc29e538c25988e9ac8f3674726)`);
|
|
81
81
|
throw error;
|
|
82
82
|
} finally {
|
|
83
83
|
if (logalot) {
|
|
84
|
-
console.log(`${lc} complete. (I:
|
|
84
|
+
console.log(`${lc} complete. (I: ba5d22e40298355f44077da8823da826)`);
|
|
85
85
|
}
|
|
86
86
|
}
|
|
87
87
|
}
|