Refactor GitClient to use a unified exec method for executing git com…

…mands
microsoft · Sep 30, 2024 · 682c2d3 · 682c2d3
1 parent 81f2cb5
commit 682c2d3
Show file tree

Hide file tree

Showing 20 changed files with 131 additions and 8 deletions.
diff --git a/docs/genaisrc/genaiscript.d.ts b/docs/genaisrc/genaiscript.d.ts
diff --git a/genaisrc/genaiscript.d.ts b/genaisrc/genaiscript.d.ts
diff --git a/packages/auto/genaiscript.d.ts b/packages/auto/genaiscript.d.ts
diff --git a/packages/core/src/genaisrc/genaiscript.d.ts b/packages/core/src/genaisrc/genaiscript.d.ts
diff --git a/packages/core/src/git.ts b/packages/core/src/git.ts
@@ -1,6 +1,7 @@
 import { resolveFileContents } from "./file"
 import { isGlobMatch } from "./glob"
 import { runtimeHost } from "./host"
+import { shellParse } from "./shell"
 import { arrayify } from "./util"
 
 export class GitClient implements Git {
@@ -10,20 +11,31 @@ export class GitClient implements Git {
     async defaultBranch(): Promise<string> {
         if (!this._defaultBranch) {
             const res = (
-                await runtimeHost.exec(
-                    undefined,
-                    this.git,
+                await this.exec(
                     ["symbolic-ref", "refs/remotes/origin/HEAD"],
                     {}
                 )
-            ).stdout
+            )
                 .replace("refs/remotes/origin/", "")
                 .trim()
             this._defaultBranch = res
         }
         return this._defaultBranch
     }
 
+    async exec(
+        args: string | string[],
+        options?: { label?: string }
+    ): Promise<string> {
+        const res = await runtimeHost.exec(
+            undefined,
+            this.git,
+            Array.isArray(args) ? args : shellParse(args),
+            options
+        )
+        return res.stdout
+    }
+
     async findModifiedFiles(
         scope: "branch" | "staged" | "modified",
         options?: {
@@ -49,18 +61,18 @@ export class GitClient implements Git {
                 args.push(...paths)
                 args.push(...excludedPaths.map((p) => ":!" + p))
             }
-            const res = await runtimeHost.exec(undefined, this.git, args, {
+            const res = await this.exec(args, {
                 label: `git list modified files in ${scope}`,
             })
-            filenames = res.stdout.split("\n").filter((f) => f)
+            filenames = res.split("\n").filter((f) => f)
         } else {
             // ignore deleted files
             const rx = /^\s*(A|M|\?{1,2})\s+/gm
             const args = ["status", "--porcelain"]
-            const res = await runtimeHost.exec(undefined, this.git, args, {
+            const res = await this.exec(args, {
                 label: `git list modified files`,
             })
-            filenames = res.stdout
+            filenames = res
                 .split("\n")
                 .filter((f) => rx.test(f))
                 .map((f) => f.replace(rx, "").trim())

diff --git a/packages/core/src/types/prompt_template.d.ts b/packages/core/src/types/prompt_template.d.ts
@@ -1279,6 +1279,12 @@ interface Git {
      */
     defaultBranch(): Promise<string>
 
+    /**
+     * Executes a git command in the repository and returns the stdout
+     * @param cmd
+     */
+    exec(args: string[] | string, options?: { label?: string }): Promise<string>
+
     /**
      * Finds specific files in the git repository.
      * By default, work

diff --git a/packages/sample/genaisrc/blog/genaiscript.d.ts b/packages/sample/genaisrc/blog/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/genaiscript.d.ts b/packages/sample/genaisrc/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/git.genai.mts b/packages/sample/genaisrc/git.genai.mts
@@ -1,3 +1,6 @@
+const defaultBranch = await git.defaultBranch()
+console.log({ defaultBranch })
+
 const mods = await git.findModifiedFiles("modified", {
     paths: ["**/*.ts"],
     excludedPaths: ["**/genaiscript.d.ts"],

diff --git a/packages/sample/genaisrc/node/genaiscript.d.ts b/packages/sample/genaisrc/node/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/python/genaiscript.d.ts b/packages/sample/genaisrc/python/genaiscript.d.ts
diff --git a/packages/sample/genaisrc/style/genaiscript.d.ts b/packages/sample/genaisrc/style/genaiscript.d.ts
diff --git a/packages/sample/src/aici/genaiscript.d.ts b/packages/sample/src/aici/genaiscript.d.ts
diff --git a/packages/sample/src/errors/genaiscript.d.ts b/packages/sample/src/errors/genaiscript.d.ts
diff --git a/packages/sample/src/genaiscript.d.ts b/packages/sample/src/genaiscript.d.ts
diff --git a/packages/sample/src/makecode/genaiscript.d.ts b/packages/sample/src/makecode/genaiscript.d.ts
diff --git a/packages/sample/src/tla/genaiscript.d.ts b/packages/sample/src/tla/genaiscript.d.ts
diff --git a/packages/sample/src/vision/genaiscript.d.ts b/packages/sample/src/vision/genaiscript.d.ts
diff --git a/packages/vscode/genaisrc/genaiscript.d.ts b/packages/vscode/genaisrc/genaiscript.d.ts
diff --git a/slides/genaisrc/genaiscript.d.ts b/slides/genaisrc/genaiscript.d.ts