@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
package/README.md
CHANGED
|
@@ -19,7 +19,7 @@
|
|
|
19
19
|
3. **Command Dispatch & Terminal Reporting**:
|
|
20
20
|
- CLI command handlers (`cli-status-cmd`, `cli-commit-cmd`, `cli-log-cmd`, etc.) map terminal arguments to `repo.<cmd>()` calls and render human- and agent-friendly colored console outputs.
|
|
21
21
|
|
|
22
|
-
For the core isomorphic Merkle graph specifications, in-band
|
|
22
|
+
For the core isomorphic Merkle graph specifications, in-band galaxy structure, multi-space branching model, and comment system mechanics, see:
|
|
23
23
|
👉 **[`@ibgib/core-gib` VCS Core Engine README](../../libs/core-gib/src/vcs/README.md)**
|
|
24
24
|
|
|
25
25
|
---
|
package/VCS_CLI_USER_GUIDE.md
CHANGED
|
@@ -46,13 +46,13 @@ After executing `npm run build:for:test`, downstream integration test suites run
|
|
|
46
46
|
| **`init`** | `ibgib init [dir]` | Initializes a new `ibgib` repository in target directory. Scopes `.vcsgib/ibgib/b2s_main/` space, root folder node, `main` branch, and in-band index. | `ibgib init .`<br>`ibgib init my-repo` |
|
|
47
47
|
| **`status`** | `ibgib status [-c]` | Displays working tree status: untracked files, modified files, deleted files, staged items, and active companion comment files (`.ib.*.md`) on active branch space. Use `-c` or `--comments` to display full comment contents. | `ibgib status`<br>`ibgib status -c` |
|
|
48
48
|
| **`generate-comment`** | `ibgib generate-comment <path>`<br>*(aliases: `gmsg`, `gcomm`, `gen-msg`, `gen-comment`)* | Creates a companion note file `.ib.<basename>.md` in `<path>`'s directory pre-populated with conventional-commit markdown template. | `ibgib generate-comment src/auth.ts`<br>`ibgib gmsg src/app.ts` |
|
|
49
|
-
| **`add`** | `ibgib add <path...>`<br>`ibgib add -a` | Stages file/folder candidate nodes and binary payloads into active branch space
|
|
49
|
+
| **`add`** | `ibgib add <path...>`<br>`ibgib add -a` | Stages file/folder candidate nodes and binary payloads into active branch space galaxy (`B2tFSGalaxyIbGib_V1`). Use `-a` or `--all` to stage everything. | `ibgib add src/index.ts`<br>`ibgib add -a` |
|
|
50
50
|
| **`commit`** | `ibgib commit [-m "msg"]` | Records snapshot in active branch space. Ingests companion files (`.ib.*.md`) onto individual file items and/or attaches `-m` comment to root item. Cleans up companion files and advances branch tip. | `ibgib commit -m "Initial commit"`<br>`ibgib commit` *(using companion notes)* |
|
|
51
51
|
| **`log`** | `ibgib log`<br>`ibgib log [branch]`<br>`ibgib log -b <branch>`<br>`ibgib log <filePath> [-a]` | **Default (no args)**: Displays commit history in reverse chronological order for the current branch (contextually inferred from cwd/worktree).<br>**Branch name / `-b`**: Displays commit history for the specified branch.<br>**File path**: Displays commit history and companion comments for a specific file (use `-a` / `--all` for all comments). | `ibgib log`<br>`ibgib log -b feature-ui`<br>`ibgib log feature-ui`<br>`ibgib log src/auth.ts` |
|
|
52
52
|
| **`branch`** | `ibgib branch [name] [itemPath]` | Omitted `name`: lists registered branches and marks the active branch.<br>Provided `name`: creates dedicated branch space `b2s_<name>` via SSM sync.<br>Optional `itemPath`: branches a single file directly (`ibgib branch math-opt src/math.js`) instead of root folder. | `ibgib branch`<br>`ibgib branch feature-ui`<br>`ibgib branch math-opt src/math.js` |
|
|
53
|
-
| **`checkout`** | `ibgib checkout <branch> [-f]` | Switches active branch in
|
|
53
|
+
| **`checkout`** | `ibgib checkout <branch> [-f]` | Switches active branch in galaxy and materializes branch snapshot onto target worktree directory (`my-repo/` if main, `b/<branch>/` if secondary). Use `-f` or `--force` to overwrite uncommitted files. | `ibgib checkout main`<br>`ibgib checkout feature-ui` |
|
|
54
54
|
| **`merge`** | `ibgib merge <incomingBranch>` | Performs 3-way merge of `incomingBranch` into active branch using `SyncSagaCoordinator`. Reconciles file conflicts, unions file comments across branches, and updates branch root pointer. | `ibgib merge feature-ui` |
|
|
55
|
-
| **`reset`** | `ibgib reset [path...]`<br>`ibgib reset -a` | Unstages specified paths or all staged items (`-a`, `--all`) from the
|
|
55
|
+
| **`reset`** | `ibgib reset [path...]`<br>`ibgib reset -a` | Unstages specified paths or all staged items (`-a`, `--all`) from the galaxy. | `ibgib reset src/index.ts`<br>`ibgib reset -a` |
|
|
56
56
|
| **`restore`** | `ibgib restore [path...]`<br>`ibgib restore --staged [path...]`<br>`ibgib restore --worktree [path...]` | Discards changes by unstaging files (`--staged`) and/or reverting physical working tree files (`--worktree`) back to the latest branch snapshot. | `ibgib restore src/index.ts`<br>`ibgib restore --staged src/app.ts`<br>`ibgib restore --worktree src/app.ts` |
|
|
57
57
|
|
|
58
58
|
---
|
|
@@ -104,18 +104,23 @@ my-repo/
|
|
|
104
104
|
│ │ ├── 000_zerospace/ <-- Metaspace registry
|
|
105
105
|
│ │ ├── b2s_main/ <-- Space for 'main' branch
|
|
106
106
|
│ │ └── b2s_feature-ui/ <-- Space for 'feature-ui' branch
|
|
107
|
-
│ └── vcs_index_projection.json <-- Read-only index projection cache
|
|
108
107
|
├── b/ <-- Reserved branch worktrees directory
|
|
109
108
|
│ ├── feature-ui/ <-- Projected worktree for branch 'feature-ui'
|
|
110
|
-
|
|
111
|
-
│
|
|
112
|
-
│ └──
|
|
109
|
+
| | └── src
|
|
110
|
+
│ │ ├── main.ts <-- main branch physically copied (not sim-linked)
|
|
111
|
+
│ │ └── ui.ts
|
|
112
|
+
│ ├── feature-auth/ <-- Projected worktree for branch 'feature-auth'
|
|
113
|
+
| | └── src
|
|
114
|
+
│ │ ├── main.ts <-- main branch physically copied (not sim-linked)
|
|
115
|
+
│ │ └── auth.ts
|
|
113
116
|
├── src/ <-- Source code files (tracked on 'main' branch)
|
|
114
117
|
│ ├── .ib.main.ts.md <-- Ephemeral companion note (ingested on commit)
|
|
115
118
|
│ └── main.ts
|
|
116
119
|
└── .ibgibignore <-- Optional user ignore filter file
|
|
117
120
|
```
|
|
118
121
|
|
|
122
|
+
_todo: include example for new multispace approach when polycosmos is implemented_
|
|
123
|
+
|
|
119
124
|
---
|
|
120
125
|
|
|
121
126
|
## 🤖 Complete Walkthrough for AI Agents & Humans
|
|
@@ -15,7 +15,7 @@ import { NodeFilesystemSpace_V1 } from '@ibgib/node-gib/dist/witness/space/node-
|
|
|
15
15
|
import { DEFAULT_NODE_FILESYSTEM_SPACE_DATA_V1 } from '@ibgib/node-gib/dist/witness/space/node-filesystem-space/node-filesystem-space-types.mjs';
|
|
16
16
|
import { fnCreateNewLocalSpace, fnDtoToSpace_nodeFilesystem } from '@ibgib/node-gib/dist/witness/space/metaspace/metaspace-nodespace/metaspace-nodespace-helper.mjs';
|
|
17
17
|
import { GLOBAL_LOG_A_LOT } from '../vcs-gib-constants.mjs';
|
|
18
|
-
import { B2tFS3WayGraftStrategy } from '@ibgib/core-gib/dist/
|
|
18
|
+
import { B2tFS3WayGraftStrategy } from '@ibgib/core-gib/dist/cosmology/branching/merge/b2tfs-3way-graft-strategy.mjs';
|
|
19
19
|
const lcFile = `[node-bootstrap]`;
|
|
20
20
|
const logalot = GLOBAL_LOG_A_LOT;
|
|
21
21
|
/**
|
|
@@ -27,7 +27,7 @@ export async function bootstrapVcsMetaspace(opts = {}) {
|
|
|
27
27
|
const lc = `${lcFile}[${bootstrapVcsMetaspace.name}]`;
|
|
28
28
|
try {
|
|
29
29
|
if (logalot) {
|
|
30
|
-
console.log(`${lc} starting... (I:
|
|
30
|
+
console.log(`${lc} starting... (I: 022c3a0b1aa42f4c98f13499ef46d826)`);
|
|
31
31
|
}
|
|
32
32
|
GraftStrategyService.instance.registerStrategy(new B2tFS3WayGraftStrategy());
|
|
33
33
|
const { repoPath = process.cwd(), vcsFolderName = '.vcsgib', } = opts;
|
|
@@ -67,7 +67,7 @@ export async function bootstrapVcsMetaspace(opts = {}) {
|
|
|
67
67
|
const safeRepoDir = path.basename(repoRoot).replace(/[^a-zA-Z0-9_\-]/g, '_');
|
|
68
68
|
const defaultSpaceName = opts.defaultSpaceName || `vcs_${safeRepoDir}`;
|
|
69
69
|
if (logalot) {
|
|
70
|
-
console.log(`${lc} initializing vcsMetaspace at vcsPath: ${vcsPath}, repoRoot: ${repoRoot} (I:
|
|
70
|
+
console.log(`${lc} initializing vcsMetaspace at vcsPath: ${vcsPath}, repoRoot: ${repoRoot} (I: 1c9b38684cdf77226dc77ebbb9d59226)`);
|
|
71
71
|
}
|
|
72
72
|
// Instantiate Metaspace_Nodespace
|
|
73
73
|
const metaspace = new Metaspace_Nodespace(undefined);
|
|
@@ -115,7 +115,7 @@ export async function bootstrapVcsMetaspace(opts = {}) {
|
|
|
115
115
|
},
|
|
116
116
|
getFnPrompt: () => async ({ title, msg }) => {
|
|
117
117
|
if (logalot) {
|
|
118
|
-
console.log(`${lc} [Prompt] ${title}: ${msg} (I:
|
|
118
|
+
console.log(`${lc} [Prompt] ${title}: ${msg} (I: 1b8c483495728d1618d71c13c7ea3826)`);
|
|
119
119
|
}
|
|
120
120
|
return defaultSpaceName;
|
|
121
121
|
},
|
|
@@ -141,7 +141,7 @@ export async function bootstrapVcsMetaspace(opts = {}) {
|
|
|
141
141
|
await localSpace.initialized;
|
|
142
142
|
if (logalot) {
|
|
143
143
|
const spaceName = localSpace.data?.name || localSpace.ib;
|
|
144
|
-
console.log(`${lc} Metaspace ready. LocalSpace name/ib: ${spaceName} (I:
|
|
144
|
+
console.log(`${lc} Metaspace ready. LocalSpace name/ib: ${spaceName} (I: 1f0c6168a3630b230976c368b229c826)`);
|
|
145
145
|
}
|
|
146
146
|
return {
|
|
147
147
|
metaspace,
|
|
@@ -152,12 +152,12 @@ export async function bootstrapVcsMetaspace(opts = {}) {
|
|
|
152
152
|
};
|
|
153
153
|
}
|
|
154
154
|
catch (error) {
|
|
155
|
-
console.error(`${lc} ${error?.message || error} (E:
|
|
155
|
+
console.error(`${lc} ${error?.message || error} (E: 7cd7c8960f0aceedb8116e27e5eb5826)`);
|
|
156
156
|
throw error;
|
|
157
157
|
}
|
|
158
158
|
finally {
|
|
159
159
|
if (logalot) {
|
|
160
|
-
console.log(`${lc} complete. (I:
|
|
160
|
+
console.log(`${lc} complete. (I: f182211ae627bfc9c5529c48a09aca26)`);
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
163
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-bootstrap.mjs","sourceRoot":"","sources":["../../src/bootstrap/node-bootstrap.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAElC,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,iDAAiD,CAAC;AAC/E,OAAO,EAAE,MAAM,EAAE,MAAM,uDAAuD,CAAC;AAE/E,OAAO,EAAE,oBAAoB,EAAE,MAAM,qDAAqD,CAAC;AAC3F,OAAO,EAAE,oBAAoB,EAAE,MAAM,iEAAiE,CAAC;AACvG,OAAO,EAAE,mBAAmB,EAAE,MAAM,0FAA0F,CAAC;AAC/H,OAAO,EAAE,sBAAsB,EAAE,MAAM,uFAAuF,CAAC;AAC/H,OAAO,EAAE,qCAAqC,EAAE,MAAM,0FAA0F,CAAC;AACjJ,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,iGAAiG,CAAC;AAErK,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,sBAAsB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"node-bootstrap.mjs","sourceRoot":"","sources":["../../src/bootstrap/node-bootstrap.mts"],"names":[],"mappings":"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"}
|
|
@@ -89,7 +89,7 @@ export const VCS_PARAM_YES = {
|
|
|
89
89
|
export const VCS_PARAM_STAGED = {
|
|
90
90
|
name: 'staged',
|
|
91
91
|
synonyms: ['s'],
|
|
92
|
-
description: 'Unstage specified files from
|
|
92
|
+
description: 'Unstage specified files from galaxy',
|
|
93
93
|
isFlag: true,
|
|
94
94
|
argTypeName: 'boolean',
|
|
95
95
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-constants.mjs","sourceRoot":"","sources":["../../src/cli/cli-constants.mts"],"names":[],"mappings":"AAAA;;;;GAIG;AAIH,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,CAAC;AAElC,MAAM,CAAC,MAAM,eAAe,GAAG;IAC3B,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;IACV,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;IACV,MAAM,EAAE,QAAQ;IAChB,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,KAAK,EAAE,OAAO;IACd,OAAO,EAAE,SAAS;IAClB,gBAAgB,EAAE,kBAAkB;IACpC,WAAW,EAAE,aAAa;IAC1B,OAAO,EAAE,SAAS;IAClB,KAAK,EAAE,OAAO;IACd,IAAI,EAAE,MAAM;IACZ,IAAI,EAAE,MAAM;IACZ,OAAO,EAAE,SAAS;CACZ,CAAC;AAEX,MAAM,CAAC,MAAM,kBAAkB,GAAkB;IAC7C,IAAI,EAAE,UAAU;IAChB,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,2CAA2C;IACxD,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,SAAS;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAkB;IAC5C,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,4BAA4B;IACzC,MAAM,EAAE,KAAK;IACb,WAAW,EAAE,QAAQ;CACxB,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAkB;IAC3C,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,oBAAoB;IACjC,MAAM,EAAE,KAAK;IACb,WAAW,EAAE,QAAQ;CACxB,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAkB;IACxC,IAAI,EAAE,KAAK;IACX,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,uCAAuC;IACpD,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,SAAS;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAkB;IAC1C,IAAI,EAAE,OAAO;IACb,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,2BAA2B;IACxC,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,SAAS;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAkB;IAC5C,IAAI,EAAE,SAAS;IACf,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,yCAAyC;IACtD,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,SAAS;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAkB;IACzC,IAAI,EAAE,MAAM;IACZ,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,8BAA8B;IAC3C,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,SAAS;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAkB;IAClD,IAAI,EAAE,eAAe;IACrB,QAAQ,EAAE,CAAC,cAAc,CAAC;IAC1B,WAAW,EAAE,2DAA2D;IACxE,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,SAAS;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAkB;IACxC,IAAI,EAAE,KAAK;IACX,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,8BAA8B;IAC3C,MAAM,EAAE,IAAI;IACZ,WAAW,EAAE,SAAS;CACzB,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAkB;IAC3C,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,CAAC,GAAG,CAAC;IACf,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"cli-constants.mjs","sourceRoot":"","sources":["../../src/cli/cli-constants.mts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export async function executeAddCmd({ paths = [], targetDir = process.cwd(), vcs
|
|
|
14
14
|
const lc = `${lcFile}[${executeAddCmd.name}]`;
|
|
15
15
|
try {
|
|
16
16
|
if (logalot) {
|
|
17
|
-
console.log(`${lc} starting... (I:
|
|
17
|
+
console.log(`${lc} starting... (I: 1720d235dcd8c4873843fafc922f3126)`);
|
|
18
18
|
}
|
|
19
19
|
const absTargetDir = path.resolve(targetDir);
|
|
20
20
|
const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
@@ -33,12 +33,12 @@ export async function executeAddCmd({ paths = [], targetDir = process.cwd(), vcs
|
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
35
|
catch (error) {
|
|
36
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E:
|
|
36
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: 25551515dd5889fac898b8f87e834826)`);
|
|
37
37
|
throw error;
|
|
38
38
|
}
|
|
39
39
|
finally {
|
|
40
40
|
if (logalot) {
|
|
41
|
-
console.log(`${lc} complete. (I:
|
|
41
|
+
console.log(`${lc} complete. (I: 79bc2688bc087dad878f4528eba18826)`);
|
|
42
42
|
}
|
|
43
43
|
}
|
|
44
44
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-add-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-add-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,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,WAAW,CAAC;AAC3B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAejC,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAChC,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,GAAG,GAAG,KAAK,EACX,KAAK,GAAG,KAAK,GAChB,GAAe,EAAE;IACd,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC;IAC9C,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"cli-add-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-add-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,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,WAAW,CAAC;AAC3B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAejC,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,EAChC,KAAK,GAAG,EAAE,EACV,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,GAAG,GAAG,KAAK,EACX,KAAK,GAAG,KAAK,GAChB,GAAe,EAAE;IACd,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,aAAa,CAAC,IAAI,GAAG,CAAC;IAC9C,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,oDAAoD,CAAC,CAAC;QAAC,CAAC;QAExF,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,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE;YACjC,GAAG;YACH,SAAS,EAAE,YAAY;SAC1B,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;gBAC1C,OAAO,CAAC,GAAG,CAAC,WAAW,UAAU,EAAE,CAAC,CAAC;YACzC,CAAC;QACL,CAAC;QAED,OAAO;YACH,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,WAAW,EAAE,MAAM,CAAC,WAAW;SAClC,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;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QAAC,CAAC;IAC1F,CAAC;AACL,CAAC"}
|
|
@@ -14,7 +14,7 @@ export async function executeBranchCmd({ branchName, itemPath, targetDir = proce
|
|
|
14
14
|
const lc = `${lcFile}[${executeBranchCmd.name}]`;
|
|
15
15
|
try {
|
|
16
16
|
if (logalot) {
|
|
17
|
-
console.log(`${lc} starting... (I:
|
|
17
|
+
console.log(`${lc} starting... (I: bc1cd7cf5a79327a6807d81812f2d326)`);
|
|
18
18
|
}
|
|
19
19
|
const absTargetDir = path.resolve(targetDir);
|
|
20
20
|
const { repo, } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
@@ -47,12 +47,12 @@ export async function executeBranchCmd({ branchName, itemPath, targetDir = proce
|
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
49
|
catch (error) {
|
|
50
|
-
console.error(`${lc} ${extractErrorMsg(error)} (E:
|
|
50
|
+
console.error(`${lc} ${extractErrorMsg(error)} (E: f2ff7c0bb2a81b21aefbbb7726b2bb26)`);
|
|
51
51
|
throw error;
|
|
52
52
|
}
|
|
53
53
|
finally {
|
|
54
54
|
if (logalot) {
|
|
55
|
-
console.log(`${lc} complete. (I:
|
|
55
|
+
console.log(`${lc} complete. (I: 3f86a81c5ea8c945f364be484c533826)`);
|
|
56
56
|
}
|
|
57
57
|
}
|
|
58
58
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-branch-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-branch-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,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,cAAc,CAAC;AAC9B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAuBjC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACnC,UAAU,EACV,QAAQ,EACR,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAkB,EAAE;IACjB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC;IACjD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"cli-branch-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-branch-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,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,cAAc,CAAC;AAC9B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAuBjC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACnC,UAAU,EACV,QAAQ,EACR,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,KAAK,GAAG,KAAK,GAChB,GAAkB,EAAE;IACjB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC;IACjD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,oDAAoD,CAAC,CAAC;QAAC,CAAC;QAExF,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QAC7C,MAAM,EAAE,IAAI,GAAG,GAAG,MAAM,iBAAiB,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;QAEtF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC;YAChC,UAAU;YACV,QAAQ;YACR,SAAS,EAAE,YAAY;SAC1B,CAAC,CAAC;QAEH,MAAM,QAAQ,GAAiB,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACxD,IAAI,EAAE,CAAC,CAAC,IAAI;YACZ,QAAQ,EAAE,CAAC,CAAC,QAAQ;YACpB,IAAI,EAAE,CAAC,CAAC,UAAU,IAAI,EAAE;YACxB,YAAY,EAAE,CAAC,CAAC,YAAY;SAC/B,CAAC,CAAC,CAAC;QAEJ,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,IAAI,CAAC,UAAU,EAAE,CAAC;gBACd,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;oBACvB,MAAM,MAAM,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;oBACxC,OAAO,CAAC,GAAG,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;gBACtC,CAAC;YACL,CAAC;iBAAM,CAAC;gBACJ,OAAO,CAAC,GAAG,CAAC,mBAAmB,SAAS,CAAC,iBAAiB,GAAG,CAAC,CAAC;YACnE,CAAC;QACL,CAAC;QAED,OAAO;YACH,QAAQ;YACR,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;YAC9C,iBAAiB,EAAE,SAAS,CAAC,iBAAiB;SACjD,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;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QAAC,CAAC;IAC1F,CAAC;AACL,CAAC"}
|
|
@@ -14,7 +14,7 @@ export async function executeCommitCmd({ message, targetDir = process.cwd(), vcs
|
|
|
14
14
|
const lc = `${lcFile}[${executeCommitCmd.name}]`;
|
|
15
15
|
try {
|
|
16
16
|
if (logalot) {
|
|
17
|
-
console.log(`${lc} starting... (I:
|
|
17
|
+
console.log(`${lc} starting... (I: 7ff973ef1a14aaa2feee7f9b69f12826)`);
|
|
18
18
|
}
|
|
19
19
|
const absTargetDir = path.resolve(targetDir);
|
|
20
20
|
const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
@@ -46,7 +46,7 @@ export async function executeCommitCmd({ message, targetDir = process.cwd(), vcs
|
|
|
46
46
|
}
|
|
47
47
|
finally {
|
|
48
48
|
if (logalot) {
|
|
49
|
-
console.log(`${lc} complete. (I:
|
|
49
|
+
console.log(`${lc} complete. (I: c935a86ff47fd9f43e11c5688942ba26)`);
|
|
50
50
|
}
|
|
51
51
|
}
|
|
52
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-commit-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-commit-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,MAAM,GAAG,cAAc,CAAC;AAC9B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAoBjC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACnC,OAAO,EACP,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,MAAM,GAAG,UAAU,EACnB,KAAK,GAAG,KAAK,EACb,gBAAgB,GAAG,KAAK,GAC3B,GAAkB,EAAE;IACjB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC;IACjD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,
|
|
1
|
+
{"version":3,"file":"cli-commit-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-commit-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAElF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAE3D,MAAM,MAAM,GAAG,cAAc,CAAC;AAC9B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAoBjC,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EACnC,OAAO,EACP,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,MAAM,GAAG,UAAU,EACnB,KAAK,GAAG,KAAK,EACb,gBAAgB,GAAG,KAAK,GAC3B,GAAkB,EAAE;IACjB,MAAM,EAAE,GAAG,GAAG,MAAM,IAAI,gBAAgB,CAAC,IAAI,GAAG,CAAC;IACjD,IAAI,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,oDAAoD,CAAC,CAAC;QAAC,CAAC;QAExF,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,OAAO;YACP,MAAM;YACN,SAAS,EAAE,YAAY;YACvB,gBAAgB;SACnB,CAAC,CAAC;QAEH,IAAI,CAAC,KAAK,EAAE,CAAC;YACT,OAAO,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,UAAU,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,OAAO,IAAI,gCAAgC,EAAE,CAAC,CAAC;YAC5H,OAAO,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,cAAc,CAAC,MAAM,kBAAkB,CAAC,CAAC;YACnE,IAAI,SAAS,CAAC,qBAAqB,GAAG,CAAC,EAAE,CAAC;gBACtC,OAAO,CAAC,GAAG,CAAC,IAAI,SAAS,CAAC,qBAAqB,2CAA2C,CAAC,CAAC;YAChG,CAAC;QACL,CAAC;QAED,OAAO;YACH,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,UAAU,EAAE,SAAS,CAAC,UAAU;YAChC,WAAW,EAAE,SAAS,CAAC,WAAW;YAClC,YAAY,EAAE,SAAS,CAAC,YAAY;YACpC,cAAc,EAAE,SAAS,CAAC,cAAc;YACxC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB;SACzD,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;YAAC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,kDAAkD,CAAC,CAAC;QAAC,CAAC;IAC1F,CAAC;AACL,CAAC"}
|
|
@@ -6,9 +6,9 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import path from 'node:path';
|
|
8
8
|
import fs from 'node:fs/promises';
|
|
9
|
-
import { VcsRepository } from '@ibgib/core-gib/dist/
|
|
10
|
-
import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/
|
|
11
|
-
import {
|
|
9
|
+
import { VcsRepository } from '@ibgib/core-gib/dist/cosmology/branching/branching-facade.mjs';
|
|
10
|
+
import { B2TFS_BRANCH_DEFAULT_NAME } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-constants.mjs';
|
|
11
|
+
import { getB2tFSGalaxyIbGib } from '@ibgib/core-gib/dist/cosmology/branching/repo/b2tfs-repo-helpers.mjs';
|
|
12
12
|
import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
|
|
13
13
|
import { bootstrapVcsMetaspace } from '../../bootstrap/node-bootstrap.mjs';
|
|
14
14
|
const lcFile = `[init-cmd]`;
|
|
@@ -25,15 +25,15 @@ export async function executeInitCmd({ targetDir = process.cwd(), vcsFolderName
|
|
|
25
25
|
defaultSpaceName: `vcs_${path.basename(absTargetDir).replace(/[^a-zA-Z0-9_\-]/g, '_')}`,
|
|
26
26
|
});
|
|
27
27
|
if (foundVcsPath) {
|
|
28
|
-
const
|
|
29
|
-
if (
|
|
28
|
+
const existingGalaxyIbGib = await getB2tFSGalaxyIbGib({ space: localSpace, metaspace });
|
|
29
|
+
if (existingGalaxyIbGib) {
|
|
30
30
|
if (!quiet) {
|
|
31
|
-
console.log(`Reinitialized existing ibgib repository in ${vcsPath}`);
|
|
31
|
+
console.log(`Reinitialized existing ibgib repository in ${vcsPath} (I: 7c6058dcc958eb2ff8d984b317346826)`);
|
|
32
32
|
}
|
|
33
33
|
return {
|
|
34
34
|
vcsPath,
|
|
35
|
-
spaceId:
|
|
36
|
-
branchName:
|
|
35
|
+
spaceId: existingGalaxyIbGib.data.activeSpaceId,
|
|
36
|
+
branchName: existingGalaxyIbGib.data.activeBranchName || defaultBranchName,
|
|
37
37
|
rootItemIb: '',
|
|
38
38
|
};
|
|
39
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-init-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-init-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGlC,OAAO,EAAE,aAAa,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"cli-init-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-init-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAGlC,OAAO,EAAE,aAAa,EAAE,MAAM,+DAA+D,CAAC;AAC9F,OAAO,EAAE,yBAAyB,EAAE,MAAM,sEAAsE,CAAC;AACjH,OAAO,EAAE,mBAAmB,EAAE,MAAM,sEAAsE,CAAC;AAE3G,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,qBAAqB,EAAE,MAAM,oCAAoC,CAAC;AAE3E,MAAM,MAAM,GAAG,YAAY,CAAC;AAC5B,MAAM,OAAO,GAAG,gBAAgB,CAAC;AAgBjC,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,EACjC,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,EACzB,aAAa,GAAG,SAAS,EACzB,iBAAiB,GAAG,yBAAyB,EAC7C,KAAK,GAAG,KAAK,GAChB,GAAgB,EAAE;IACf,MAAM,YAAY,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC;IAEvD,oCAAoC;IACpC,MAAM,EAAE,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAElD,kEAAkE;IAClE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,GAAG,MAAM,qBAAqB,CAAC;QACxE,QAAQ,EAAE,YAAY;QACtB,aAAa;QACb,gBAAgB,EAAE,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,kBAAkB,EAAE,GAAG,CAAC,EAAE;KAC1F,CAAC,CAAC;IAEH,IAAI,YAAY,EAAE,CAAC;QACf,MAAM,mBAAmB,GAAG,MAAM,mBAAmB,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,CAAC,CAAC;QACxF,IAAI,mBAAmB,EAAE,CAAC;YACtB,IAAI,CAAC,KAAK,EAAE,CAAC;gBACT,OAAO,CAAC,GAAG,CAAC,8CAA8C,OAAO,wCAAwC,CAAC,CAAC;YAC/G,CAAC;YACD,OAAO;gBACH,OAAO;gBACP,OAAO,EAAE,mBAAmB,CAAC,IAAI,CAAC,aAAa;gBAC/C,UAAU,EAAE,mBAAmB,CAAC,IAAI,CAAC,gBAAgB,IAAI,iBAAiB;gBAC1E,UAAU,EAAE,EAAE;aACjB,CAAC;QACN,CAAC;IACL,CAAC;IAED,0CAA0C;IAC1C,MAAM,IAAI,GAAG,IAAI,aAAa,CAAC;QAC3B,SAAS;QACT,UAAU;QACV,QAAQ,EAAE,YAAY;QACtB,aAAa;KAChB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC;QAC5B,cAAc,EAAE,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,MAAM;QACrD,UAAU,EAAE,iBAAiB;KAChC,CAAC,CAAC;IAEH,IAAI,CAAC,KAAK,EAAE,CAAC;QACT,OAAO,CAAC,GAAG,CAAC,yCAAyC,OAAO,aAAa,iBAAiB,GAAG,CAAC,CAAC;IACnG,CAAC;IAED,OAAO;QACH,OAAO;QACP,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,UAAU,EAAE,OAAO,CAAC,UAAU;QAC9B,UAAU,EAAE,OAAO,CAAC,QAAQ,CAAC,EAAE;KAClC,CAAC;AACN,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-log-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-log-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"cli-log-cmd.d.mts","sourceRoot":"","sources":["../../../src/cli/commands/cli-log-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAYH,MAAM,WAAW,UAAU;IACvB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC;IAC1B,YAAY,CAAC,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC1E;AAED,MAAM,WAAW,UAAU;IACvB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,KAAK,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,UAAU,EAAE,CAAC;CACzB;AAED,wBAAsB,aAAa,CAAC,EAChC,SAAyB,EACzB,aAAyB,EACzB,QAAQ,EACR,UAAU,EACV,WAAmB,EACnB,KAAa,GAChB,GAAE,UAAe,GAAG,OAAO,CAAC,YAAY,CAAC,CAwEzC"}
|
|
@@ -18,26 +18,10 @@ export async function executeLogCmd({ targetDir = process.cwd(), vcsFolderName =
|
|
|
18
18
|
}
|
|
19
19
|
const absTargetDir = path.resolve(targetDir);
|
|
20
20
|
const { repo } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
21
|
-
const
|
|
22
|
-
// let resolvedBranchName = branchName;
|
|
23
|
-
// let resolvedFilePath = filePath;
|
|
24
|
-
// if (!resolvedBranchName && resolvedFilePath) {
|
|
25
|
-
// const branchInfos = await getAllBranchInfosFromIndex({ indexIbGib });
|
|
26
|
-
// if (branchInfos.some(b => b.branchName === resolvedFilePath)) {
|
|
27
|
-
// resolvedBranchName = resolvedFilePath;
|
|
28
|
-
// resolvedFilePath = undefined;
|
|
29
|
-
// }
|
|
30
|
-
// }
|
|
31
|
-
// const activeBranchSpace = await repo.getActiveBranchSpace({
|
|
32
|
-
// indexIbGib,
|
|
33
|
-
// targetDir: absTargetDir,
|
|
34
|
-
// branchName: resolvedBranchName,
|
|
35
|
-
// });
|
|
21
|
+
const galaxyIbGib = await repo.getGalaxyIbGib();
|
|
36
22
|
const logRes = await repo.log({
|
|
37
|
-
|
|
38
|
-
// branchName: resolvedBranchName,
|
|
23
|
+
galaxyIbGib,
|
|
39
24
|
branchName,
|
|
40
|
-
// filePath: resolvedFilePath,
|
|
41
25
|
filePath,
|
|
42
26
|
allComments,
|
|
43
27
|
targetDir: absTargetDir,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-log-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-log-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"cli-log-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-log-cmd.mts"],"names":[],"mappings":"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"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
*/
|
|
7
7
|
import path from 'node:path';
|
|
8
8
|
import { extractErrorMsg } from '@ibgib/helper-gib/dist/helpers/utils-helper.mjs';
|
|
9
|
-
import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/
|
|
9
|
+
import { getOrCreateBranchSpace } from '@ibgib/core-gib/dist/cosmology/branching/branch/branch-helpers.mjs';
|
|
10
10
|
import { getSpaceIdFromIb } from '@ibgib/core-gib/dist/witness/space/metaspace/metaspace-innerspace/metaspace-innerspace-helper.mjs';
|
|
11
11
|
import { GLOBAL_LOG_A_LOT } from '../../vcs-gib-constants.mjs';
|
|
12
12
|
import { openVcsRepository } from '../vcs-repo-helper.mjs';
|
|
@@ -24,13 +24,13 @@ export async function executeMergeCmd({ incomingBranchName, targetDir = process.
|
|
|
24
24
|
}
|
|
25
25
|
const absTargetDir = path.resolve(targetDir);
|
|
26
26
|
const { repo, vcsPath, activeWorktreeDir } = await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
|
|
27
|
-
const
|
|
28
|
-
const baseBranchName = await repo.getActiveBranchName({
|
|
27
|
+
const galaxyIbGib = await repo.getGalaxyIbGib();
|
|
28
|
+
const baseBranchName = await repo.getActiveBranchName({ galaxyIbGib, targetDir: absTargetDir });
|
|
29
29
|
const incomingSpaceRes = await getOrCreateBranchSpace({
|
|
30
30
|
metaspace: repo.metaspace,
|
|
31
31
|
branchName: trimmedIncomingBranchName,
|
|
32
32
|
});
|
|
33
|
-
const activeBranchSpace = await repo.getActiveBranchSpace({
|
|
33
|
+
const activeBranchSpace = await repo.getActiveBranchSpace({ galaxyIbGib, targetDir: absTargetDir });
|
|
34
34
|
const activeBranchSpaceId = getSpaceIdFromIb(activeBranchSpace.ib);
|
|
35
35
|
const mergeRes = await repo.merge({
|
|
36
36
|
baseBranchSpace: activeBranchSpace,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-merge-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-merge-cmd.mts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,sBAAsB,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"cli-merge-cmd.mjs","sourceRoot":"","sources":["../../../src/cli/commands/cli-merge-cmd.mts"],"names":[],"mappings":"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"}
|
|
@@ -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
|
export interface ResetCmdOpts {
|
|
8
8
|
paths?: string[];
|
|
@@ -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":"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"}
|
|
@@ -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,9 +2,9 @@
|
|
|
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
|
-
import { VcsStatusItem, PendingCommentInfo } from '@ibgib/core-gib/dist/
|
|
7
|
+
import { VcsStatusItem, PendingCommentInfo } from '@ibgib/core-gib/dist/cosmology/branching/status/status-types.mjs';
|
|
8
8
|
export { VcsStatusItem, PendingCommentInfo };
|
|
9
9
|
export interface StatusCmdResult {
|
|
10
10
|
branchName: string;
|
|
@@ -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,
|
|
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,kEAAkE,CAAC;AAOrH,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';
|