isomorphic-git 1.24.4 → 1.25.0

package/README.md

@@ -363,6 +363,9 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <td align="center"><a href="https://github.com/barry963"><img src="https://avatars.githubusercontent.com/u/5289896?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Barry</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=barry963" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=barry963" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=barry963" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://stackoverflow.com/users/1493081/alireza-mirian"><img src="https://avatars.githubusercontent.com/u/3150694?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Alireza Mirian</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=alirezamirian" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=alirezamirian" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=alirezamirian" title="Tests">⚠️</a> <a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Aalirezamirian" title="Bug reports">🐛</a></td>
   </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/DanilKazanov"><img src="https://avatars.githubusercontent.com/u/139755256?v=4?s=60" width="60px;" alt=""/><br /><sub><b>DanilKazanov</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=DanilKazanov" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=DanilKazanov" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=DanilKazanov" title="Tests">⚠️</a></td>
+  </tr>
 </table>
 
 <!-- markdownlint-restore -->

package/browser-tests.json

@@ -1,12 +1,12 @@
 [
-  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Firefox 115.0 (Ubuntu 0.0.0)",
-  "X Chrome 114.0.0.0 (Android 10)",
-  "Safari 13.1 (Mac OS 10.15.4)",
-  "Mobile Safari 13.0 (iOS 13.0)",
+  "X Chrome Headless 79.0.3945.0 (Linux x86_64)",
+  "Firefox 119.0 (Ubuntu 0.0.0)",
+  "Chrome 117.0.0.0 (Android 10)",
   "Edge 79.0.309.65 (Windows 10)",
+  "X Safari 13.1 (Mac OS 10.15.4)",
+  "X Mobile Safari 13.0 (iOS 13.0)",
   "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "X Chrome 114.0.0.0 (Android 10)",
-  "Chrome Headless 79.0.3945.0 (Linux x86_64)",
-  "Chrome 114.0.0.0 (Android 10)"
+  "Chrome 117.0.0.0 (Android 10)",
+  "Safari 13.1 (Mac OS 10.15.4)",
+  "Mobile Safari 13.0 (iOS 13.0)"
 ]

package/index.cjs

