releases/ClaudeDo
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 3 Wiki Activity

feat(git): add ListConflictedFilesAsync

Browse Source
This commit is contained in:
Mika Kuns
2026-04-22 09:31:36 +02:00
parent 21a1870fd7
commit 77a1460e3a
2 changed files with 39 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/ClaudeDo.Data/Git/GitService.cs
View File

@@ -198,6 +198,19 @@ public sealed class GitService
throw new InvalidOperationException($"git merge --abort failed (exit {exitCode}): {stderr}");
}
public async Task<List<string>> ListConflictedFilesAsync(string repoDir, CancellationToken ct = default)
{
var (exitCode, stdout, stderr) = await RunGitAsync(repoDir,
["diff", "--name-only", "--diff-filter=U"], ct);
if (exitCode != 0)
throw new InvalidOperationException($"git diff --diff-filter=U failed (exit {exitCode}): {stderr}");
return stdout
.Split('\n', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries)
.Where(s => s.Length > 0)
.ToList();
}
public async Task MergeFfOnlyAsync(string repoDir, string branchName, CancellationToken ct = default)
{
var (exitCode, _, stderr) = await RunGitAsync(repoDir, ["merge", "--ff-only", branchName], ct);

26
tests/ClaudeDo.Worker.Tests/Runner/GitServiceMergeTests.cs
View File

@@ -154,4 +154,30 @@ public class GitServiceMergeTests : IDisposable
await git.MergeAbortAsync(repo.RepoDir);
Assert.False(await git.IsMidMergeAsync(repo.RepoDir));
}
[Fact]
public async Task ListConflictedFilesAsync_MidConflict_ReturnsConflictedFile()
{
if (!GitRepoFixture.IsGitAvailable()) return;
var repo = NewRepo();
GitRepoFixture.RunGit(repo.RepoDir, "checkout", "-b", "feature/cflist");
File.WriteAllText(Path.Combine(repo.RepoDir, "README.md"), "# feat\n");
GitRepoFixture.RunGit(repo.RepoDir, "add", "-A");
GitRepoFixture.RunGit(repo.RepoDir, "commit", "-m", "edit");
try { GitRepoFixture.RunGit(repo.RepoDir, "checkout", "main"); }
catch { GitRepoFixture.RunGit(repo.RepoDir, "checkout", "master"); }
File.WriteAllText(Path.Combine(repo.RepoDir, "README.md"), "# main\n");
GitRepoFixture.RunGit(repo.RepoDir, "add", "-A");
GitRepoFixture.RunGit(repo.RepoDir, "commit", "-m", "edit");
var git = new GitService();
await git.MergeNoFfAsync(repo.RepoDir, "feature/cflist", "merge");
var files = await git.ListConflictedFilesAsync(repo.RepoDir);
Assert.Contains("README.md", files);
await git.MergeAbortAsync(repo.RepoDir);
}
}