@regressionproof/snapshotter 0.5.4 → 0.5.5

package/build/esm/git.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { exec } from 'child_process';
-import { existsSync } from 'fs';
+import { existsSync, unlinkSync } from 'fs';
 import path from 'path';
 import { promisify } from 'util';
 import SpruceError from './errors/SpruceError.js.js';
@@ -20,6 +20,7 @@ export function gitCommit(mirrorPath, log) {
         if (!existsSync(gitDir)) {
             yield execOrThrow(`git -C "${mirrorPath}" init`, log);
         }
+        cleanupGitLockFiles(mirrorPath, log);
         yield execOrThrow(`git -C "${mirrorPath}" add -A`, log);
         const { stdout } = yield execOrThrow(`git -C "${mirrorPath}" status --porcelain`);
         if (!stdout.trim()) {
@@ -33,14 +34,15 @@ export function gitCommit(mirrorPath, log) {
 }
 export function gitPush(mirrorPath, remote, log) {
     return __awaiter(this, void 0, void 0, function* () {
+        cleanupGitLockFiles(mirrorPath, log);
         const authedUrl = remote.url.replace('://', `://${remote.token}@`);
-        const originExists = yield remoteExists(mirrorPath, 'origin');
-        if (originExists) {
-            yield execOrThrow(`git -C "${mirrorPath}" remote set-url origin "${authedUrl}"`);
-        }
-        else {
+        const currentUrl = yield getRemoteUrl(mirrorPath, 'origin');
+        if (currentUrl === null) {
             yield execOrThrow(`git -C "${mirrorPath}" remote add origin "${authedUrl}"`);
         }
+        else if (currentUrl !== authedUrl) {
+            yield execOrThrow(`git -C "${mirrorPath}" remote set-url origin "${authedUrl}"`);
+        }
         yield pullFromRemote(mirrorPath, log);
         yield execOrThrow(`git -C "${mirrorPath}" push -u origin HEAD`, log);
     });
@@ -72,18 +74,33 @@ function checkRemoteBranchExists(mirrorPath, branch) {
         }
     });
 }
-function remoteExists(mirrorPath, remoteName) {
+function getRemoteUrl(mirrorPath, remoteName) {
     return __awaiter(this, void 0, void 0, function* () {
         try {
-            const { stdout } = yield execAsync(`git -C "${mirrorPath}" remote`);
-            const remotes = stdout.trim().split('\n');
-            return remotes.includes(remoteName);
+            const { stdout } = yield execAsync(`git -C "${mirrorPath}" remote get-url ${remoteName}`);
+            return stdout.trim();
         }
         catch (_a) {
-            return false;
+            return null;
         }
     });
 }
+function cleanupGitLockFiles(mirrorPath, log) {
+    var _a;
+    const lockFiles = ['config.lock', 'index.lock', 'HEAD.lock'];
+    for (const lockFile of lockFiles) {
+        const lockPath = path.join(mirrorPath, '.git', lockFile);
+        if (existsSync(lockPath)) {
+            try {
+                unlinkSync(lockPath);
+                log === null || log === void 0 ? void 0 : log.info(`Removed stale lock file: ${lockFile}`);
+            }
+            catch (_b) {
+                (_a = log === null || log === void 0 ? void 0 : log.warn) === null || _a === void 0 ? void 0 : _a.call(log, `Failed to remove lock file: ${lockFile}`);
+            }
+        }
+    }
+}
 function execOrThrow(command, log) {
     return __awaiter(this, void 0, void 0, function* () {
         var _a, _b;

package/build/git.js

@@ -17,6 +17,7 @@ async function gitCommit(mirrorPath, log) {
     if (!(0, fs_1.existsSync)(gitDir)) {
         await execOrThrow(`git -C "${mirrorPath}" init`, log);
     }
+    cleanupGitLockFiles(mirrorPath, log);
     await execOrThrow(`git -C "${mirrorPath}" add -A`, log);
     const { stdout } = await execOrThrow(`git -C "${mirrorPath}" status --porcelain`);
     if (!stdout.trim()) {
@@ -28,14 +29,15 @@ async function gitCommit(mirrorPath, log) {
     return true;
 }
 async function gitPush(mirrorPath, remote, log) {
+    cleanupGitLockFiles(mirrorPath, log);
     const authedUrl = remote.url.replace('://', `://${remote.token}@`);
-    const originExists = await remoteExists(mirrorPath, 'origin');
-    if (originExists) {
-        await execOrThrow(`git -C "${mirrorPath}" remote set-url origin "${authedUrl}"`);
-    }
-    else {
+    const currentUrl = await getRemoteUrl(mirrorPath, 'origin');
+    if (currentUrl === null) {
         await execOrThrow(`git -C "${mirrorPath}" remote add origin "${authedUrl}"`);
     }
+    else if (currentUrl !== authedUrl) {
+        await execOrThrow(`git -C "${mirrorPath}" remote set-url origin "${authedUrl}"`);
+    }
     await pullFromRemote(mirrorPath, log);
     await execOrThrow(`git -C "${mirrorPath}" push -u origin HEAD`, log);
 }
@@ -60,14 +62,28 @@ async function checkRemoteBranchExists(mirrorPath, branch) {
         return false;
     }
 }
-async function remoteExists(mirrorPath, remoteName) {
+async function getRemoteUrl(mirrorPath, remoteName) {
     try {
-        const { stdout } = await execAsync(`git -C "${mirrorPath}" remote`);
-        const remotes = stdout.trim().split('\n');
-        return remotes.includes(remoteName);
+        const { stdout } = await execAsync(`git -C "${mirrorPath}" remote get-url ${remoteName}`);
+        return stdout.trim();
     }
     catch {
-        return false;
+        return null;
+    }
+}
+function cleanupGitLockFiles(mirrorPath, log) {
+    const lockFiles = ['config.lock', 'index.lock', 'HEAD.lock'];
+    for (const lockFile of lockFiles) {
+        const lockPath = path_1.default.join(mirrorPath, '.git', lockFile);
+        if ((0, fs_1.existsSync)(lockPath)) {
+            try {
+                (0, fs_1.unlinkSync)(lockPath);
+                log?.info(`Removed stale lock file: ${lockFile}`);
+            }
+            catch {
+                log?.warn?.(`Failed to remove lock file: ${lockFile}`);
+            }
+        }
     }
 }
 async function execOrThrow(command, log) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@regressionproof/snapshotter",
-  "version": "0.5.4",
+  "version": "0.5.5",
   "publishConfig": {
     "access": "public"
   },
@@ -94,5 +94,5 @@
     "@sprucelabs/spruce-core-schemas": "^42.1.3",
     "@sprucelabs/spruce-skill-utils": "^34.0.3"
   },
-  "gitHead": "01c36085fc6f8c0fdc7778de7f7dee6e194cb3f4"
+  "gitHead": "960e13b1ccdd3227d7e0aad8451e6eb851189746"
 }