Skip to content

fix(review): show P4 added files in code review #494

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
backnotprop merged 1 commit into from
Apr 7, 2026
Merged

fix(review): show P4 added files in code review #494

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 30 additions & 16 deletions packages/server/p4.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ async function runP4(
proc.exited,
]);

return { stdout, stderr, exitCode };
return { stdout: stdout.replace(/\r\n/g, "\n"), stderr, exitCode };
}

// --- Path helpers ---
Expand Down Expand Up @@ -248,7 +248,7 @@ async function getNewFileDiff(
): Promise<string> {
try {
const content = await Bun.file(localPath).text();
const lines = content.split("\n");
const lines = content.replace(/\r\n/g, "\n").split("\n");
const header = [
`diff --git a/${relativePath} b/${relativePath}`,
"new file mode 100644",
Expand All @@ -274,23 +274,37 @@ async function batchResolveDepotPaths(
const result = new Map<string, { localPath: string; relativePath: string }>();
if (depotPaths.length === 0) return result;

const whereResult = await runP4(["where", ...depotPaths], { cwd });
// Use -ztag for structured output — avoids fragile index-based parsing
// that breaks with stream depots, overlays, or unmapped path error lines
const whereResult = await runP4(["-ztag", "where", ...depotPaths], { cwd });
if (whereResult.exitCode !== 0) return result;

const outputLines = whereResult.stdout.trim().split("\n");
for (let i = 0; i < outputLines.length && i < depotPaths.length; i++) {
const whereOutput = outputLines[i];
const rootIdx = whereOutput.indexOf(normalizePath(normalizedRoot).length > 0 ? normalizedRoot : "NOMATCH");
// Find the local path by looking for the client root
const clientRootBackslash = normalizedRoot.replace(/\//g, "\\");
const bsIdx = whereOutput.indexOf(clientRootBackslash);
const fwIdx = whereOutput.indexOf(normalizedRoot);
const idx = bsIdx !== -1 ? bsIdx : fwIdx;
if (idx === -1) continue;

const localPath = normalizePath(whereOutput.slice(idx));
let currentDepot = "";
let currentPath = "";

for (const line of whereResult.stdout.split("\n")) {
const tagMatch = line.match(/^\.\.\. (\w+) (.+)/);
if (!tagMatch) {
if (currentDepot && currentPath) {
const localPath = normalizePath(currentPath);
const relativePath = toRelativePath(localPath, normalizedRoot);
result.set(currentDepot, { localPath, relativePath });
}
currentDepot = "";
currentPath = "";
continue;
}

const [, field, value] = tagMatch;
if (field === "depotFile") currentDepot = value;
if (field === "path") currentPath = value;
}

// Handle last record (no trailing blank line)
if (currentDepot && currentPath) {
const localPath = normalizePath(currentPath);
const relativePath = toRelativePath(localPath, normalizedRoot);
result.set(depotPaths[i], { localPath, relativePath });
result.set(currentDepot, { localPath, relativePath });
}

return result;
Expand Down