isomorphic-git 1.30.0 → 1.30.1

package/browser-tests.json

@@ -1,8 +1,10 @@
 [
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
   "Firefox 136.0 (Ubuntu 0.0.0)",
-  "Chrome 128.0.0.0 (Android 10)",
+  "X Chrome 128.0.0.0 (Android 10)",
   "Edge 79.0.309.65 (Windows 10)",
+  "Mobile Safari 14.0 (iOS 14.0.1)",
   "Safari 14.1 (Mac OS 10.15.7)",
-  "Mobile Safari 14.0 (iOS 14.0.1)"
+  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
+  "Chrome 128.0.0.0 (Android 10)"
 ]

package/index.cjs

@@ -979,8 +979,11 @@ function createCache() {
 }
 
 async function updateCachedIndexFile(fs, filepath, cache) {
-  const stat = await fs.lstat(filepath);
-  const rawIndexFile = await fs.read(filepath);
+  const [stat, rawIndexFile] = await Promise.all([
+    fs.lstat(filepath),
+    fs.read(filepath),
+  ]);
+
   const index = await GitIndex.from(rawIndexFile);
   // cache the GitIndex object so we don't need to re-read it every time.
   cache.map.set(filepath, index);
@@ -992,8 +995,9 @@ async function updateCachedIndexFile(fs, filepath, cache) {
 async function isIndexStale(fs, filepath, cache) {
   const savedStats = cache.stats.get(filepath);
   if (savedStats === undefined) return true
-  const currStats = await fs.lstat(filepath);
   if (savedStats === null) return false
+
+  const currStats = await fs.lstat(filepath);
   if (currStats === null) return false
   return compareStats(savedStats, currStats)
 }
@@ -1009,7 +1013,9 @@ class GitIndexManager {
    * @param {function(GitIndex): any} closure
    */
   static async acquire({ fs, gitdir, cache, allowUnmerged = true }, closure) {
-    if (!cache[IndexCache]) cache[IndexCache] = createCache();
+    if (!cache[IndexCache]) {
+      cache[IndexCache] = createCache();
+    }
 
     const filepath = `${gitdir}/index`;
     if (lock === null) lock = new AsyncLock({ maxPending: Infinity });
@@ -1020,10 +1026,11 @@ class GitIndexManager {
       // to make sure other processes aren't writing to it
       // simultaneously, which could result in a corrupted index.
       // const fileLock = await Lock(filepath)
-      if (await isIndexStale(fs, filepath, cache[IndexCache])) {
-        await updateCachedIndexFile(fs, filepath, cache[IndexCache]);
+      const theIndexCache = cache[IndexCache];
+      if (await isIndexStale(fs, filepath, theIndexCache)) {
+        await updateCachedIndexFile(fs, filepath, theIndexCache);
       }
-      const index = cache[IndexCache].map.get(filepath);
+      const index = theIndexCache.map.get(filepath);
       unmergedPaths = index.unmergedPaths;
 
       if (unmergedPaths.length && !allowUnmerged)
@@ -1036,7 +1043,7 @@ class GitIndexManager {
         const buffer = await index.toObject();
         await fs.write(filepath, buffer);
         // Update cached stat value
-        cache[IndexCache].stats.set(filepath, await fs.lstat(filepath));
+        theIndexCache.stats.set(filepath, await fs.lstat(filepath));
         index._dirty = false;
       }
     });
@@ -4261,7 +4268,7 @@ class GitWalkerFs {
             oid = undefined;
           } else {
             oid = await shasum(
-              GitObject.wrap({ type: 'blob', object: await entry.content() })
+              GitObject.wrap({ type: 'blob', object: content })
             );
             // Update the stats in the index so we will get a "cache hit" next time
             // 1) if we can (because the oid and mode are the same)
@@ -4452,15 +4459,20 @@ async function _walk({
   const range = arrayRange(0, walkers.length);
   const unionWalkerFromReaddir = async entries => {
     range.map(i => {
-      entries[i] = entries[i] && new walkers[i].ConstructEntry(entries[i]);
+      const entry = entries[i];
+      entries[i] = entry && new walkers[i].ConstructEntry(entry);
     });
     const subdirs = await Promise.all(
-      range.map(i => (entries[i] ? walkers[i].readdir(entries[i]) : []))
+      range.map(i => {
+        const entry = entries[i];
+        return entry ? walkers[i].readdir(entry) : []
+      })
     );
     // Now process child directories
-    const iterators = subdirs
-      .map(array => (array === null ? [] : array))
-      .map(array => array[Symbol.iterator]());
+    const iterators = subdirs.map(array => {
+      return (array === null ? [] : array)[Symbol.iterator]()
+    });
+
     return {
       entries,
       children: unionOfIterators(iterators),
@@ -7632,8 +7644,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.30.0',
-  agent: 'git/isomorphic-git@1.30.0',
+  version: '1.30.1',
+  agent: 'git/isomorphic-git@1.30.1',
 };
 
 class FIFO {
@@ -15288,11 +15300,9 @@ async function updateIndex({
       return await GitIndexManager.acquire(
         { fs, gitdir, cache },
         async function(index) {
-          let fileStats;
-
           if (!force) {
             // Check if the file is still present in the working directory
-            fileStats = await fs.lstat(pathBrowserify.join(dir, filepath));
+            const fileStats = await fs.lstat(pathBrowserify.join(dir, filepath));
 
             if (fileStats) {
               if (fileStats.isDirectory()) {
@@ -15342,18 +15352,7 @@ async function updateIndex({
         )
       }
 
-      // By default we use 0 for the stats of the index file
-      let stats = {
-        ctime: new Date(0),
-        mtime: new Date(0),
-        dev: 0,
-        ino: 0,
-        mode,
-        uid: 0,
-        gid: 0,
-        size: 0,
-      };
-
+      let stats;
       if (!oid) {
         stats = fileStats;
 
@@ -15369,6 +15368,18 @@ async function updateIndex({
           format: 'content',
           object,
         });
+      } else {
+        // By default we use 0 for the stats of the index file
+        stats = {
+          ctime: new Date(0),
+          mtime: new Date(0),
+          dev: 0,
+          ino: 0,
+          mode,
+          uid: 0,
+          gid: 0,
+          size: 0,
+        };
       }
 
       index.insert({

package/index.js

@@ -973,8 +973,11 @@ function createCache() {
 }
 
 async function updateCachedIndexFile(fs, filepath, cache) {
-  const stat = await fs.lstat(filepath);
-  const rawIndexFile = await fs.read(filepath);
+  const [stat, rawIndexFile] = await Promise.all([
+    fs.lstat(filepath),
+    fs.read(filepath),
+  ]);
+
   const index = await GitIndex.from(rawIndexFile);
   // cache the GitIndex object so we don't need to re-read it every time.
   cache.map.set(filepath, index);
@@ -986,8 +989,9 @@ async function updateCachedIndexFile(fs, filepath, cache) {
 async function isIndexStale(fs, filepath, cache) {
   const savedStats = cache.stats.get(filepath);
   if (savedStats === undefined) return true
-  const currStats = await fs.lstat(filepath);
   if (savedStats === null) return false
+
+  const currStats = await fs.lstat(filepath);
   if (currStats === null) return false
   return compareStats(savedStats, currStats)
 }
@@ -1003,7 +1007,9 @@ class GitIndexManager {
    * @param {function(GitIndex): any} closure
    */
   static async acquire({ fs, gitdir, cache, allowUnmerged = true }, closure) {
-    if (!cache[IndexCache]) cache[IndexCache] = createCache();
+    if (!cache[IndexCache]) {
+      cache[IndexCache] = createCache();
+    }
 
     const filepath = `${gitdir}/index`;
     if (lock === null) lock = new AsyncLock({ maxPending: Infinity });
@@ -1014,10 +1020,11 @@ class GitIndexManager {
       // to make sure other processes aren't writing to it
       // simultaneously, which could result in a corrupted index.
       // const fileLock = await Lock(filepath)
-      if (await isIndexStale(fs, filepath, cache[IndexCache])) {
-        await updateCachedIndexFile(fs, filepath, cache[IndexCache]);
+      const theIndexCache = cache[IndexCache];
+      if (await isIndexStale(fs, filepath, theIndexCache)) {
+        await updateCachedIndexFile(fs, filepath, theIndexCache);
       }
-      const index = cache[IndexCache].map.get(filepath);
+      const index = theIndexCache.map.get(filepath);
       unmergedPaths = index.unmergedPaths;
 
       if (unmergedPaths.length && !allowUnmerged)
@@ -1030,7 +1037,7 @@ class GitIndexManager {
         const buffer = await index.toObject();
         await fs.write(filepath, buffer);
         // Update cached stat value
-        cache[IndexCache].stats.set(filepath, await fs.lstat(filepath));
+        theIndexCache.stats.set(filepath, await fs.lstat(filepath));
         index._dirty = false;
       }
     });
@@ -4255,7 +4262,7 @@ class GitWalkerFs {
             oid = undefined;
           } else {
             oid = await shasum(
-              GitObject.wrap({ type: 'blob', object: await entry.content() })
+              GitObject.wrap({ type: 'blob', object: content })
             );
             // Update the stats in the index so we will get a "cache hit" next time
             // 1) if we can (because the oid and mode are the same)
@@ -4446,15 +4453,20 @@ async function _walk({
   const range = arrayRange(0, walkers.length);
   const unionWalkerFromReaddir = async entries => {
     range.map(i => {
-      entries[i] = entries[i] && new walkers[i].ConstructEntry(entries[i]);
+      const entry = entries[i];
+      entries[i] = entry && new walkers[i].ConstructEntry(entry);
     });
     const subdirs = await Promise.all(
-      range.map(i => (entries[i] ? walkers[i].readdir(entries[i]) : []))
+      range.map(i => {
+        const entry = entries[i];
+        return entry ? walkers[i].readdir(entry) : []
+      })
     );
     // Now process child directories
-    const iterators = subdirs
-      .map(array => (array === null ? [] : array))
-      .map(array => array[Symbol.iterator]());
+    const iterators = subdirs.map(array => {
+      return (array === null ? [] : array)[Symbol.iterator]()
+    });
+
     return {
       entries,
       children: unionOfIterators(iterators),
@@ -7626,8 +7638,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.30.0',
-  agent: 'git/isomorphic-git@1.30.0',
+  version: '1.30.1',
+  agent: 'git/isomorphic-git@1.30.1',
 };
 
 class FIFO {
@@ -15282,11 +15294,9 @@ async function updateIndex({
       return await GitIndexManager.acquire(
         { fs, gitdir, cache },
         async function(index) {
-          let fileStats;
-
           if (!force) {
             // Check if the file is still present in the working directory
-            fileStats = await fs.lstat(join(dir, filepath));
+            const fileStats = await fs.lstat(join(dir, filepath));
 
             if (fileStats) {
               if (fileStats.isDirectory()) {
@@ -15336,18 +15346,7 @@ async function updateIndex({
         )
       }
 
-      // By default we use 0 for the stats of the index file
-      let stats = {
-        ctime: new Date(0),
-        mtime: new Date(0),
-        dev: 0,
-        ino: 0,
-        mode,
-        uid: 0,
-        gid: 0,
-        size: 0,
-      };
-
+      let stats;
       if (!oid) {
         stats = fileStats;
 
@@ -15363,6 +15362,18 @@ async function updateIndex({
           format: 'content',
           object,
         });
+      } else {
+        // By default we use 0 for the stats of the index file
+        stats = {
+          ctime: new Date(0),
+          mtime: new Date(0),
+          dev: 0,
+          ino: 0,
+          mode,
+          uid: 0,
+          gid: 0,
+          size: 0,
+        };
       }
 
       index.insert({