@ibgib/vcs-gib 0.0.36 → 0.0.39

package/src/cli/commands/cli-merge-cmd.mts

@@ -42,40 +42,38 @@ export async function executeMergeCmd({
     const lc = `${lcFile}[${executeMergeCmd.name}]`;
     try {
         if (logalot) {
-            console.log(`${lc} starting... (I: genuuid)`);
+            console.log(`${lc} starting... (I: d14fb7ac187875d165abcbf8fe51ce26)`);
         }
 
         const trimmedIncomingBranchName = incomingBranchName?.trim();
         if (!trimmedIncomingBranchName) {
-            throw new Error(`Branch name is required for merge (E: genuuid)`);
+            throw new Error(`Branch name is required for merge (E: f47fd65e49a8518da859217ae1bef826)`);
         }
 
         const absTargetDir = path.resolve(targetDir);
         const { repo, vcsPath, activeWorktreeDir } =
             await openVcsRepository({ targetDir: absTargetDir, vcsFolderName });
 
-        // todo: get baseBranchName based off of targetDir?
-        const baseBranchName = await repo.getActiveBranchName();
+        const indexIbGib = await repo.getIndexIbGib();
+        const baseBranchName = await repo.getActiveBranchName({ indexIbGib, targetDir: absTargetDir });
 
         const incomingSpaceRes = await getOrCreateBranchSpace({
             metaspace: repo.metaspace,
             branchName: trimmedIncomingBranchName,
         });
 
-        const activeBranchSpace = await repo.getActiveBranchSpace();
+        const activeBranchSpace = await repo.getActiveBranchSpace({ indexIbGib, targetDir: absTargetDir });
         const activeBranchSpaceId = getSpaceIdFromIb(activeBranchSpace.ib);
 
         const mergeRes = await repo.merge({
-            baseBranchSpace: activeBranchSpace, // what should this be? always the active one? Or does the working dir determine it? What is absTargetDir?
-            // message,
-            // repoRoot,
+            baseBranchSpace: activeBranchSpace,
             incomingBranchName: trimmedIncomingBranchName,
             incomingBranchSpace: incomingSpaceRes.space,
             targetDir: absTargetDir,
         });
 
         if (!quiet) {
-            console.log(`Successfully merged branch '${trimmedIncomingBranchName}' into '${baseBranchName}' (I: genuuid)`);
+            console.log(`Successfully merged branch '${trimmedIncomingBranchName}' into '${baseBranchName}' (I: 943c67d40bb8a3177d470da667571726)`);
             console.log(`  Worktree projection: ${activeWorktreeDir}`);
         }
 
@@ -89,11 +87,11 @@ export async function executeMergeCmd({
             worktreePath: activeWorktreeDir,
         };
     } catch (error) {
-        console.error(`${lc} ${extractErrorMsg(error)} (E: genuuid)`);
+        console.error(`${lc} ${extractErrorMsg(error)} (E: acfb283f49f8e533586e0578ac9d4426)`);
         throw error;
     } finally {
         if (logalot) {
-            console.log(`${lc} complete. (I: genuuid)`);
+            console.log(`${lc} complete. (I: 67210ef7c05454c19cdb6b08149b7326)`);
         }
     }
 }

package/src/cli/vcs-cli-main.mts

@@ -126,9 +126,11 @@ export async function main({
             case VCS_SUBCOMMANDS.LOG: {
                 const targetDir = process.cwd();
                 const filePath = parsed.positionals[0];
+                const branchName = parsed.flags.branchName;
                 await executeLogCmd({
                     targetDir,
                     filePath,
+                    branchName,
                     allComments: parsed.flags.all,
                 });
                 break;