isomorphic-git 1.41.5 → 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 {
@@ -9728,8 +9728,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.5',
-  agent: 'git/isomorphic-git@1.41.5',
+  version: '1.41.7',
+  agent: 'git/isomorphic-git@1.41.7',
 };
 
 class FIFO {
@@ -11225,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

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 {
@@ -9715,8 +9715,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.5',
-  agent: 'git/isomorphic-git@1.41.5',
+  version: '1.41.7',
+  agent: 'git/isomorphic-git@1.41.7',
 };
 
 class FIFO {
@@ -11212,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