isomorphic-git 1.41.5 → 1.41.8

package/README.md

@@ -109,7 +109,7 @@ import git from 'isomorphic-git'
 // or
 import * as git from 'isomorphic-git'
 // or
-import {plugins, clone, commit, push} from 'isomorphic-git'
+import {add, clone, commit, push} from 'isomorphic-git'
 ```
 
 View the full [Getting Started guide](https://isomorphic-git.github.io/docs/quickstart.html) on the docs website.

package/index.cjs

@@ -2365,6 +2365,38 @@ class GitRefManager {
     throw new NotFoundError(ref)
   }
 
+  /**
+   * Checks whether a ref names the branch HEAD points at in a repository where
+   * that branch has no commits yet.
+   *
+   * A repository created by `git init` has a HEAD pointing at a branch that
+   * does not exist on disk. Resolving that branch fails the same way resolving
+   * a misspelled ref does, so callers that want to treat the two differently
+   * need this to tell them apart.
+   *
+   * @param {Object} args
+   * @param {FSClient} args.fs - A file system implementation.
+   * @param {string} [args.gitdir=join(dir, '.git')] - [required] The [git directory](dir-vs-gitdir.md) path
+   * @param {string} args.ref - The ref to check.
+   * @returns {Promise<boolean>} - True if the ref names an unborn branch.
+   */
+  static async isUnbornBranch({ fs, gitdir, ref }) {
+    let target;
+    try {
+      // depth 2 stops at the symbolic target instead of following it to an oid.
+      target = await GitRefManager.resolve({
+        fs,
+        gitdir,
+        ref: 'HEAD',
+        depth: 2,
+      });
+    } catch (_) {
+      return false
+    }
+    if (!target.startsWith('refs/heads/')) return false
+    return ref === 'HEAD' || refpaths(ref).includes(target)
+  }
+
   /**
    * Checks if a ref exists.
    *
@@ -3651,6 +3683,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 +3746,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 {
@@ -4544,9 +4576,16 @@ class GitWalkerRepo {
       try {
         oid = await GitRefManager.resolve({ fs, gitdir, ref });
       } catch (e) {
-        if (e instanceof NotFoundError) {
-          // Handle fresh branches with no commits
+        // Only a branch that has no commits yet gets the empty tree. Anything
+        // else that fails to resolve is a ref the caller got wrong, and
+        // swallowing it here would walk an empty tree instead of saying so.
+        if (
+          e instanceof NotFoundError &&
+          (await GitRefManager.isUnbornBranch({ fs, gitdir, ref }))
+        ) {
           oid = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
+        } else {
+          throw e
         }
       }
       const tree = await resolveTree({ fs, cache: this.cache, gitdir, oid });
@@ -9728,8 +9767,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.5',
-  agent: 'git/isomorphic-git@1.41.5',
+  version: '1.41.8',
+  agent: 'git/isomorphic-git@1.41.8',
 };
 
 class FIFO {
@@ -11225,44 +11264,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

@@ -2358,6 +2358,38 @@ class GitRefManager {
     throw new NotFoundError(ref)
   }
 
+  /**
+   * Checks whether a ref names the branch HEAD points at in a repository where
+   * that branch has no commits yet.
+   *
+   * A repository created by `git init` has a HEAD pointing at a branch that
+   * does not exist on disk. Resolving that branch fails the same way resolving
+   * a misspelled ref does, so callers that want to treat the two differently
+   * need this to tell them apart.
+   *
+   * @param {Object} args
+   * @param {FSClient} args.fs - A file system implementation.
+   * @param {string} [args.gitdir=join(dir, '.git')] - [required] The [git directory](dir-vs-gitdir.md) path
+   * @param {string} args.ref - The ref to check.
+   * @returns {Promise<boolean>} - True if the ref names an unborn branch.
+   */
+  static async isUnbornBranch({ fs, gitdir, ref }) {
+    let target;
+    try {
+      // depth 2 stops at the symbolic target instead of following it to an oid.
+      target = await GitRefManager.resolve({
+        fs,
+        gitdir,
+        ref: 'HEAD',
+        depth: 2,
+      });
+    } catch (_) {
+      return false
+    }
+    if (!target.startsWith('refs/heads/')) return false
+    return ref === 'HEAD' || refpaths(ref).includes(target)
+  }
+
   /**
    * Checks if a ref exists.
    *
@@ -3638,6 +3670,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 +3733,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 {
@@ -4531,9 +4563,16 @@ class GitWalkerRepo {
       try {
         oid = await GitRefManager.resolve({ fs, gitdir, ref });
       } catch (e) {
-        if (e instanceof NotFoundError) {
-          // Handle fresh branches with no commits
+        // Only a branch that has no commits yet gets the empty tree. Anything
+        // else that fails to resolve is a ref the caller got wrong, and
+        // swallowing it here would walk an empty tree instead of saying so.
+        if (
+          e instanceof NotFoundError &&
+          (await GitRefManager.isUnbornBranch({ fs, gitdir, ref }))
+        ) {
           oid = '4b825dc642cb6eb9a060e54bf8d69288fbee4904';
+        } else {
+          throw e
         }
       }
       const tree = await resolveTree({ fs, cache: this.cache, gitdir, oid });
@@ -9715,8 +9754,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.41.5',
-  agent: 'git/isomorphic-git@1.41.5',
+  version: '1.41.8',
+  agent: 'git/isomorphic-git@1.41.8',
 };
 
 class FIFO {
@@ -11212,44 +11251,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