pinokiod 5.0.4 → 5.0.6

package/kernel/api/index.js

@@ -1498,9 +1498,11 @@ class Api {
 //    let keypath = path.resolve(this.kernel.homedir, "key.json")
 //    this.kernel.keys = (await this.loader.load(keypath)).resolved
 
-    // ensure gitconfig carries required defaults before any shell commands run
-    if (this.kernel.git && typeof this.kernel.git.ensureDefaults === "function") {
-      await this.kernel.git.ensureDefaults()
+    // ensure gitconfig defaults before any shell commands run
+    if (this.kernel.git) {
+      if (typeof this.kernel.git.ensureDefaults === "function") {
+        await this.kernel.git.ensureDefaults()
+      }
     }
     // init shell before running just to make sure the environment variables are fresh
     await this.kernel.shell.init()

package/kernel/bin/git.js

@@ -52,8 +52,8 @@ class Git {
   async uninstall(req, ondata) {
     await this.kernel.bin.exec({ message: "conda remove git gh" }, ondata)
   }
-  env() {
-    let gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
+  env(cwd) {
+    const gitconfig_path = path.resolve(this.kernel.homedir, "gitconfig")
     return {
       GIT_CONFIG_GLOBAL: gitconfig_path,
       GH_CONFIG_DIR: this.kernel.path("config/gh")

package/kernel/git.js

@@ -105,6 +105,21 @@ class Git {
       await fs.promises.writeFile(gitconfigPath, ini.stringify(config))
     }
   }
+  async clearStaleLock(repoPath) {
+    if (!repoPath) return
+    const lockPath = path.resolve(repoPath, ".git", "index.lock")
+    try {
+      await fs.promises.access(lockPath, fs.constants.F_OK)
+    } catch (_) {
+      return
+    }
+    // best-effort: if no other git op is active, remove the stale lock
+    try {
+      await fs.promises.unlink(lockPath)
+    } catch (_) {
+      // ignore
+    }
+  }
   async findGitDirs(dir, results = []) {
     const entries = await fs.promises.readdir(dir, { withFileTypes: true });
     for (const entry of entries) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "5.0.4",
+  "version": "5.0.6",
   "description": "",
   "main": "index.js",
   "scripts": {

package/server/index.js

@@ -62,10 +62,22 @@ const Info = require("../kernel/info")
 
 const Setup = require("../kernel/bin/setup")
 
-function normalize(str) {
-  if (!str) return '';
-  return (str.endsWith('\n') ? str : str + '\n').replace(/\r\n/g, '\n');
-}
+    function normalize(str) {
+      if (!str) return '';
+      return (str.endsWith('\n') ? str : str + '\n').replace(/\r\n/g, '\n');
+    }
+
+    this.gitEnv = (repoPath) => {
+      const gitBin = this.kernel.bin && this.kernel.bin.git ? this.kernel.bin.git : null
+      if (gitBin && typeof gitBin.env === 'function') {
+        const env = gitBin.env(repoPath)
+        if (this.kernel.git && typeof this.kernel.git.clearStaleLock === "function" && repoPath) {
+          this.kernel.git.clearStaleLock(repoPath).catch(() => {})
+        }
+        return env
+      }
+      return {}
+    }
 
 class Server {
   constructor(config) {