git/graph.c, branch v1.7.2

graph.c: register a callback for graph output

2010-06-01T01:02:07Z

It will look better if the 'git log --graph' print the graph pading lines before the diff output just like what it does for commit message. And this patch leverage the new diff prefix callback function to achieve this. Signed-off-by: Bo Yang Signed-off-by: Junio C Hamano

Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*

2010-03-07T19:09:02Z

Add GIT_COLOR_BOLD_* macros to set both bold and the color in one sequence. This saves two characters of output ("ESC [ m", minus ";") and makes the code more readable. Add the remaining GIT_COLOR_BG_* macros to make the list complete. The white and black colors are not included since they look bad on most terminals. Signed-off-by: Mark Lodato Signed-off-by: Junio C Hamano

Merge branch 'as/maint-graph-interesting-fix'

2009-08-27T23:59:56Z

* as/maint-graph-interesting-fix: Add tests for rev-list --graph with options that simplify history graph API: fix bug in graph_is_interesting()

graph API: fix bug in graph_is_interesting()

2009-08-21T19:41:25Z

Previously, graph_is_interesting() did not behave quite the same way as the code in get_revision(). As a result, it would sometimes think commits were uninteresting, even though get_revision() would return them. This resulted in incorrect lines in the graph output. This change creates a get_commit_action() function, which graph_is_interesting() and simplify_commit() both now use to determine if a commit will be shown. It is identical to the old simplify_commit() behavior, except that it never calls rewrite_parents(). This problem was reported by Santi Béjar. The following command would exhibit the problem before, but now works correctly: git log --graph --simplify-by-decoration --oneline v1.6.3.3 Previously git graph did not display the output for this command correctly between f29ac4f and 66996ec, among other places. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano

graph API: use a new color when starting a brand new column

2009-08-19T06:32:28Z

Use a new color for commits that don't have any previously printed children. The following command demonstrates the changes: git log --graph --pretty=tformat:'%h %s%n' -7 481c7a6 18b0793 Now the two independent lines of development are displayed with different colors, instead of both using the same color. Signed-off-by: Adam Simpkins Signed-off-by: Junio C Hamano

janitor: use NULL and not 0 for pointers.

2009-07-23T04:57:41Z

Brought to you thanks to coccinelle: ---8<---- @@ expression *E; @@ ( E == - 0 + NULL | E != - 0 + NULL | E = - 0 + NULL ) @@ identifier f; type T; @@ T *f(...) { <... - return 0; + return NULL; ...> } --->8---- There are a lot more hits in compat/nedmallox and compat/regex but these are borrowed code we rather do not want to maintain our own forks for, and this patch refrains from touching them. Signed-off-by: Pierre Habouzit Signed-off-by: Junio C Hamano

Merge branch 'ac/graph-horizontal-line'

2009-05-18T15:59:30Z

* ac/graph-horizontal-line: graph API: Use horizontal lines for more compact graphs

Fix typos / spelling in comments

2009-04-23T02:02:12Z

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

graph API: Use horizontal lines for more compact graphs

2009-04-23T01:32:16Z

Use horizontal lines instead of long diagonal lines during the collapsing state of graph rendering. For example what used to be: | | | | | | | | |/ | | |/| | |/| | |/| | | | | | | is now | | | | | | |_|_|/ |/| | | | | | | This results in more compact and legible graphs. Signed-off-by: Allan Caffee 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