isomorphic-git 1.41.4 → 1.41.7

package/index.cjs

@@ -3651,6 +3651,10 @@ async function _readObject({
   oid,
   format = 'content',
 }) {
+  if (!['deflated', 'wrapped', 'content'].includes(format)) {
+    throw new InternalError(`invalid requested format "${format}"`)
+  }
+
   // Curry the current read method so that the packfile un-deltification
   // process can acquire external ref-deltas.
   const getExternalRefDelta = oid => _readObject({ fs, cache, gitdir, oid });
@@ -3710,11 +3714,7 @@ async function _readObject({
   result.object = object;
   result.format = 'content';
 
-  if (format === 'content') {
-    return result
-  }
-
-  throw new InternalError(`invalid requested format "${format}"`)
+  return result
 }
 
 class AlreadyExistsError extends BaseError {
@@ -6321,6 +6321,23 @@ async function constructTree({ fs, gitdir, inode, dryRun }) {
 // @ts-check
 
 async function resolveFilepath({ fs, cache, gitdir, oid, filepath }) {
+  const entry = await resolveFilepathEntry({
+    fs,
+    cache,
+    gitdir,
+    oid,
+    filepath,
+  });
+  return entry.oid
+}
+
+async function resolveFilepathEntry({
+  fs,
+  cache,
+  gitdir,
+  oid,
+  filepath,
+}) {
   // Ensure there are no leading or trailing directory separators.
   // I was going to do this automatically, but then found that the Git Terminal for Windows
   // auto-expands --filepath=/src/utils to --filepath=C:/Users/Will/AppData/Local/Programs/Git/src/utils
@@ -6334,10 +6351,10 @@ async function resolveFilepath({ fs, cache, gitdir, oid, filepath }) {
   const result = await resolveTree({ fs, cache, gitdir, oid });
   const tree = result.tree;
   if (filepath === '') {
-    oid = result.oid;
+    return { mode: '040000', oid: result.oid, path: '', type: 'tree' }
   } else {
     const pathArray = filepath.split('/');
-    oid = await _resolveFilepath({
+    return _resolveFilepath({
       fs,
       cache,
       gitdir,
@@ -6345,9 +6362,8 @@ async function resolveFilepath({ fs, cache, gitdir, oid, filepath }) {
       pathArray,
       oid: _oid,
       filepath,
-    });
+    })
   }
-  return oid
 }
 
 async function _resolveFilepath({
@@ -6363,7 +6379,7 @@ async function _resolveFilepath({
   for (const entry of tree) {
     if (entry.path === name) {
       if (pathArray.length === 0) {
-        return entry.oid
+        return entry
       } else {
         const { type, object } = await _readObject({
           fs,
@@ -9712,8 +9728,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.4',
-  agent: 'git/isomorphic-git@1.41.4',
+  version: '1.41.7',
+  agent: 'git/isomorphic-git@1.41.7',
 };
 
 class FIFO {
@@ -11209,44 +11225,70 @@ async function _findMergeBase({ fs, cache, gitdir, oids }) {
   // and computing virtual merge bases is just too much for me to fathom right now.
 
   // If we start N independent walkers, one at each of the given `oids`, and walk backwards
-  // through ancestors, eventually we'll discover a commit where each one of these N walkers
-  // has passed through. So we just need to keep track of which walkers have visited each commit
-  // until we find a commit that N distinct walkers has visited.
+  // through ancestors, eventually we'll discover commits where each one of these N walkers
+  // has passed through. We cannot stop at the first common commit because a better common
+  // ancestor may still be present in another branch of the graph.
   const visits = {};
   const passes = oids.length;
+  const common = new Set();
+  const parents = new Map();
+  const shallows = await GitShallowManager.read({ fs, gitdir });
+  const readParents = async oid => {
+    if (parents.has(oid)) return parents.get(oid)
+    const { object, type } = await _readObject({ fs, cache, gitdir, oid });
+    if (type !== 'commit') {
+      throw new ObjectTypeError(oid, type, 'commit')
+    }
+    const commit = GitCommit.from(object);
+    const { parent } = commit.parseHeaders();
+    const result = shallows.has(oid) ? [] : parent;
+    parents.set(oid, result);
+    return result
+  };
   let heads = oids.map((oid, index) => ({ index, oid }));
   while (heads.length) {
     // Count how many times we've passed each commit
-    const result = new Set();
     for (const { oid, index } of heads) {
+      await readParents(oid);
       if (!visits[oid]) visits[oid] = new Set();
       visits[oid].add(index);
       if (visits[oid].size === passes) {
-        result.add(oid);
+        common.add(oid);
       }
     }
-    if (result.size > 0) {
-      return [...result]
-    }
-    // We haven't found a common ancestor yet
     const newheads = new Map();
     for (const { oid, index } of heads) {
-      try {
-        const { object } = await _readObject({ fs, cache, gitdir, oid });
-        const commit = GitCommit.from(object);
-        const { parent } = commit.parseHeaders();
-        for (const oid of parent) {
-          if (!visits[oid] || !visits[oid].has(index)) {
-            newheads.set(oid + ':' + index, { oid, index });
-          }
+      // Parents of a common commit cannot be better merge bases.
+      if (common.has(oid)) continue
+      for (const parent of await readParents(oid)) {
+        if (!visits[parent] || !visits[parent].has(index)) {
+          newheads.set(parent + ':' + index, { oid: parent, index });
         }
-      } catch (err) {
-        // do nothing
       }
     }
     heads = Array.from(newheads.values());
   }
-  return []
+
+  if (common.size < 2) return [...common]
+
+  // A merge base is only "best" when it is not an ancestor of another
+  // common ancestor. This also keeps independent criss-cross bases.
+  const redundant = new Set();
+  for (const oid of common) {
+    const ancestors = [...(await readParents(oid))];
+    const seen = new Set();
+    while (ancestors.length) {
+      const ancestor = ancestors.pop();
+      if (seen.has(ancestor)) continue
+      seen.add(ancestor);
+      if (common.has(ancestor)) {
+        redundant.add(ancestor);
+      } else {
+        ancestors.push(...(await readParents(ancestor)));
+      }
+    }
+  }
+  return [...common].filter(oid => !redundant.has(oid))
 }
 
 // @ts-check
@@ -13327,6 +13369,7 @@ async function _log({
   const oid = await GitRefManager.resolve({ fs, gitdir, ref });
   const tips = [await _readCommit({ fs, cache, gitdir, oid })];
   let lastFileOid;
+  let lastFileMode;
   let lastCommit;
   let isOk;
 
@@ -13346,19 +13389,23 @@ async function _log({
     }
 
     if (filepath) {
-      let vFileOid;
+      let vFileEntry;
       try {
-        vFileOid = await resolveFilepath({
+        vFileEntry = await resolveFilepathEntry({
           fs,
           cache,
           gitdir,
           oid: commit.commit.tree,
           filepath,
         });
-        if (lastCommit && lastFileOid !== vFileOid) {
+        if (
+          lastCommit &&
+          (lastFileOid !== vFileEntry.oid || lastFileMode !== vFileEntry.mode)
+        ) {
           commits.push(lastCommit);
         }
-        lastFileOid = vFileOid;
+        lastFileOid = vFileEntry.oid;
+        lastFileMode = vFileEntry.mode;
         lastCommit = commit;
         isOk = true;
       } catch (e) {

package/index.js

@@ -3638,6 +3638,10 @@ async function _readObject({
   oid,
   format = 'content',
 }) {
+  if (!['deflated', 'wrapped', 'content'].includes(format)) {
+    throw new InternalError(`invalid requested format "${format}"`)
+  }
+
   // Curry the current read method so that the packfile un-deltification
   // process can acquire external ref-deltas.
   const getExternalRefDelta = oid => _readObject({ fs, cache, gitdir, oid });
@@ -3697,11 +3701,7 @@ async function _readObject({
   result.object = object;
   result.format = 'content';
 
-  if (format === 'content') {
-    return result
-  }
-
-  throw new InternalError(`invalid requested format "${format}"`)
+  return result
 }
 
 class AlreadyExistsError extends BaseError {
@@ -6308,6 +6308,23 @@ async function constructTree({ fs, gitdir, inode, dryRun }) {
 // @ts-check
 
 async function resolveFilepath({ fs, cache, gitdir, oid, filepath }) {
+  const entry = await resolveFilepathEntry({
+    fs,
+    cache,
+    gitdir,
+    oid,
+    filepath,
+  });
+  return entry.oid
+}
+
+async function resolveFilepathEntry({
+  fs,
+  cache,
+  gitdir,
+  oid,
+  filepath,
+}) {
   // Ensure there are no leading or trailing directory separators.
   // I was going to do this automatically, but then found that the Git Terminal for Windows
   // auto-expands --filepath=/src/utils to --filepath=C:/Users/Will/AppData/Local/Programs/Git/src/utils
@@ -6321,10 +6338,10 @@ async function resolveFilepath({ fs, cache, gitdir, oid, filepath }) {
   const result = await resolveTree({ fs, cache, gitdir, oid });
   const tree = result.tree;
   if (filepath === '') {
-    oid = result.oid;
+    return { mode: '040000', oid: result.oid, path: '', type: 'tree' }
   } else {
     const pathArray = filepath.split('/');
-    oid = await _resolveFilepath({
+    return _resolveFilepath({
       fs,
       cache,
       gitdir,
@@ -6332,9 +6349,8 @@ async function resolveFilepath({ fs, cache, gitdir, oid, filepath }) {
       pathArray,
       oid: _oid,
       filepath,
-    });
+    })
   }
-  return oid
 }
 
 async function _resolveFilepath({
@@ -6350,7 +6366,7 @@ async function _resolveFilepath({
   for (const entry of tree) {
     if (entry.path === name) {
       if (pathArray.length === 0) {
-        return entry.oid
+        return entry
       } else {
         const { type, object } = await _readObject({
           fs,
@@ -9699,8 +9715,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.4',
-  agent: 'git/isomorphic-git@1.41.4',
+  version: '1.41.7',
+  agent: 'git/isomorphic-git@1.41.7',
 };
 
 class FIFO {
@@ -11196,44 +11212,70 @@ async function _findMergeBase({ fs, cache, gitdir, oids }) {
   // and computing virtual merge bases is just too much for me to fathom right now.
 
   // If we start N independent walkers, one at each of the given `oids`, and walk backwards
-  // through ancestors, eventually we'll discover a commit where each one of these N walkers
-  // has passed through. So we just need to keep track of which walkers have visited each commit
-  // until we find a commit that N distinct walkers has visited.
+  // through ancestors, eventually we'll discover commits where each one of these N walkers
+  // has passed through. We cannot stop at the first common commit because a better common
+  // ancestor may still be present in another branch of the graph.
   const visits = {};
   const passes = oids.length;
+  const common = new Set();
+  const parents = new Map();
+  const shallows = await GitShallowManager.read({ fs, gitdir });
+  const readParents = async oid => {
+    if (parents.has(oid)) return parents.get(oid)
+    const { object, type } = await _readObject({ fs, cache, gitdir, oid });
+    if (type !== 'commit') {
+      throw new ObjectTypeError(oid, type, 'commit')
+    }
+    const commit = GitCommit.from(object);
+    const { parent } = commit.parseHeaders();
+    const result = shallows.has(oid) ? [] : parent;
+    parents.set(oid, result);
+    return result
+  };
   let heads = oids.map((oid, index) => ({ index, oid }));
   while (heads.length) {
     // Count how many times we've passed each commit
-    const result = new Set();
     for (const { oid, index } of heads) {
+      await readParents(oid);
       if (!visits[oid]) visits[oid] = new Set();
       visits[oid].add(index);
       if (visits[oid].size === passes) {
-        result.add(oid);
+        common.add(oid);
       }
     }
-    if (result.size > 0) {
-      return [...result]
-    }
-    // We haven't found a common ancestor yet
     const newheads = new Map();
     for (const { oid, index } of heads) {
-      try {
-        const { object } = await _readObject({ fs, cache, gitdir, oid });
-        const commit = GitCommit.from(object);
-        const { parent } = commit.parseHeaders();
-        for (const oid of parent) {
-          if (!visits[oid] || !visits[oid].has(index)) {
-            newheads.set(oid + ':' + index, { oid, index });
-          }
+      // Parents of a common commit cannot be better merge bases.
+      if (common.has(oid)) continue
+      for (const parent of await readParents(oid)) {
+        if (!visits[parent] || !visits[parent].has(index)) {
+          newheads.set(parent + ':' + index, { oid: parent, index });
         }
-      } catch (err) {
-        // do nothing
       }
     }
     heads = Array.from(newheads.values());
   }
-  return []
+
+  if (common.size < 2) return [...common]
+
+  // A merge base is only "best" when it is not an ancestor of another
+  // common ancestor. This also keeps independent criss-cross bases.
+  const redundant = new Set();
+  for (const oid of common) {
+    const ancestors = [...(await readParents(oid))];
+    const seen = new Set();
+    while (ancestors.length) {
+      const ancestor = ancestors.pop();
+      if (seen.has(ancestor)) continue
+      seen.add(ancestor);
+      if (common.has(ancestor)) {
+        redundant.add(ancestor);
+      } else {
+        ancestors.push(...(await readParents(ancestor)));
+      }
+    }
+  }
+  return [...common].filter(oid => !redundant.has(oid))
 }
 
 // @ts-check
@@ -13314,6 +13356,7 @@ async function _log({
   const oid = await GitRefManager.resolve({ fs, gitdir, ref });
   const tips = [await _readCommit({ fs, cache, gitdir, oid })];
   let lastFileOid;
+  let lastFileMode;
   let lastCommit;
   let isOk;
 
@@ -13333,19 +13376,23 @@ async function _log({
     }
 
     if (filepath) {
-      let vFileOid;
+      let vFileEntry;
       try {
-        vFileOid = await resolveFilepath({
+        vFileEntry = await resolveFilepathEntry({
           fs,
           cache,
           gitdir,
           oid: commit.commit.tree,
           filepath,
         });
-        if (lastCommit && lastFileOid !== vFileOid) {
+        if (
+          lastCommit &&
+          (lastFileOid !== vFileEntry.oid || lastFileMode !== vFileEntry.mode)
+        ) {
           commits.push(lastCommit);
         }
-        lastFileOid = vFileOid;
+        lastFileOid = vFileEntry.oid;
+        lastFileMode = vFileEntry.mode;
         lastCommit = commit;
         isOk = true;
       } catch (e) {