ros/automaker
1
0
Fork 0
mirror of https://github.com/AutoMaker-Org/automaker.git synced 2026-03-18 22:33:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix concurrency limits and remote branch fetching issues (#788)

Browse Source 
* Changes from fix/bug-fixes

* feat: Refactor worktree iteration and improve error logging across services

* feat: Extract URL/port patterns to module level and fix abort condition

* fix: Improve IPv6 loopback handling, select component layout, and terminal UI

* feat: Add thinking level defaults and adjust list row padding

* Update apps/ui/src/store/app-store.ts

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* feat: Add worktree-aware terminal creation and split options, fix npm security issues from audit

* feat: Add tracked remote detection to pull dialog flow

* feat: Add merge state tracking to git operations

* feat: Improve merge detection and add post-merge action preferences

* Update apps/ui/src/components/views/board-view/dialogs/git-pull-dialog.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* Update apps/ui/src/components/views/board-view/dialogs/git-pull-dialog.tsx

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

* fix: Pass merge detection info to stash reapplication and handle merge state consistently

* fix: Call onPulled callback in merge handlers and add validation checks

---------

Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>
This commit is contained in:
gsxdsm
2026-02-20 13:48:22 -08:00
committed by GitHub
parent 7df2182818
commit 0a5540c9a2
70 changed files with 4525 additions and 857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

140
libs/git-utils/src/diff.ts
View File

@@ -7,8 +7,8 @@ import { secureFs } from '@automaker/platform';
import path from 'path';
import { exec } from 'child_process';
import { promisify } from 'util';
import { BINARY_EXTENSIONS, type FileStatus } from './types.js';
import { isGitRepo, parseGitStatus } from './status.js';
import { BINARY_EXTENSIONS, type FileStatus, type MergeStateInfo } from './types.js';
import { isGitRepo, parseGitStatus, detectMergeState, detectMergeCommit } from './status.js';
const execAsync = promisify(exec);
const logger = createLogger('GitUtils');
@@ -243,11 +243,15 @@ export async function generateDiffsForNonGitDirectory(
/**
* Get git repository diffs for a given path
* Handles both git repos and non-git directories
* Handles both git repos and non-git directories.
* Also detects merge state and annotates files accordingly.
*/
export async function getGitRepositoryDiffs(
repoPath: string
): Promise<{ diff: string; files: FileStatus[]; hasChanges: boolean }> {
export async function getGitRepositoryDiffs(repoPath: string): Promise<{
diff: string;
files: FileStatus[];
hasChanges: boolean;
mergeState?: MergeStateInfo;
}> {
// Check if it's a git repository
const isRepo = await isGitRepo(repoPath);
@@ -273,11 +277,133 @@ export async function getGitRepositoryDiffs(
const files = parseGitStatus(status);
// Generate synthetic diffs for untracked (new) files
const combinedDiff = await appendUntrackedFileDiffs(repoPath, diff, files);
let combinedDiff = await appendUntrackedFileDiffs(repoPath, diff, files);
// Detect merge state (in-progress merge/rebase/cherry-pick)
const mergeState = await detectMergeState(repoPath);
// If no in-progress merge, check if HEAD is a completed merge commit
// and include merge commit changes in the diff and file list
if (!mergeState.isMerging) {
const mergeCommitInfo = await detectMergeCommit(repoPath);
if (mergeCommitInfo.isMergeCommit && mergeCommitInfo.mergeAffectedFiles.length > 0) {
// Get the diff of the merge commit relative to first parent
try {
const { stdout: mergeDiff } = await execAsync('git diff HEAD~1 HEAD', {
cwd: repoPath,
maxBuffer: 10 * 1024 * 1024,
});
// Add merge-affected files to the file list (avoid duplicates with working tree changes)
const fileByPath = new Map(files.map((f) => [f.path, f]));
const existingPaths = new Set(fileByPath.keys());
for (const filePath of mergeCommitInfo.mergeAffectedFiles) {
if (!existingPaths.has(filePath)) {
const newFile = {
status: 'M',
path: filePath,
statusText: 'Merged',
indexStatus: ' ',
workTreeStatus: ' ',
isMergeAffected: true,
mergeType: 'merged',
};
files.push(newFile);
fileByPath.set(filePath, newFile);
existingPaths.add(filePath);
} else {
// Mark existing file as also merge-affected
const existing = fileByPath.get(filePath);
if (existing) {
existing.isMergeAffected = true;
existing.mergeType = 'merged';
}
}
}
// Prepend merge diff to the combined diff so merge changes appear
// For files that only exist in the merge (not in working tree), we need their diffs
if (mergeDiff.trim()) {
// Parse the existing working tree diff to find which files it covers
const workingTreeDiffPaths = new Set<string>();
const diffLines = combinedDiff.split('\n');
for (const line of diffLines) {
if (line.startsWith('diff --git')) {
const match = line.match(/diff --git a\/(.*?) b\/(.*)/);
if (match) {
workingTreeDiffPaths.add(match[2]);
}
}
}
// Only include merge diff entries for files NOT already in working tree diff
const mergeDiffFiles = mergeDiff.split(/(?=diff --git)/);
const newMergeDiffs: string[] = [];
for (const fileDiff of mergeDiffFiles) {
if (!fileDiff.trim()) continue;
const match = fileDiff.match(/diff --git a\/(.*?) b\/(.*)/);
if (match && !workingTreeDiffPaths.has(match[2])) {
newMergeDiffs.push(fileDiff);
}
}
if (newMergeDiffs.length > 0) {
combinedDiff = newMergeDiffs.join('') + combinedDiff;
}
}
} catch (mergeError) {
// Best-effort: log and continue without merge diff
logger.error('Failed to get merge commit diff:', mergeError);
// Ensure files[] is consistent with mergeState.mergeAffectedFiles even when the
// diff command failed. Without this, mergeAffectedFiles would list paths that have
// no corresponding entry in the files array.
const existingPathsAfterError = new Set(files.map((f) => f.path));
for (const filePath of mergeCommitInfo.mergeAffectedFiles) {
if (!existingPathsAfterError.has(filePath)) {
files.push({
status: 'M',
path: filePath,
statusText: 'Merged',
indexStatus: ' ',
workTreeStatus: ' ',
isMergeAffected: true,
mergeType: 'merged',
});
existingPathsAfterError.add(filePath);
} else {
// Mark existing file as also merge-affected
const existing = files.find((f) => f.path === filePath);
if (existing) {
existing.isMergeAffected = true;
existing.mergeType = 'merged';
}
}
}
}
// Return with merge commit info in the mergeState
return {
diff: combinedDiff,
files,
hasChanges: files.length > 0,
mergeState: {
isMerging: false,
mergeOperationType: 'merge',
isCleanMerge: true,
mergeAffectedFiles: mergeCommitInfo.mergeAffectedFiles,
conflictFiles: [],
isMergeCommit: true,
},
};
}
}
return {
diff: combinedDiff,
files,
hasChanges: files.length > 0,
...(mergeState.isMerging ? { mergeState } : {}),
};
}