Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Handle deleted files as made changes #4

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Handle deleted files as made changes #4

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c47f20f
Add deleted files to changes
RicoGit Jan 10, 2022
c233bdf
Merge pull request #1 from whisklabs/support_deleted
RicoGit Jan 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/main/scala/com/elarib/model/ChangeGetter.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.elarib.model

import java.io.File

import org.eclipse.jgit.api.Git
import org.eclipse.jgit.diff.DiffEntry
import org.eclipse.jgit.lib.ObjectId
import org.eclipse.jgit.revwalk.RevWalk
import org.eclipse.jgit.storage.file.FileRepositoryBuilder
Expand Down Expand Up @@ -64,7 +64,9 @@ object GitChangeGetterHelper {
.call()
.asScala
.map { diffEntry =>
new File(diffEntry.getNewPath)
val path = if (diffEntry.getNewPath == DiffEntry.DEV_NULL)
diffEntry.getOldPath else diffEntry.getNewPath
new File(path)
}
.toList
}
Expand Down Expand Up @@ -119,7 +121,7 @@ case class DummyChangeGetter(logFilePath: String) extends ChangeGetter {
.fromFile(new File(logFilePath))
.getLines()
.map {
case line if !line.isEmpty => new File(line)
case line if line.nonEmpty => new File(line)
}
.toList
}