mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-11-23 20:54:50 +03:00
fix: Correctly detect conflicted files
Correctly detect and display whether the commit file is conflicted in the edit mode page
This commit is contained in:
parent
3e2a29b6e7
commit
a169b41594
@ -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 {
|
||||
outputMap.set(uncommitedFile.path, {
|
||||
name: uncommitedFile.filename,
|
||||
path: uncommitedFile.path,
|
||||
conflicted: false,
|
||||
status: 'A'
|
||||
});
|
||||
|
||||
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'
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user