hologit 0.49.0 → 0.49.1

package/lib/BlobObject.js

@@ -3,7 +3,7 @@ class BlobObject {
 
     static async write (repo, content) {
         const git = await repo.getGit();
-        const hash = await git.hashObjectInternally(content, { write: true });
+        const hash = await git.$putBlob(content);
 
         return new BlobObject(repo, { hash });
     }
@@ -36,7 +36,7 @@ class BlobObject {
 
     async read () {
         const git = await this.repo.getGit();
-        return git.catFile({ p: true }, this.hash);
+        return git.$getBlob(this.hash);
     }
 }
 

package/lib/Lens.js

@@ -261,7 +261,7 @@ class Lens extends Configurable {
 
 
         // determine spec type from content
-        const specToml = await git.catFile({ p: true }, specHash);
+        const specToml = await git.$getBlob(specHash);
         const { holospec: { lens: spec } } = TOML.parse(specToml);
         const specType = spec.container ? 'container' : spec.package ? 'habitat' : null;
 
@@ -319,7 +319,7 @@ class Lens extends Configurable {
         const git = await repo.getGit();
 
         // read and parse spec file
-        const specToml = await git.catFile({ p: true }, specHash);
+        const specToml = await git.$getBlob(specHash);
         const {
             holospec: {
                 lens: spec
@@ -474,7 +474,7 @@ class Lens extends Configurable {
             }
         } else {
             // load spec
-            const specToml = await git.catFile({ p: true }, specHash);
+            const specToml = await git.$getBlob(specHash);
             const {
                 holospec: {
                     lens: spec

package/lib/Repo.js

@@ -157,7 +157,7 @@ class Repo {
      */
     async hasCommit (commit) {
         const git = await this.getGit();
-        return 'commit' == await git.catFile({ t: true }, commit, { $nullOnError: true });
+        return 'commit' == await git.$objectExists(commit);
     }
 
     async hashWorkTree () {

package/lib/TreeObject.js

@@ -128,21 +128,20 @@ class TreeObject {
         if (!cachedHashChildren) {
             cachedHashChildren = {};
 
-            const treeLines = (await git.lsTree(preloadChildren ? { r: true, t: true, z: true, 'full-tree': true } : { z: true, 'full-tree': true }, this.hash)).split('\0');
-            const preloadedTrees = {};
-
-            for (const treeLine of treeLines) {
-                if (!treeLine) {
-                    continue;
-                }
+            if (preloadChildren) {
+                // recursive ls-tree: one subprocess call to load the entire tree hierarchy
+                const treeLines = (await git.lsTree({ r: true, t: true, z: true, 'full-tree': true }, this.hash)).split('\0');
+                const preloadedTrees = {};
 
-                const [, mode, type, hash, childPath] = treeLineRe.exec(treeLine);
+                for (const treeLine of treeLines) {
+                    if (!treeLine) {
+                        continue;
+                    }
 
-                if (preloadChildren) {
+                    const [, mode, type, hash, childPath] = treeLineRe.exec(treeLine);
                     const parentTreePathLength = childPath.lastIndexOf('/');
 
                     if (type == 'tree') {
-                        // any tree listed will have children, begin cache entry
                         preloadedTrees[childPath] = {
                             hash,
                             children: {}
@@ -150,31 +149,32 @@ class TreeObject {
                     }
 
                     if (parentTreePathLength == -1) {
-                        // direct child, add to current result
                         cachedHashChildren[childPath] = { type, hash, mode };
                     } else {
                         preloadedTrees[childPath.substr(0, parentTreePathLength)]
                             .children[childPath.substr(parentTreePathLength+1)] = { type, hash, mode };
                     }
-                } else {
-                    cachedHashChildren[childPath] = { type, hash, mode };
                 }
-            }
 
-            cacheWrite(this.hash, cachedHashChildren);
-
-            // populate git-client's known-objects cache
-            for (const name in cachedHashChildren) {
-                git.knowObject(cachedHashChildren[name].hash);
-            }
+                // populate git-client's known-objects cache
+                for (const name in cachedHashChildren) {
+                    git.$knowObject(cachedHashChildren[name].hash);
+                }
 
-            if (preloadChildren) {
                 for (const treePath in preloadedTrees) {
                     const tree = preloadedTrees[treePath];
                     cacheWrite(tree.hash, tree.children);
-                    git.knowObject(tree.hash);
+                    git.$knowObject(tree.hash);
+                }
+            } else {
+                // non-recursive: read single tree level via cat-file --batch
+                const entries = await git.$getTree(this.hash);
+                for (const { mode, type, hash, name } of entries) {
+                    cachedHashChildren[name] = { type, hash, mode };
                 }
             }
+
+            cacheWrite(this.hash, cachedHashChildren);
         }
 
 
@@ -382,7 +382,7 @@ class TreeObject {
             this.hash = EMPTY_TREE_HASH;
         } else {
             const git = await this.repo.getGit();
-            this.hash = await git.mktreeNative(lines);
+            this.hash = await git.$putTree(lines);
             stats.treesWritten++;
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hologit",
-  "version": "0.49.0",
+  "version": "0.49.1",
   "description": "Hologit automates the projection of layered composite file trees based on flat, declarative plans",
   "repository": "https://github.com/JarvusInnovations/hologit",
   "main": "lib/index.js",
@@ -15,7 +15,7 @@
     "chokidar": "^5.0.0",
     "debounce": "^3.0.0",
     "fb-watchman": "^2.0.2",
-    "git-client": "^1.10.1",
+    "git-client": "^1.11.0",
     "hab-client": "^1.1.3",
     "handlebars": "^4.7.8",
     "minimatch": "^10.2.4",