offsite 0.0.19 → 0.0.20

package/apps/server/dist/main.mjs

@@ -4576,6 +4576,7 @@ const DIFF_LIMIT = 8e4;
 const UNTRACKED_LIMIT = 100;
 const NEW_FILE_LIMIT = 262144;
 const REPO_DEPTH = 3;
+const FETCH_TIMEOUT = 6e4;
 const run$1 = promisify(execFile);
 const PULL_REQUEST_INSTRUCTIONS = `You write GitHub pull requests as Markdown.
 
@@ -4638,9 +4639,44 @@ async function push$1(cwd) {
 		]);
 		else await git(cwd, ["push"]);
 	} catch (error) {
-		throw new Error((error instanceof Error ? error.message : String(error)).split("\n").filter((line) => line.trim() !== "" && !line.startsWith("hint:") && !line.startsWith("Command failed:")).join("\n"), { cause: error });
+		throw gitError(error);
 	}
 }
+async function sync(cwd) {
+	if ((await gitStatus(cwd)).upstream === null) {
+		await push$1(cwd);
+		return;
+	}
+	try {
+		await git(cwd, ["fetch"]);
+		const status = await gitStatus(cwd);
+		if (status.behind > 0 && status.ahead === 0) await git(cwd, [
+			"merge",
+			"--ff-only",
+			"@{upstream}"
+		]);
+		if (status.behind > 0 && status.ahead > 0) await rebaseOnUpstream(cwd);
+	} catch (error) {
+		throw gitError(error);
+	}
+	if ((await gitStatus(cwd)).ahead > 0) await push$1(cwd);
+}
+async function fetchProject(cwd) {
+	await Promise.all((await projectRepos(cwd)).map(async (repo) => {
+		try {
+			await run$1("git", ["fetch"], {
+				cwd: path.join(cwd, repo),
+				env: {
+					...process.env,
+					GIT_TERMINAL_PROMPT: "0"
+				},
+				timeout: FETCH_TIMEOUT
+			});
+		} catch (error) {
+			throw gitError(error);
+		}
+	}));
+}
 async function localBranches(cwd) {
 	return (await git(cwd, [
 		"branch",
@@ -4796,6 +4832,7 @@ async function projectRepos(cwd) {
 }
 async function gitStatus(cwd) {
 	const output = await git(cwd, [
+		"--no-optional-locks",
 		"status",
 		"--porcelain=v2",
 		"--branch"
@@ -4803,6 +4840,7 @@ async function gitStatus(cwd) {
 	const status = {
 		branch: null,
 		upstream: null,
+		remote: (await git(cwd, ["remote"])).stdout.trim() !== "",
 		ahead: 0,
 		behind: 0,
 		changed: 0
@@ -4819,6 +4857,25 @@ async function gitStatus(cwd) {
 	}
 	return status;
 }
+async function rebaseOnUpstream(cwd) {
+	try {
+		await git(cwd, ["rebase", "@{upstream}"]);
+	} catch (error) {
+		const rebasing = await git(cwd, [
+			"rev-parse",
+			"--git-path",
+			"rebase-merge"
+		]);
+		if (existsSync(path.resolve(cwd, rebasing.stdout.trim()))) {
+			await git(cwd, ["rebase", "--abort"]);
+			throw new Error("Your commits conflict with the remote branch, so nothing was pulled or pushed. Resolve it in a terminal.", { cause: error });
+		}
+		throw error;
+	}
+}
+function gitError(error) {
+	return new Error((error instanceof Error ? error.message : String(error)).split("\n").filter((line) => line.trim() !== "" && !line.startsWith("hint:") && !line.startsWith("Command failed:")).join("\n"), { cause: error });
+}
 async function isRepo(cwd) {
 	try {
 		await git(cwd, ["rev-parse", "--is-inside-work-tree"]);
@@ -4880,8 +4937,10 @@ function newFilePatch(cwd, file, prefix) {
 	const name = `${prefix}${file}`;
 	const header = `diff --git a/${name} b/${name}\nnew file\n--- /dev/null\n+++ b/${name}\n`;
 	const full = path.join(cwd, file);
-	if (lstatSync(full).isSymbolicLink()) return `${header}@@ -0,0 +1 @@\n+${readlinkSync(full)}\n`;
-	if (statSync(full).size > NEW_FILE_LIMIT) return `${header}Binary or large file\n`;
+	const stats = lstatSync(full);
+	if (stats.isSymbolicLink()) return `${header}@@ -0,0 +1 @@\n+${readlinkSync(full)}\n`;
+	if (stats.isDirectory()) return `${header}Nested repository\n`;
+	if (stats.size > NEW_FILE_LIMIT) return `${header}Binary or large file\n`;
 	const content = readFileSync(full, "utf8");
 	if (content.includes("\0")) return `${header}Binary or large file\n`;
 	const lines = content.split("\n");
@@ -6112,6 +6171,14 @@ const handlers = {
 		await push$1(path.join(projectPath(params.projectId), params.repo));
 		return null;
 	},
+	"git.sync": async (params) => {
+		await sync(path.join(projectPath(params.projectId), params.repo));
+		return null;
+	},
+	"git.fetch": async (params) => {
+		await fetchProject(projectPath(params.projectId));
+		return null;
+	},
 	"git.branches": (params) => pullRequestBranches(path.join(projectPath(params.projectId), params.repo)),
 	"git.localBranches": (params) => localBranches(path.join(projectPath(params.projectId), params.repo)),
 	"git.switch": async (params) => {