isomorphic-git 1.7.0 → 1.7.4

package/README.md

@@ -321,6 +321,10 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
     <td align="center"><a href="http://eaf4.com"><img src="https://avatars0.githubusercontent.com/u/319282?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Edward Faulkner</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=ef4" title="Code">💻</a></td>
     <td align="center"><a href="https://github.com/KSXGitHub"><img src="https://avatars2.githubusercontent.com/u/11488886?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Khải</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3AKSXGitHub" title="Bug reports">🐛</a></td>
     <td align="center"><a href="https://crutchcorn.dev/"><img src="https://avatars0.githubusercontent.com/u/9100169?v=4?s=60" width="60px;" alt=""/><br /><sub><b>Corbin Crutchley</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=crutchcorn" title="Code">💻</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=crutchcorn" title="Documentation">📖</a> <a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=crutchcorn" title="Tests">⚠️</a></td>
+    <td align="center"><a href="https://onetwo.ren/"><img src="https://avatars1.githubusercontent.com/u/3746270?v=4?s=60" width="60px;" alt=""/><br /><sub><b>lin onetwo</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/commits?author=linonetwo" title="Code">💻</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/linfaxin"><img src="https://avatars2.githubusercontent.com/u/3705017?v=4?s=60" width="60px;" alt=""/><br /><sub><b>林法鑫</b></sub></a><br /><a href="https://github.com/isomorphic-git/isomorphic-git/issues?q=author%3Alinfaxin" title="Bug reports">🐛</a></td>
   </tr>
 </table>
 

package/browser-tests.json

@@ -1,8 +1,8 @@
 [
   "HeadlessChrome 0.0.0 (Linux 0.0.0)",
-  "Firefox 77.0.0 (Ubuntu 0.0.0)",
-  "Chrome Mobile 80.0.3987 (Android 0.0.0)",
-  "Chrome 79.0.3945 (Windows 10 0.0.0)",
+  "Firefox 78.0.0 (Ubuntu 0.0.0)",
+  "Chrome Mobile 83.0.4103 (Android 0.0.0)",
   "Safari 13.1.0 (Mac OS X 10.15.4)",
+  "Chrome 79.0.3945 (Windows 10 0.0.0)",
   "Mobile Safari 13.0.0 (iOS 13.0.0)"
 ]

package/index.cjs

@@ -7,7 +7,6 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var AsyncLock = _interopDefault(require('async-lock'));
 var Hash = _interopDefault(require('sha.js/sha1.js'));
 var crc32 = _interopDefault(require('crc-32'));
-var applyDelta = _interopDefault(require('git-apply-delta'));
 var pako = _interopDefault(require('pako'));
 var ignore = _interopDefault(require('ignore'));
 var pify = _interopDefault(require('pify'));
@@ -382,6 +381,12 @@ class BufferCursor {
     return r
   }
 
