gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-12-13 15:34:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

different forkpoint start

Browse Source
This commit is contained in:
Caleb Owens 2024-06-21 09:36:29 +02:00
parent 72cc22502b
commit 11be4c2d77
2 changed files with 96 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
app/src/lib/commitLines/lineManager.ts
View File

@ -163,9 +163,101 @@ function generateSameForkpoint({
] as [string, LineGroup][]);
}
function blankLineGroup(lineCount: 2 | 3 | 4): LineGroup {
function generateDifferentForkpoint({
remoteCommits,
localCommits,
localAndRemoteCommits,
integratedCommits
}: Commits) {
const LEFT_COLUMN_INDEX = 0;
const MIDDLE_COLUMN_INDEX = 1;
const RIGHT_COLUMN_INDEX = 2;
const remoteBranchGroups = remoteCommits.map((commit) => ({
commit,
lineGroup: blankLineGroup(4)
}));
const localBranchGroups = localCommits.map((commit) => ({
commit,
lineGroup: blankLineGroup(4)
}));
const localAndRemoteBranchGroups = localAndRemoteCommits.map((commit) => ({
commit,
lineGroup: blankLineGroup(4)
}));
const integratedBranchGroups = integratedCommits.map((commit) => ({
commit,
lineGroup: blankLineGroup(4)
}));
remoteBranchGroups.forEach(({ commit, lineGroup }, index) => {
if (index !== 0) {
lineGroup.lines[LEFT_COLUMN_INDEX].top.style = 'remote';
}
lineGroup.lines[LEFT_COLUMN_INDEX].bottom.style = 'remote';
lineGroup.lines[LEFT_COLUMN_INDEX].node = { type: 'large', commit };
if (localBranchGroups.length > 0) {
lineGroup.lines[RIGHT_COLUMN_INDEX].top.style = 'localDashed';
lineGroup.lines[RIGHT_COLUMN_INDEX].bottom.style = 'localDashed';
}
});
let localCommitWithChangeIdFound = false;
localBranchGroups.forEach(({ commit, lineGroup }, index) => {
if (index === 0) {
lineGroup.lines[RIGHT_COLUMN_INDEX].top.style = 'localDashed';
} else {
lineGroup.lines[RIGHT_COLUMN_INDEX].top.style = 'local';
}
lineGroup.lines[RIGHT_COLUMN_INDEX].bottom.style = 'local';
lineGroup.lines[RIGHT_COLUMN_INDEX].node = { type: 'large', commit };
if (localCommitWithChangeIdFound) {
lineGroup.lines[LEFT_COLUMN_INDEX].top.style = 'shadow';
lineGroup.lines[LEFT_COLUMN_INDEX].bottom.style = 'shadow';
if (commit.relatedRemoteCommit) {
lineGroup.lines[LEFT_COLUMN_INDEX].node = {
type: 'small',
commit: commit.relatedRemoteCommit
};
}
} else {
if (commit.relatedRemoteCommit) {
if (remoteBranchGroups.length > 0) {
lineGroup.lines[LEFT_COLUMN_INDEX].top.style = 'remote';
}
lineGroup.lines[LEFT_COLUMN_INDEX].node = {
type: 'small',
commit: commit.relatedRemoteCommit
};
lineGroup.lines[LEFT_COLUMN_INDEX].bottom.style = 'shadow';
localCommitWithChangeIdFound = true;
} else {
if (remoteBranchGroups.length > 0) {
lineGroup.lines[LEFT_COLUMN_INDEX].top.style = 'remote';
lineGroup.lines[LEFT_COLUMN_INDEX].bottom.style = 'remote';
}
}
}
});
localAndRemoteBranchGroups.forEach(({ commit, lineGroup }, index) => {});
return new Map<string, LineGroup>([
...remoteBranchGroups.map(({ commit, lineGroup }) => [commit.id, lineGroup]),
...localBranchGroups.map(({ commit, lineGroup }) => [commit.id, lineGroup]),
...localAndRemoteBranchGroups.map(({ commit, lineGroup }) => [commit.id, lineGroup]),
...integratedBranchGroups.map(({ commit, lineGroup }) => [commit.id, lineGroup])
] as [string, LineGroup][]);
}
function blankLineGroup(lineCount: number): LineGroup {
return {
// @ts-expect-error TS is unable to understand that it should be a tuple
lines: Array(lineCount)
.fill(undefined)
.map(
@ -191,7 +283,7 @@ export class LineManager {
if (sameForkpoint) {
this.data = generateSameForkpoint(commits);
} else {
this.data = new Map();
this.data = generateDifferentForkpoint(commits);
}
}

2
app/src/lib/commitLines/types.ts
View File

@ -25,7 +25,7 @@ export interface Line {
export interface LineGroup {
// A tuple of two, three, or four lines
lines: [Line, Line] | [Line, Line, Line] | [Line, Line, Line, Line];
lines: Line[];
}
export interface Author {