git/graph.c, branch v1.6.3

Fix typos / spelling in comments

2009-04-23T02:02:12Z

Signed-off-by: Mike Ralphson Signed-off-by: Junio C Hamano

graph API: fix a bug in the rendering of octopus merges

2009-04-23T00:49:56Z

An off by one error was causing octopus merges with 3 parents to not be rendered correctly. This regression was introduced by 427fc5. Signed-off-by: Allan Caffee Signed-off-by: Junio C Hamano

graph API: fix extra space during pre_commit_line state

2009-04-23T00:48:42Z

An extra space is being inserted between the "commit" column and all of the successive edges. Remove this space. This regression was introduced by 427fc5b. Signed-off-by: Allan Caffee Signed-off-by: Junio C Hamano

graph API: Added logic for colored edges

2009-04-14T05:41:25Z

Modified the graph drawing logic to colorize edges based on parent-child relationships similiarly to gitk. Signed-off-by: Allan Caffee Signed-off-by: Junio C Hamano

Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer

2008-10-12T19:36:19Z

Many call sites use strbuf_init(&foo, 0) to initialize local strbuf variable "foo" which has not been accessed since its declaration. These can be replaced with a static initialization using the STRBUF_INIT macro which is just as readable, saves a function call, and takes up fewer lines. Signed-off-by: Brandon Casey Signed-off-by: Shawn O. Pearce

graph.c: make many functions static

2008-09-25T15:00:28Z

These function are not used anywhere. Also removes graph_release() that is never called. Signed-off-by: Nanako Shiraishi Signed-off-by: Shawn O. Pearce

git log --graph: print '*' for all commits, including merges

2008-06-06T18:56:43Z

Previously, merge commits were printed with 'M' instead of '*'. This had the potential to confuse users when not all parents of the merge commit were included in the log output. As Junio has pointed out, merge commits can almost always be easily identified from the log message, anyway. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano

graph API: fix "git log --graph --first-parent"

2008-06-06T16:23:09Z

This change teaches the graph API that only the first parent of each commit is interesting when "--first-parent" was specified. This change also consolidates the graph parent walking logic into two new internal functions, first_interesting_parent() and next_interesting_parent(). A simpler fix would have been to simply break at the end of the 2 existing for loops when graph->revs->first_parent_only is set. However, this change seems nicer, especially if we ever need to add any new loops over the parent list in the future. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano

graph API: avoid printing unnecessary padding before some octopus merges

2008-06-02T04:44:47Z

When an octopus merge is printed, several lines are printed before it to move over existing branch lines to its right. This is needed to make room for the children of the octopus merge. For example: | | | | | | \ \ | | \ \ | | \ \ | M---. \ \ | |\ \ \ \ \ However, this step isn't necessary if there are no branch lines to the right of the octopus merge. Therefore, skip this step when it is not needed, to avoid printing extra lines that don't really serve any purpose. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano

graph API: improve display of merge commits

2008-06-01T21:50:52Z

This change improves the way merge commits are displayed, to eliminate a few visual artifacts. Previously, merge commits were displayed as: | M \ | |\ | As pointed out by Teemu Likonen, this didn't look nice if the rightmost branch line was displayed as '\' on the previous line, as it then appeared to have an extra space in it: | |\ | M \ | |\ | This change updates the code so that branch lines to the right of merge commits are printed slightly differently depending on how the previous line was displayed: | |\ | | | | | / | M \ | M | | M | | |\ \ | |\ \ | |\ \ Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano