Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-10-05 22:47:16 +03:00
Code Issues Projects Releases Wiki Activity

first approach

Browse Source
This commit is contained in:
Martin Marmsoler 2024-06-11 10:13:27 +02:00
parent 64a1c9b698
commit 73da07601e
1 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/ui/CommitList.cpp
View File

@ -256,7 +256,9 @@ public:
int i = 0;
QList<Row> rows;
git::Commit commit = mWalker.next(mPathspec);
QList<git::Commit> ignoredCommits;
while (commit.isValid()) {
qDebug() << "Commit: " << commit.message();
// Add root commits.
bool root = false;
if (indexOf(commit) < 0) {
@ -270,16 +272,32 @@ public:
// Replace commit with its parents.
QList<git::Commit> replacements;
int count = 0;
bool firstCommit = false;
foreach (const git::Commit &parent, commit.parents()) {
qDebug() << "\tParent commit " << count << ": " << parent.message();
// FIXME: Mark commits that point to existing parent?
if (indexOf(parent) < 0 && !contains(parent, rows))
replacements.append(parent);
if (indexOf(parent) < 0 && !contains(parent, rows)) {
if (mRefsFilter == CommitList::RefsFilter::SelectedRefIgnoreMerge) {
// The first parent is the parent into which the other parent was merged
// To create this commit
if (firstCommit && parent.isValid()) {
ignoredCommits.append(parent);
} else {
replacements.append(parent);
}
} else {
replacements.append(parent);
}
firstCommit = true;
}
count ++;
}
// Set parents for next row.
int index = indexOf(commit);
if (index >= 0) {
Parent parent = mParents.takeAt(index);
Parent parent = mParents.takeAt(index); // This commit in the mParents List
if (!replacements.isEmpty()) {
git::Commit replacement = replacements.takeFirst();
mParents.insert(index, Parent(replacement, parent.color));
@ -300,7 +318,10 @@ public:
if (i++ >= 64)
break;
commit = mWalker.next(mPathspec);
do {
commit = mWalker.next(mPathspec);
// TODO: child commit of this commit must also not in the ignored Commits list!
} while (ignoredCommits.contains(commit));
}
// Update the model.
@ -471,7 +492,14 @@ private:
QList<git::Commit> successors;
const Parent &parent = parents.at(i);
if (parent.commit == commit) {
successors = parent.commit.parents();
if (mRefsFilter == CommitList::RefsFilter::SelectedRefIgnoreMerge) {
const auto& p = parent.commit.parents();
if (!p.isEmpty()) {
successors.append(parent.commit.parents().at(0));
}
} else {
successors = parent.commit.parents();
}
} else {
successors.append(parent.commit);
}