gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-17 22:11:59 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: Correctly detect conflicted files

Browse Source 
Correctly detect and display whether the commit file is conflicted in the edit mode page
This commit is contained in:
estib 2024-09-30 18:38:20 +02:00
parent 3e2a29b6e7
commit a169b41594
1 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apps/desktop/src/lib/components/EditMode.svelte
View File

@ -78,27 +78,37 @@
});
$uncommitedFiles.forEach(([uncommitedFile]) => {
const initialFile = initialFileMap.get(uncommitedFile.path);
if (initialFile) {
const fileChanged = initialFile.hunks.some(
const existingFile = initialFileMap.get(uncommitedFile.path);
if (existingFile) {
const fileChanged = existingFile.hunks.some(
(hunk) => !uncommitedFile.hunks.map((hunk) => hunk.diff).includes(hunk.diff)
);
if (fileChanged && !uncommitedFile.looksConflicted) {
// All initial entries should have been added to the map,
// so we can safly assert that it will be present
// so we can safely assert that it will be present
const outputFile = outputMap.get(uncommitedFile.path)!;
outputFile.status = 'M';
outputFile.conflicted = false;
return;
}
} else {
if (uncommitedFile.looksConflicted) {
const outputFile = outputMap.get(uncommitedFile.path)!;
outputFile.conflicted = true;
return;
}
return;
}
outputMap.set(uncommitedFile.path, {
name: uncommitedFile.filename,
path: uncommitedFile.path,
conflicted: false,
status: 'A'
});
}
});
}