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

Fixed crash when doing a diff in previously deleted file

Browse source 
Also diff was showing changes from the current workdir
This commit is contained in:
Abdelilah El Aissaoui 2021-09-27 01:23:08 +02:00
parent e3a2b0b31a
commit 58d3f06998
5 changed files with 27 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/kotlin/Diff.kt
View file

@ -14,13 +14,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.unit.dp
import org.eclipse.jgit.diff.DiffEntry
import theme.primaryTextColor
@Composable
fun Diff(gitManager: GitManager, diffEntry: DiffEntry, onCloseDiffView: () -> Unit) {
val text = remember(diffEntry) {
gitManager.diffFormat(diffEntry)
fun Diff(gitManager: GitManager, diffEntryType: DiffEntryType, onCloseDiffView: () -> Unit) {
val text = remember(diffEntryType.diffEntry) {
gitManager.diffFormat(diffEntryType)
}
Card(

7
src/main/kotlin/DiffEntryType.kt Normal file
View file

@ -0,0 +1,7 @@
import org.eclipse.jgit.diff.DiffEntry
sealed class DiffEntryType(val diffEntry: DiffEntry) {
class CommitDiff(diffEntry: DiffEntry): DiffEntryType(diffEntry)
class UnstagedDiff(diffEntry: DiffEntry): DiffEntryType(diffEntry)
class StagedDiff(diffEntry: DiffEntry): DiffEntryType(diffEntry)
}

9
src/main/kotlin/GitManager.kt
View file

@ -126,7 +126,8 @@ class GitManager {
val hasUncommitedChanges: StateFlow<Boolean>
get() = statusManager.hasUncommitedChanges
fun diffFormat(diffEntry: DiffEntry): String {
fun diffFormat(diffEntryType: DiffEntryType): String {
val diffEntry = diffEntryType.diffEntry
val byteArrayOutputStream = ByteArrayOutputStream()
DiffFormatter(byteArrayOutputStream).use { formatter ->
@ -136,9 +137,9 @@ class GitManager {
val oldTree = DirCacheIterator(repo.readDirCache())
val newTree = FileTreeIterator(repo)
println(diffEntry)
formatter.scan(oldTree, newTree) //TODO Should only be set when using diff for unstaged changes
// formatter.format(oldTree, newTree)
if(diffEntryType is DiffEntryType.UnstagedDiff)
formatter.scan(oldTree, newTree)
formatter.format(diffEntry)
formatter.flush()
}

14
src/main/kotlin/RepositorySelected.kt
View file

@ -20,7 +20,7 @@ fun RepositorySelected(gitManager: GitManager, repository: Repository) {
}
var diffSelected by remember {
mutableStateOf<DiffEntry?>(null)
mutableStateOf<DiffEntryType?>(null)
}
var uncommitedChangesSelected by remember {
mutableStateOf<Boolean>(false)
@ -79,7 +79,7 @@ fun RepositorySelected(gitManager: GitManager, repository: Repository) {
else -> {
Diff(
gitManager = gitManager,
diffEntry = diffEntry,
diffEntryType = diffEntry,
onCloseDiffView = { diffSelected = null })
}
}
@ -94,9 +94,11 @@ fun RepositorySelected(gitManager: GitManager, repository: Repository) {
if (uncommitedChangesSelected) {
UncommitedChanges(
gitManager = gitManager,
onDiffEntrySelected = { diffEntry ->
println(diffEntry.filePath)
diffSelected = diffEntry
onStagedDiffEntrySelected = { diffEntry ->
diffSelected = DiffEntryType.StagedDiff(diffEntry)
},
onUnstagedDiffEntrySelected = { diffEntry ->
diffSelected = DiffEntryType.UnstagedDiff(diffEntry)
}
)
} else {
@ -104,7 +106,7 @@ fun RepositorySelected(gitManager: GitManager, repository: Repository) {
CommitChanges(
commitDiff = it,
onDiffSelected = { diffEntry ->
diffSelected = diffEntry
diffSelected = DiffEntryType.CommitDiff(diffEntry)
}
)
}

7
src/main/kotlin/UncommitedChanges.kt
View file

@ -33,7 +33,8 @@ import theme.headerBackground
@Composable
fun UncommitedChanges(
gitManager: GitManager,
onDiffEntrySelected: (DiffEntry) -> Unit,
onStagedDiffEntrySelected: (DiffEntry) -> Unit,
onUnstagedDiffEntrySelected: (DiffEntry) -> Unit,
) {
val stageStatusState = gitManager.stageStatus.collectAsState()
val stageStatus = stageStatusState.value
@ -64,7 +65,7 @@ fun UncommitedChanges(
title = "Staged",
optionIcon = Icons.Default.Close,
diffEntries = staged,
onDiffEntrySelected = onDiffEntrySelected,
onDiffEntrySelected = onStagedDiffEntrySelected,
onDiffEntryOptionSelected = {
gitManager.unstage(it)
}
@ -78,7 +79,7 @@ fun UncommitedChanges(
title = "Unstaged",
optionIcon = Icons.Default.Add,
diffEntries = unstaged,
onDiffEntrySelected = onDiffEntrySelected,
onDiffEntrySelected = onUnstagedDiffEntrySelected,
onDiffEntryOptionSelected = {
gitManager.stage(it)
}