Merge pull request #91 from qoomon/copilot/incremental-commit-tree-build

Build commit tree incrementally to avoid timeouts on large commits

Author: qoomon

dist/index.js

@@ -38203,7 +38203,7 @@ async function getCachedObjectSha(path) {
 async function createCommit(octokit, repository, args) {
     let commitTreeSha = args.tree;
     if (args.files.length > 0) {
-        console.log('Creating commit tree...');
+        console.log('Creating blobs...');
         let progress = 0;
         const commitTreeBlobs = await Promise.all(args.files.map(async ({ path, mode, status, loadContent }) => (async function () {
             switch (status) {
@@ -38240,14 +38240,22 @@ async function createCommit(octokit, repository, args) {
         })().finally(() => {
             progress++;
             // log progress
-            console.log(`${progress} of ${args.files.length} files...`);
+            console.log(`  ${progress} of ${args.files.length} files...`);
         })));
-        commitTreeSha = await octokit.rest.git.createTree({
-            ...repository,
-            base_tree: args.parents[0],
-            tree: commitTreeBlobs,
-        }).then(({ data }) => data.sha);
-        console.log('Creating commit tree done.', commitTreeSha);
+        console.log('Creating commit tree...');
+        const chunkSize = 100;
+        for (let i = 0; i < commitTreeBlobs.length; i += chunkSize) {
+            const chunk = commitTreeBlobs.slice(i, i + chunkSize);
+            commitTreeSha = await octokit.rest.git.createTree({
+                ...repository,
+                base_tree: commitTreeSha,
+                tree: chunk,
+            }).then(({ data }) => data.sha).finally(() => {
+                progress++;
+                // log progress
+                console.log(`  ${progress} of ${args.files.length} blobs...`);
+            });
+        }
     }
     console.log('Creating commit...');
     const commit = await octokit.rest.git.createCommit({

lib/github.ts

@@ -15,7 +15,7 @@ export async function createCommit(
 ) {
   let commitTreeSha = args.tree
   if (args.files.length > 0) {
-    console.log('Creating commit tree...')
+    console.log('Creating blobs...')
     let progress = 0
     const commitTreeBlobs = await Promise.all(args.files.map(async ({path, mode, status, loadContent}) => (async function(){
         switch (status) {
@@ -53,17 +53,24 @@ export async function createCommit(
       })().finally(() => {
         progress++;
         // log progress
-        console.log(`${progress} of ${args.files.length} files...`)
+        console.log(`  ${progress} of ${args.files.length} files...`)
       })
     ))
+    console.log('Creating commit tree...')
+    const chunkSize = 100
 
-    commitTreeSha = await octokit.rest.git.createTree({
-      ...repository,
-      base_tree: args.parents[0],
-      tree: commitTreeBlobs,
-    }).then(({data}) => data.sha)
-
-    console.log('Creating commit tree done.', commitTreeSha)
+    for (let i = 0; i < commitTreeBlobs.length; i += chunkSize) {
+      const chunk = commitTreeBlobs.slice(i, i + chunkSize)
+      commitTreeSha = await octokit.rest.git.createTree({
+        ...repository,
+        base_tree: commitTreeSha,
+        tree: chunk,
+      }).then(({data}) => data.sha).finally(() => {
+        progress++;
+        // log progress
+        console.log(`  ${progress} of ${args.files.length} blobs...`)
+      })
+    }
   }
 
   console.log('Creating commit...')