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

Fixed stage all when there are removed files

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-06-06 01:41:41 +02:00
parent 3cb7d25a33
commit c5f7ddf266
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,15 +39,10 @@ class StatusManager @Inject constructor(
} }
suspend fun stage(git: Git, statusEntry: StatusEntry) = withContext(Dispatchers.IO) { suspend fun stage(git: Git, statusEntry: StatusEntry) = withContext(Dispatchers.IO) {
if (statusEntry.statusType == StatusType.REMOVED) { git.add()
git.rm() .addFilepattern(statusEntry.filePath)
.addFilepattern(statusEntry.filePath) .setUpdate(statusEntry.statusType == StatusType.REMOVED)
.call() .call()
} else {
git.add()
.addFilepattern(statusEntry.filePath)
.call()
}
} }
suspend fun stageHunk(git: Git, diffEntry: DiffEntry, hunk: Hunk) = withContext(Dispatchers.IO) { suspend fun stageHunk(git: Git, diffEntry: DiffEntry, hunk: Hunk) = withContext(Dispatchers.IO) {
@ -160,7 +155,7 @@ class StatusManager @Inject constructor(
} }
splitted = splitted.mapIndexed { index, line -> splitted = splitted.mapIndexed { index, line ->
val lineWithBreak = line +lineDelimiter.orEmpty() val lineWithBreak = line + lineDelimiter.orEmpty()
if (index == splitted.count() - 1 && !content.endsWith(lineWithBreak)) { if (index == splitted.count() - 1 && !content.endsWith(lineWithBreak)) {
line line
@ -238,6 +233,12 @@ class StatusManager @Inject constructor(
git git
.add() .add()
.addFilepattern(".") .addFilepattern(".")
.setUpdate(true) // Modified and deleted files
.call()
git
.add()
.addFilepattern(".")
.setUpdate(false) // For newly added files
.call() .call()
} }