+  copy(source, start, end) {
+    const r = source.copy(this.buffer, this._start, start, end);
+    this._start += r;
+    return r
+  }
+
   readUInt8() {
     const r = this.buffer.readUInt8(this._start);
     this._start += 1;
@@ -2103,6 +2108,91 @@ async function readObjectLoose({ fs, gitdir, oid }) {
   return { object: file, format: 'deflated', source }
 }
 
+/**
+ * @param {Buffer} delta
+ * @param {Buffer} source
+ * @returns {Buffer}
+ */
+function applyDelta(delta, source) {
+  const reader = new BufferCursor(delta);
+  const sourceSize = readVarIntLE(reader);
+
+  if (sourceSize !== source.byteLength) {
+    throw new InternalError(
+      `applyDelta expected source buffer to be ${sourceSize} bytes but the provided buffer was ${source.length} bytes`
+    )
+  }
+  const targetSize = readVarIntLE(reader);
+  let target;
+
+  const firstOp = readOp(reader, source);
+  // Speed optimization - return raw buffer if it's just single simple copy
+  if (firstOp.byteLength === targetSize) {
+    target = firstOp;
+  } else {
+    // Otherwise, allocate a fresh buffer and slices
+    target = Buffer.alloc(targetSize);
+    const writer = new BufferCursor(target);
+    writer.copy(firstOp);
+
+    while (!reader.eof()) {
+      writer.copy(readOp(reader, source));
+    }
+
+    const tell = writer.tell();
+    if (targetSize !== tell) {
+      throw new InternalError(
+        `applyDelta expected target buffer to be ${targetSize} bytes but the resulting buffer was ${tell} bytes`
+      )
+    }
+  }
+  return target
+}
+
+function readVarIntLE(reader) {
+  let result = 0;
+  let shift = 0;
+  let byte = null;
+  do {
+    byte = reader.readUInt8();
+    result |= (byte & 0b01111111) << shift;
+    shift += 7;
+  } while (byte & 0b10000000)
+  return result
+}
+
+function readCompactLE(reader, flags, size) {
+  let result = 0;
+  let shift = 0;
+  while (size--) {
+    if (flags & 0b00000001) {
+      result |= reader.readUInt8() << shift;
+    }
+    flags >>= 1;
+    shift += 8;
+  }
+  return result
+}
+
+function readOp(reader, source) {
+  /** @type {number} */
+  const byte = reader.readUInt8();
+  const COPY = 0b10000000;
+  const OFFS = 0b00001111;
+  const SIZE = 0b01110000;
+  if (byte & COPY) {
+    // copy consists of 4 byte offset, 3 byte size (in LE order)
+    const offset = readCompactLE(reader, byte & OFFS, 4);
+    let size = readCompactLE(reader, (byte & SIZE) >> 4, 3);
+    // Yup. They really did this optimization.
+    if (size === 0) size = 0x10000;
+    return source.slice(offset, offset + size)
+  } else {
+    // insert
+    return reader.slice(byte)
+  }
+}
+
 // Convert a value to an Async Iterator
 // This will be easier with async generator functions.
 function fromValue(value) {
@@ -6610,8 +6700,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.7.0',
-  agent: 'git/isomorphic-git@1.7.0',
+  version: '1.7.4',
+  agent: 'git/isomorphic-git@1.7.4',
 };
 
 class FIFO {
@@ -8555,6 +8645,7 @@ async function _pull({
     // Merge the remote tracking branch into the local one.
     await _merge({
       fs,
+      cache,
       gitdir,
       ours: ref,
       theirs: fetchHead,
@@ -9043,6 +9134,7 @@ async function getRemoteInfo({
     assertParameter('http', http);
     assertParameter('url', url);
 
+    const GitRemoteHTTP = GitRemoteManager.getRemoteHelperFor({ url });
     const remote = await GitRemoteHTTP.discover({
       http,
       onAuth,
@@ -9193,6 +9285,7 @@ async function getRemoteInfo2({
     assertParameter('http', http);
     assertParameter('url', url);
 
+    const GitRemoteHTTP = GitRemoteManager.getRemoteHelperFor({ url });
     const remote = await GitRemoteHTTP.discover({
       http,
       onAuth,
@@ -10701,8 +10794,9 @@ async function listObjects({
     } else if (type === 'tree') {
       const tree = GitTree.from(object);
       for (const entry of tree) {
-        // add blobs and submodules to the visited set
-        if (entry.type === 'blob' || entry.type === 'commit') {
+        // add blobs to the set
+        // skip over submodules whose type is 'commit'
+        if (entry.type === 'blob') {
           visited.add(entry.oid);
         }
         // recurse for trees

package/index.js

@@ -1,7 +1,6 @@
 import AsyncLock from 'async-lock';
 import Hash from 'sha.js/sha1.js';
 import crc32 from 'crc-32';
-import applyDelta from 'git-apply-delta';
 import pako from 'pako';
 import ignore from 'ignore';
 import pify from 'pify';
@@ -376,6 +375,12 @@ class BufferCursor {
     return r
   }
 
+  copy(source, start, end) {
+    const r = source.copy(this.buffer, this._start, start, end);
+    this._start += r;
+    return r
+  }
+
   readUInt8() {
     const r = this.buffer.readUInt8(this._start);
     this._start += 1;
@@ -2097,6 +2102,91 @@ async function readObjectLoose({ fs, gitdir, oid }) {
   return { object: file, format: 'deflated', source }
 }
 
+/**
+ * @param {Buffer} delta
+ * @param {Buffer} source
+ * @returns {Buffer}
+ */
+function applyDelta(delta, source) {
+  const reader = new BufferCursor(delta);
+  const sourceSize = readVarIntLE(reader);
+
+  if (sourceSize !== source.byteLength) {
+    throw new InternalError(
+      `applyDelta expected source buffer to be ${sourceSize} bytes but the provided buffer was ${source.length} bytes`
+    )
+  }
+  const targetSize = readVarIntLE(reader);
+  let target;
+
+  const firstOp = readOp(reader, source);
+  // Speed optimization - return raw buffer if it's just single simple copy
+  if (firstOp.byteLength === targetSize) {
+    target = firstOp;
+  } else {
+    // Otherwise, allocate a fresh buffer and slices
+    target = Buffer.alloc(targetSize);
+    const writer = new BufferCursor(target);
+    writer.copy(firstOp);
+
+    while (!reader.eof()) {
+      writer.copy(readOp(reader, source));
+    }
+
+    const tell = writer.tell();
+    if (targetSize !== tell) {
+      throw new InternalError(
+        `applyDelta expected target buffer to be ${targetSize} bytes but the resulting buffer was ${tell} bytes`
+      )
+    }
+  }
+  return target
+}
+
+function readVarIntLE(reader) {
+  let result = 0;
+  let shift = 0;
+  let byte = null;
+  do {
+    byte = reader.readUInt8();
+    result |= (byte & 0b01111111) << shift;
+    shift += 7;
+  } while (byte & 0b10000000)
+  return result
+}
+
+function readCompactLE(reader, flags, size) {
+  let result = 0;
+  let shift = 0;
+  while (size--) {
+    if (flags & 0b00000001) {
+      result |= reader.readUInt8() << shift;
+    }
+    flags >>= 1;
+    shift += 8;
+  }
+  return result
+}
+
+function readOp(reader, source) {
+  /** @type {number} */
+  const byte = reader.readUInt8();
+  const COPY = 0b10000000;
+  const OFFS = 0b00001111;
+  const SIZE = 0b01110000;
+  if (byte & COPY) {
+    // copy consists of 4 byte offset, 3 byte size (in LE order)
+    const offset = readCompactLE(reader, byte & OFFS, 4);
+    let size = readCompactLE(reader, (byte & SIZE) >> 4, 3);
+    // Yup. They really did this optimization.
+    if (size === 0) size = 0x10000;
+    return source.slice(offset, offset + size)
+  } else {
+    // insert
+    return reader.slice(byte)
+  }
+}
+
 // Convert a value to an Async Iterator
 // This will be easier with async generator functions.
 function fromValue(value) {
@@ -6604,8 +6694,8 @@ function filterCapabilities(server, client) {
 
 const pkg = {
   name: 'isomorphic-git',
-  version: '1.7.0',
-  agent: 'git/isomorphic-git@1.7.0',
+  version: '1.7.4',
+  agent: 'git/isomorphic-git@1.7.4',
 };
 
 class FIFO {
@@ -8549,6 +8639,7 @@ async function _pull({
     // Merge the remote tracking branch into the local one.
     await _merge({
       fs,
+      cache,
       gitdir,
       ours: ref,
       theirs: fetchHead,
@@ -9037,6 +9128,7 @@ async function getRemoteInfo({
     assertParameter('http', http);
     assertParameter('url', url);
 
+    const GitRemoteHTTP = GitRemoteManager.getRemoteHelperFor({ url });
     const remote = await GitRemoteHTTP.discover({
       http,
       onAuth,
@@ -9187,6 +9279,7 @@ async function getRemoteInfo2({
     assertParameter('http', http);
     assertParameter('url', url);
 
+    const GitRemoteHTTP = GitRemoteManager.getRemoteHelperFor({ url });
     const remote = await GitRemoteHTTP.discover({
       http,
       onAuth,
@@ -10695,8 +10788,9 @@ async function listObjects({
     } else if (type === 'tree') {
       const tree = GitTree.from(object);
       for (const entry of tree) {
-        // add blobs and submodules to the visited set
-        if (entry.type === 'blob' || entry.type === 'commit') {
+        // add blobs to the set
+        // skip over submodules whose type is 'commit'
+        if (entry.type === 'blob') {
           visited.add(entry.oid);
         }
         // recurse for trees