mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 23:40:18 +00:00
641d2dbdce
We used to output a line for every lane after the lane in which the current commit is in, and also make it have the wrong color. This fixes the buglet and also makes sure not to draw a line when the commit has no parents.
165 lines
4.5 KiB
Plaintext
165 lines
4.5 KiB
Plaintext
//
|
|
// PBGitGrapher.m
|
|
// GitX
|
|
//
|
|
// Created by Pieter de Bie on 17-06-08.
|
|
// Copyright 2008 __MyCompanyName__. All rights reserved.
|
|
//
|
|
|
|
#import "PBGitGrapher.h"
|
|
#import "PBGitCommit.h"
|
|
#import "PBGitLane.h"
|
|
#import "PBGitGraphLine.h"
|
|
#import <list>
|
|
#import "git/oid.h"
|
|
|
|
using namespace std;
|
|
|
|
@implementation PBGitGrapher
|
|
|
|
#define MAX_LANES 32
|
|
|
|
- (id) initWithRepository: (PBGitRepository*) repo
|
|
{
|
|
refs = repo.refs;
|
|
pl = new std::list<PBGitLane *>;
|
|
|
|
PBGitLane::resetColors();
|
|
return self;
|
|
}
|
|
|
|
void add_line(struct PBGitGraphLine *lines, int *nLines, int upper, int from, int to, int index)
|
|
{
|
|
// TODO: put in one thing
|
|
struct PBGitGraphLine a = { upper, from, to, index };
|
|
lines[(*nLines)++] = a;
|
|
}
|
|
|
|
- (void) decorateCommit: (PBGitCommit *) commit
|
|
{
|
|
int i = 0, newPos = -1;
|
|
std::list<PBGitLane *> *currentLanes = new std::list<PBGitLane *>;
|
|
std::list<PBGitLane *> *previousLanes = (std::list<PBGitLane *> *)pl;
|
|
|
|
int maxLines = (previousLanes->size() + commit.nParents + 2) * 2;
|
|
struct PBGitGraphLine *lines = (struct PBGitGraphLine *)malloc(sizeof(struct PBGitGraphLine) * maxLines);
|
|
int currentLine = 0;
|
|
|
|
PBGitLane *currentLane = NULL;
|
|
BOOL didFirst = NO;
|
|
|
|
// First, iterate over earlier columns and pass through any that don't want this commit
|
|
if (previous != nil) {
|
|
// We can't count until numColumns here, as it's only used for the width of the cell.
|
|
std::list<PBGitLane *>::iterator it = previousLanes->begin();
|
|
for (; it != previousLanes->end(); ++it) {
|
|
i++;
|
|
// This is our commit! We should do a "merge": move the line from
|
|
// our upperMapping to their lowerMapping
|
|
if ((*it)->isCommit([commit sha])) {
|
|
if (!didFirst) {
|
|
didFirst = YES;
|
|
currentLanes->push_back(*it);
|
|
currentLane = currentLanes->back();
|
|
newPos = currentLanes->size();
|
|
add_line(lines, ¤tLine, 1, i, newPos,(*it)->index());
|
|
if (commit.nParents)
|
|
add_line(lines, ¤tLine, 0, newPos, newPos,(*it)->index());
|
|
}
|
|
else {
|
|
add_line(lines, ¤tLine, 1, i, newPos,(*it)->index());
|
|
delete *it;
|
|
}
|
|
}
|
|
else {
|
|
// We are not this commit.
|
|
currentLanes->push_back(*it);
|
|
add_line(lines, ¤tLine, 1, i, currentLanes->size(),(*it)->index());
|
|
add_line(lines, ¤tLine, 0, currentLanes->size(), currentLanes->size(), (*it)->index());
|
|
}
|
|
// For existing columns, we always just continue straight down
|
|
// ^^ I don't know what that means anymore :(
|
|
|
|
}
|
|
}
|
|
//Add your own parents
|
|
|
|
// If we already did the first parent, don't do so again
|
|
if (!didFirst && currentLanes->size() < MAX_LANES && commit.nParents) {
|
|
PBGitLane *newLane = new PBGitLane(commit.parentShas);
|
|
currentLanes->push_back(newLane);
|
|
newPos = currentLanes->size();
|
|
add_line(lines, ¤tLine, 0, newPos, newPos, newLane->index());
|
|
}
|
|
|
|
// Add all other parents
|
|
|
|
// If we add at least one parent, we can go back a single column.
|
|
// This boolean will tell us if that happened
|
|
BOOL addedParent = NO;
|
|
|
|
int parentIndex;
|
|
for (parentIndex = 1; parentIndex < commit.nParents; ++parentIndex) {
|
|
git_oid *parent = commit.parentShas + parentIndex;
|
|
int i = 0;
|
|
BOOL was_displayed = NO;
|
|
std::list<PBGitLane *>::iterator it = currentLanes->begin();
|
|
for (; it != currentLanes->end(); ++it) {
|
|
i++;
|
|
if ((*it)->isCommit(parent)) {
|
|
add_line(lines, ¤tLine, 0, i, newPos,(*it)->index());
|
|
was_displayed = YES;
|
|
break;
|
|
}
|
|
}
|
|
if (was_displayed)
|
|
continue;
|
|
|
|
if (currentLanes->size() >= MAX_LANES)
|
|
break;
|
|
|
|
// Really add this parent
|
|
addedParent = YES;
|
|
PBGitLane *newLane = new PBGitLane(parent);
|
|
currentLanes->push_back(newLane);
|
|
add_line(lines, ¤tLine, 0, currentLanes->size(), newPos, newLane->index());
|
|
}
|
|
|
|
previous = [[PBGraphCellInfo alloc] initWithPosition:newPos andLines:lines];
|
|
if (currentLine > maxLines)
|
|
NSLog(@"Number of lines: %i vs allocated: %i", currentLine, maxLines);
|
|
|
|
previous.nLines = currentLine;
|
|
previous.sign = commit.sign;
|
|
|
|
// If a parent was added, we have room to not indent.
|
|
if (addedParent)
|
|
previous.numColumns = currentLanes->size() - 1;
|
|
else
|
|
previous.numColumns = currentLanes->size();
|
|
|
|
// Update the current lane to point to the new parent
|
|
if (currentLane && commit.nParents > 0)
|
|
currentLane->setSha(commit.parentShas[0]);
|
|
else
|
|
currentLanes->remove(currentLane);
|
|
|
|
delete previousLanes;
|
|
|
|
pl = currentLanes;
|
|
commit.lineInfo = previous;
|
|
}
|
|
|
|
- (void) finalize
|
|
{
|
|
std::list<PBGitLane *> *lanes = (std::list<PBGitLane *> *)pl;
|
|
std::list<PBGitLane *>::iterator it = lanes->begin();
|
|
for (; it != lanes->end(); ++it)
|
|
delete *it;
|
|
|
|
delete lanes;
|
|
|
|
[super finalize];
|
|
}
|
|
@end
|