Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added try catch that unlocks the dir cache in case of error in hunk unstage

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2021-12-28 01:37:21 +01:00
parent a8ed01784d
commit 2e157aa773
1 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
src/main/kotlin/app/git/StatusManager.kt
View File

@ -167,41 +167,49 @@ class StatusManager @Inject constructor(
val repository = git.repository val repository = git.repository
val dirCache = repository.lockDirCache() val dirCache = repository.lockDirCache()
val dirCacheEditor = dirCache.editor() val dirCacheEditor = dirCache.editor()
var completedWithErrors = true
try {
val rawFileManager = rawFileManagerFactory.create(git.repository) val rawFileManager = rawFileManagerFactory.create(git.repository)
val rawFile = rawFileManager.getRawContent(DiffEntry.Side.NEW, diffEntry) val rawFile = rawFileManager.getRawContent(DiffEntry.Side.NEW, diffEntry)
val textLines = getTextLines(rawFile).toMutableList() val textLines = getTextLines(rawFile).toMutableList()
val hunkLines = hunk.lines.filter { it.lineType != LineType.CONTEXT } val hunkLines = hunk.lines.filter { it.lineType != LineType.CONTEXT }
val addedLines = hunkLines val addedLines = hunkLines
.filter { it.lineType == LineType.ADDED } .filter { it.lineType == LineType.ADDED }
.sortedBy { it.newLineNumber } .sortedBy { it.newLineNumber }
val removedLines = hunkLines val removedLines = hunkLines
.filter { it.lineType == LineType.REMOVED } .filter { it.lineType == LineType.REMOVED }
.sortedBy { it.newLineNumber } .sortedBy { it.newLineNumber }
var linesRemoved = 0 var linesRemoved = 0
// Start by removing the added lines to the index // Start by removing the added lines to the index
for (line in addedLines) { for (line in addedLines) {
textLines.removeAt(line.newLineNumber + linesRemoved) textLines.removeAt(line.newLineNumber + linesRemoved)
linesRemoved-- linesRemoved--
}
var linesAdded = 0
// Restore previously removed lines to the index
for (line in removedLines) {
textLines.add(line.newLineNumber + linesAdded, line.text.withoutLineEnding)
linesAdded++
}
val stagedFileText = textLines.joinToString(rawFile.lineDelimiter)
dirCacheEditor.add(HunkEdit(diffEntry.newPath, repository, ByteBuffer.wrap(stagedFileText.toByteArray())))
dirCacheEditor.commit()
completedWithErrors = false
loadStatus(git)
} finally {
if(completedWithErrors)
dirCache.unlock()
} }
var linesAdded = 0
// Restore previously removed lines to the index
for (line in removedLines) {
textLines.add(line.newLineNumber + linesAdded, line.text.withoutLineEnding)
linesAdded++
}
val stagedFileText = textLines.joinToString(rawFile.lineDelimiter)
dirCacheEditor.add(HunkEdit(diffEntry.newPath, repository, ByteBuffer.wrap(stagedFileText.toByteArray())))
dirCacheEditor.commit()
loadStatus(git)
} }
private fun getTextLines(rawFile: RawText): List<String> { private fun getTextLines(rawFile: RawText): List<String> {