@@ -3312,13 +3312,16 @@ MergeNotSupportedError.code = 'MergeNotSupportedError';
 class MergeConflictError extends BaseError {
   /**
    * @param {Array<string>} filepaths
+   * @param {Array<string>} bothModified
+   * @param {Array<string>} deleteByUs
+   * @param {Array<string>} deleteByTheirs
    */
-  constructor(filepaths) {
+  constructor(filepaths, bothModified, deleteByUs, deleteByTheirs) {
     super(
       `Automatic merge failed with one or more merge conflicts in the following files: ${filepaths.toString()}. Fix conflicts then commit the result.`
     );
     this.code = this.name = MergeConflictError.code;
-    this.data = { filepaths };
+    this.data = { filepaths, bothModified, deleteByUs, deleteByTheirs };
   }
 }
 /** @type {'MergeConflictError'} */
@@ -7313,8 +7316,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.24.4',
-  agent: 'git/isomorphic-git@1.24.4',
+  version: '1.25.0',
+  agent: 'git/isomorphic-git@1.25.0',
 };
 
 class FIFO {
@@ -8637,15 +8640,20 @@ async function _expandOid({ fs, cache, gitdir, oid: short }) {
   // process can acquire external ref-deltas.
   const getExternalRefDelta = oid => _readObject({ fs, cache, gitdir, oid });
 
-  const results1 = await expandOidLoose({ fs, gitdir, oid: short });
-  const results2 = await expandOidPacked({
+  const results = await expandOidLoose({ fs, gitdir, oid: short });
+  const packedOids = await expandOidPacked({
     fs,
     cache,
     gitdir,
     oid: short,
     getExternalRefDelta,
   });
-  const results = results1.concat(results2);
+  // Objects can exist in a pack file as well as loose, make sure we only get a list of unique oids.
+  for (const packedOid of packedOids) {
+    if (results.indexOf(packedOid) === -1) {
+      results.push(packedOid);
+    }
+  }
 
   if (results.length === 1) {
     return results[0]
@@ -8873,6 +8881,9 @@ async function mergeTree({
   const theirTree = TREE({ ref: theirOid });
 
   const unmergedFiles = [];
+  const bothModified = [];
+  const deleteByUs = [];
+  const deleteByTheirs = [];
 
   const results = await _walk({
     fs,
@@ -8938,6 +8949,7 @@ async function mergeTree({
             }).then(async r => {
               if (!r.cleanMerge) {
                 unmergedFiles.push(filepath);
+                bothModified.push(filepath);
                 if (!abortOnConflict) {
                   const baseOid = await base.oid();
                   const ourOid = await ours.oid();
@@ -8955,8 +8967,70 @@ async function mergeTree({
               return r.mergeResult
             })
           }
+
+          // deleted by us
+          if (
+            base &&
+            !ours &&
+            theirs &&
+            (await base.type()) === 'blob' &&
+            (await theirs.type()) === 'blob'
+          ) {
+            unmergedFiles.push(filepath);
+            deleteByUs.push(filepath);
+            if (!abortOnConflict) {
+              const baseOid = await base.oid();
+              const theirOid = await theirs.oid();
+
+              index.delete({ filepath });
+
+              index.insert({ filepath, oid: baseOid, stage: 1 });
+              index.insert({ filepath, oid: theirOid, stage: 3 });
+            }
+
+            return {
+              mode: await theirs.mode(),
+              oid: await theirs.oid(),
+              type: 'blob',
+              path,
+            }
+          }
+
+          // deleted by theirs
+          if (
+            base &&
+            ours &&
+            !theirs &&
+            (await base.type()) === 'blob' &&
+            (await ours.type()) === 'blob'
+          ) {
+            unmergedFiles.push(filepath);
+            deleteByTheirs.push(filepath);
+            if (!abortOnConflict) {
+              const baseOid = await base.oid();
+              const ourOid = await ours.oid();
+
+              index.delete({ filepath });
+
+              index.insert({ filepath, oid: baseOid, stage: 1 });
+              index.insert({ filepath, oid: ourOid, stage: 2 });
+            }
+
+            return {
+              mode: await ours.mode(),
+              oid: await ours.oid(),
+              type: 'blob',
+              path,
+            }
+          }
+
+          // deleted by both
+          if (base && !ours && !theirs && (await base.type()) === 'blob') {
+            return undefined
+          }
+
           // all other types of conflicts fail
-          // TODO: Merge conflicts involving deletions/additions
+          // TODO: Merge conflicts involving additions
           throw new MergeNotSupportedError()
         }
       }
@@ -9012,7 +9086,12 @@ async function mergeTree({
         },
       });
     }
-    return new MergeConflictError(unmergedFiles)
+    return new MergeConflictError(
+      unmergedFiles,
+      bothModified,
+      deleteByUs,
+      deleteByTheirs
+    )
   }
 
   return results.oid

package/index.d.ts

@@ -3981,12 +3981,18 @@ declare namespace MergeNotSupportedError {
 declare class MergeConflictError extends BaseError {
     /**
      * @param {Array<string>} filepaths
+     * @param {Array<string>} bothModified
+     * @param {Array<string>} deleteByUs
+     * @param {Array<string>} deleteByTheirs
      */
-    constructor(filepaths: string[]);
+    constructor(filepaths: string[], bothModified: string[], deleteByUs: string[], deleteByTheirs: string[]);
     code: "MergeConflictError";
     name: "MergeConflictError";
     data: {
         filepaths: string[];
+        bothModified: string[];
+        deleteByUs: string[];
+        deleteByTheirs: string[];
     };
 }
 declare namespace MergeConflictError {

package/index.js

@@ -3306,13 +3306,16 @@ MergeNotSupportedError.code = 'MergeNotSupportedError';
 class MergeConflictError extends BaseError {
   /**
    * @param {Array<string>} filepaths
+   * @param {Array<string>} bothModified
+   * @param {Array<string>} deleteByUs
+   * @param {Array<string>} deleteByTheirs
    */
-  constructor(filepaths) {
+  constructor(filepaths, bothModified, deleteByUs, deleteByTheirs) {
     super(
       `Automatic merge failed with one or more merge conflicts in the following files: ${filepaths.toString()}. Fix conflicts then commit the result.`
     );
     this.code = this.name = MergeConflictError.code;
-    this.data = { filepaths };
+    this.data = { filepaths, bothModified, deleteByUs, deleteByTheirs };
   }
 }
 /** @type {'MergeConflictError'} */
@@ -7307,8 +7310,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.24.4',
-  agent: 'git/isomorphic-git@1.24.4',
+  version: '1.25.0',
+  agent: 'git/isomorphic-git@1.25.0',
 };
 
 class FIFO {
@@ -8631,15 +8634,20 @@ async function _expandOid({ fs, cache, gitdir, oid: short }) {
   // process can acquire external ref-deltas.
   const getExternalRefDelta = oid => _readObject({ fs, cache, gitdir, oid });
 
-  const results1 = await expandOidLoose({ fs, gitdir, oid: short });
-  const results2 = await expandOidPacked({
+  const results = await expandOidLoose({ fs, gitdir, oid: short });
+  const packedOids = await expandOidPacked({
     fs,
     cache,
     gitdir,
     oid: short,
     getExternalRefDelta,
   });
-  const results = results1.concat(results2);
+  // Objects can exist in a pack file as well as loose, make sure we only get a list of unique oids.
+  for (const packedOid of packedOids) {
+    if (results.indexOf(packedOid) === -1) {
+      results.push(packedOid);
+    }
+  }
 
   if (results.length === 1) {
     return results[0]
@@ -8867,6 +8875,9 @@ async function mergeTree({
   const theirTree = TREE({ ref: theirOid });
 
   const unmergedFiles = [];
+  const bothModified = [];
+  const deleteByUs = [];
+  const deleteByTheirs = [];
 
   const results = await _walk({
     fs,
@@ -8932,6 +8943,7 @@ async function mergeTree({
             }).then(async r => {
               if (!r.cleanMerge) {
                 unmergedFiles.push(filepath);
+                bothModified.push(filepath);
                 if (!abortOnConflict) {
                   const baseOid = await base.oid();
                   const ourOid = await ours.oid();
@@ -8949,8 +8961,70 @@ async function mergeTree({
               return r.mergeResult
             })
           }
+
+          // deleted by us
+          if (
+            base &&
+            !ours &&
+            theirs &&
+            (await base.type()) === 'blob' &&
+            (await theirs.type()) === 'blob'
+          ) {
+            unmergedFiles.push(filepath);
+            deleteByUs.push(filepath);
+            if (!abortOnConflict) {
+              const baseOid = await base.oid();
+              const theirOid = await theirs.oid();
+
+              index.delete({ filepath });
+
+              index.insert({ filepath, oid: baseOid, stage: 1 });
+              index.insert({ filepath, oid: theirOid, stage: 3 });
+            }
+
+            return {
+              mode: await theirs.mode(),
+              oid: await theirs.oid(),
+              type: 'blob',
+              path,
+            }
+          }
+
+          // deleted by theirs
+          if (
+            base &&
+            ours &&
+            !theirs &&
+            (await base.type()) === 'blob' &&
+            (await ours.type()) === 'blob'
+          ) {
+            unmergedFiles.push(filepath);
+            deleteByTheirs.push(filepath);
+            if (!abortOnConflict) {
+              const baseOid = await base.oid();
+              const ourOid = await ours.oid();
+
+              index.delete({ filepath });
+
+              index.insert({ filepath, oid: baseOid, stage: 1 });
+              index.insert({ filepath, oid: ourOid, stage: 2 });
+            }
+
+            return {
+              mode: await ours.mode(),
+              oid: await ours.oid(),
+              type: 'blob',
+              path,
+            }
+          }
+
+          // deleted by both
+          if (base && !ours && !theirs && (await base.type()) === 'blob') {
+            return undefined
+          }
+
           // all other types of conflicts fail
-          // TODO: Merge conflicts involving deletions/additions
+          // TODO: Merge conflicts involving additions
           throw new MergeNotSupportedError()
         }
       }
@@ -9006,7 +9080,12 @@ async function mergeTree({
         },
       });
     }
-    return new MergeConflictError(unmergedFiles)
+    return new MergeConflictError(
+      unmergedFiles,
+      bothModified,
+      deleteByUs,
+      deleteByTheirs
+    )
   }
 
   return results.oid

package/index.umd.min.d.ts

@@ -3981,12 +3981,18 @@ declare namespace MergeNotSupportedError {
 declare class MergeConflictError extends BaseError {
     /**
      * @param {Array<string>} filepaths
+     * @param {Array<string>} bothModified
+     * @param {Array<string>} deleteByUs
+     * @param {Array<string>} deleteByTheirs
      */
-    constructor(filepaths: string[]);
+    constructor(filepaths: string[], bothModified: string[], deleteByUs: string[], deleteByTheirs: string[]);
     code: "MergeConflictError";
     name: "MergeConflictError";
     data: {
         filepaths: string[];
+        bothModified: string[];
+        deleteByUs: string[];
+        deleteByTheirs: string[];
     };
 }
 declare namespace MergeConflictError {