luisgulo/Gitnuro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Stashes now show (unstaged) untracked files

Browse source 
Fixes #88
This commit is contained in:
Abdelilah El Aissaoui 2023-05-17 21:01:21 +02:00
parent 0bebd43eb4
commit 762212fabe
No known key found for this signature in database
GPG key ID: 7587FC860F594869
2 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/CommitChangesViewModel.kt
View file

@ -5,6 +5,7 @@ import androidx.compose.foundation.lazy.LazyListState
import androidx.compose.ui.text.input.TextFieldValue
import com.jetpackduba.gitnuro.extensions.delayedStateChange
import com.jetpackduba.gitnuro.extensions.filePath
import com.jetpackduba.gitnuro.extensions.fullData
import com.jetpackduba.gitnuro.extensions.lowercaseContains
import com.jetpackduba.gitnuro.git.RefreshType
import com.jetpackduba.gitnuro.git.TabState
@ -63,15 +64,36 @@ class CommitChangesViewModel @Inject constructor(
// Check if it's a different commit before resetting everything
if (
state is CommitChangesState.Loading ||
state is CommitChangesState.Loaded && state.commit != commit
state is CommitChangesState.Loaded //&& state.commit != commit
) {
delayedStateChange(
delayMs = MIN_TIME_IN_MS_TO_SHOW_LOAD,
onDelayTriggered = { _commitChangesState.value = CommitChangesState.Loading }
) {
val changes = getCommitDiffEntriesUseCase(git, commit)
val fullCommit = commit.fullData(git.repository)
_commitChangesState.value = CommitChangesState.Loaded(commit, changes, changes)
if (fullCommit != null) {
val changes = getCommitDiffEntriesUseCase(git, fullCommit).toMutableList()
if (fullCommit.parentCount == 3) {
val untrackedFilesCommit =
fullCommit.parents?.firstOrNull {
val parentCommit = it.fullData(git.repository) ?: return@firstOrNull false
parentCommit.fullMessage.startsWith("untracked files on") && parentCommit.parentCount == 0
}
if (untrackedFilesCommit != null) {
val untrackedFilesChanges = getCommitDiffEntriesUseCase(git, untrackedFilesCommit)
if(untrackedFilesChanges.all { it.changeType == DiffEntry.ChangeType.ADD }) { // All files should be new
changes.addAll(untrackedFilesChanges)
}
}
}
_commitChangesState.value = CommitChangesState.Loaded(commit, changes, changes)
}
}
_showSearch.value = false

1
src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/MenuViewModel.kt
View file

@ -58,7 +58,6 @@ class MenuViewModel @Inject constructor(
fun stash() = tabState.safeProcessing(
refreshType = RefreshType.UNCOMMITED_CHANGES_AND_LOG,
) { git ->
stageUntrackedFileUseCase(git)
stashChangesUseCase(git, null)
}