github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#9506] More work on Migrations API:

Browse Source 
- GitCommitProvider should distinguish between uncommitted (in index) and untracked (not in index)
This commit is contained in:
Lukas Eder 2024-11-27 10:28:15 +01:00
parent c19df5ff34
commit 8ba74dc91e
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
jOOQ-migrations/src/main/java/org/jooq/migrations/jgit/GitCommitProvider.java
View File

@ -82,6 +82,7 @@ import org.eclipse.jgit.revwalk.RevCommit;
import org.eclipse.jgit.revwalk.RevTag;
import org.eclipse.jgit.treewalk.TreeWalk;
import org.eclipse.jgit.util.io.DisabledOutputStream;
import org.jetbrains.annotations.NotNull;
/**
* A {@link CommitProvider} that produces versions from a git repository.
@ -217,17 +218,25 @@ public final class GitCommitProvider implements CommitProvider {
private static final Comparator<RevCommit> COMMIT_COMPARATOR = (o1, o2) -> o1.getCommitTime() - o2.getCommitTime();
private final Commit commit(Commit commit, Status status) {
List<File> files = new ArrayList<>();
List<File> uncommitted = new ArrayList<>();
List<File> untracked = new ArrayList<>();
add(files, status.getAdded());
add(files, status.getChanged());
add(files, status.getModified());
add(files, status.getUntracked());
del(files, status.getMissing());
del(files, status.getRemoved());
add(uncommitted, status.getAdded());
add(uncommitted, status.getChanged());
del(uncommitted, status.getRemoved());
// [#9506] TODO: It should be possible to migrate to uncommitted changes in dev mode.
return commit.commit("uncommitted", "uncommitted", files).valid(false);
if (!uncommitted.isEmpty())
commit = commit.commit("uncommitted", "uncommitted", uncommitted).valid(false);
add(untracked, status.getModified());
add(untracked, status.getUntracked());
del(untracked, status.getMissing());
if (!untracked.isEmpty())
commit = commit.commit("untracked", "untracked", untracked).valid(false);
return commit;
}
private void add(List<File> files, Set<String> paths) {