@dotobokuri/fleet-console 1.45.0 → 1.46.0

package/dist/fleet-plugins/repository/routes.mjs

@@ -427,7 +427,7 @@ async function handleRepositoryFile(req, res, ctx) {
         return;
       }
       const result2 = await runGit(
-        ["diff", "--no-index", "--relative", "--unified=3", "--", "/dev/null", relativePath],
+        ["diff", "--no-ext-diff", "--no-textconv", "--no-index", "--relative", "--unified=3", "--", "/dev/null", relativePath],
         { cwd: gitCwd, allowExitCodes: [1] }
       );
       ctx.host.http.writeJson(res, 200, { content: result2.stdout, truncated: result2.truncated });
@@ -446,10 +446,10 @@ async function handleRepositoryFile(req, res, ctx) {
     }
     let result;
     try {
-      result = await runGit(["diff", "HEAD", "--relative", "--unified=3", "--", literalPathspec(relativePath)], { cwd: gitCwd });
+      result = await runGit(["diff", "--no-ext-diff", "--no-textconv", "HEAD", "--relative", "--unified=3", "--", literalPathspec(relativePath)], { cwd: gitCwd });
     } catch (err) {
       if (!isNoHeadError(err)) throw err;
-      result = await runGit(["diff", "--cached", "--relative", "--unified=3", "--", literalPathspec(relativePath)], { cwd: gitCwd });
+      result = await runGit(["diff", "--no-ext-diff", "--no-textconv", "--cached", "--relative", "--unified=3", "--", literalPathspec(relativePath)], { cwd: gitCwd });
     }
     ctx.host.http.writeJson(res, 200, { content: result.stdout, truncated: result.truncated });
   } catch (error) {
@@ -614,7 +614,7 @@ async function handleRepositoryCommitFile(req, res, ctx) {
     return;
   }
   try {
-    const result = await runGit(oldPath ? ["show", "--first-parent", body.ref, "-M", "--format=", "--unified=3", "--", literalPathspec2(oldPath), literalPathspec2(relativePath)] : ["show", "--first-parent", body.ref, "--format=", "--unified=3", "--", literalPathspec2(relativePath)], { cwd: cwdResult.gitCwd });
+    const result = await runGit(oldPath ? ["show", "--no-ext-diff", "--no-textconv", "--first-parent", body.ref, "-M", "--format=", "--unified=3", "--", literalPathspec2(oldPath), literalPathspec2(relativePath)] : ["show", "--no-ext-diff", "--no-textconv", "--first-parent", body.ref, "--format=", "--unified=3", "--", literalPathspec2(relativePath)], { cwd: cwdResult.gitCwd });
     ctx.host.http.writeJson(res, 200, { content: result.stdout, ...result.truncated ? { truncated: true } : {} });
   } catch (error) {
     if (error instanceof GitExecutorError) {
@@ -803,7 +803,7 @@ async function handleRepositoryCompareFile(req, res, ctx) {
   }
   const range = `${body.base}...${body.head}`;
   try {
-    const result = await runGit(oldPath ? ["diff", "--unified=3", "-M", "--end-of-options", range, "--", literalPathspec3(oldPath), literalPathspec3(relativePath)] : ["diff", "--unified=3", "-M", "--end-of-options", range, "--", literalPathspec3(relativePath)], { cwd: cwdResult.gitCwd });
+    const result = await runGit(oldPath ? ["diff", "--no-ext-diff", "--no-textconv", "--unified=3", "-M", "--end-of-options", range, "--", literalPathspec3(oldPath), literalPathspec3(relativePath)] : ["diff", "--no-ext-diff", "--no-textconv", "--unified=3", "-M", "--end-of-options", range, "--", literalPathspec3(relativePath)], { cwd: cwdResult.gitCwd });
     ctx.host.http.writeJson(res, 200, { content: result.stdout, ...result.truncated ? { truncated: true } : {} });
   } catch (error) {
     if (error instanceof GitExecutorError) {
@@ -1271,6 +1271,18 @@ function parseRefItems(stdout, current) {
     return ref && label ? [{ ref, label, current: ref === current }] : [];
   });
 }
+function resolveDefaultBase(input) {
+  const originHead = input.originHead.trim();
+  const match = /^refs\/remotes\/origin\/(.+)$/.exec(originHead);
+  if (match) {
+    const localRef = `refs/heads/${match[1]}`;
+    if (input.branches.some((item) => item.ref === localRef)) return localRef;
+    if (input.remotes.some((item) => item.ref === originHead)) return originHead;
+  }
+  if (input.branches.some((item) => item.ref === "refs/heads/main")) return "refs/heads/main";
+  if (input.branches.some((item) => item.ref === "refs/heads/master")) return "refs/heads/master";
+  return null;
+}
 async function readStashes(gitCwd) {
   try {
     return (await runGit(["stash", "list", "--format=%gd%x00%s"], { cwd: gitCwd })).stdout;
@@ -1309,22 +1321,27 @@ async function handleRepositoryRefs(req, res, ctx) {
     throw error;
   }
   try {
-    const [head, local, remote, tags, stashes] = await Promise.all([
+    const [head, originHead, local, remote, tags, stashes] = await Promise.all([
       runGit(["symbolic-ref", "--quiet", "HEAD"], { cwd: resolved.gitCwd, allowExitCodes: [1] }),
+      runGit(["symbolic-ref", "--quiet", "refs/remotes/origin/HEAD"], { cwd: resolved.gitCwd, allowExitCodes: [1] }),
       runGit(["for-each-ref", "--format=%(refname)%00%(refname:short)", "refs/heads"], { cwd: resolved.gitCwd }),
       runGit(["for-each-ref", "--format=%(refname)%00%(refname:short)", "refs/remotes"], { cwd: resolved.gitCwd }),
       runGit(["for-each-ref", "--format=%(refname)%00%(refname:short)", "refs/tags"], { cwd: resolved.gitCwd }),
       readStashes(resolved.gitCwd)
     ]);
     const current = head.stdout.trim();
+    const branches = parseRefItems(local.stdout, current);
+    const remotes = parseRefItems(remote.stdout, current);
+    const defaultBase = resolveDefaultBase({ originHead: originHead.stdout, branches, remotes });
     ctx.host.http.writeJson(res, 200, {
-      branches: parseRefItems(local.stdout, current),
-      remotes: parseRefItems(remote.stdout, current),
+      branches,
+      remotes,
       tags: parseRefItems(tags.stdout, current),
       stashes: lines(stashes).map((line) => {
         const [name, subject = ""] = line.split("\0");
         return { name, subject };
-      })
+      }),
+      ...defaultBase ? { defaultBase } : {}
     });
   } catch (error) {
     if (error instanceof GitExecutorError && error.code === "no_git_repo") {