kernel/git - git - PowerEL Git System

Commit Graph

Author	SHA1	Message	Date
Pierre Habouzit	67da52bedc	janitor: use NULL and not 0 for pointers. 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 <madcoder@debian.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>	16 years ago
Mike Ralphson	3ea3c215c0	Fix typos / spelling in comments Signed-off-by: Mike Ralphson <mike@abacus.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>	16 years ago
Allan Caffee	eaf158f8bd	graph API: Use horizontal lines for more compact graphs 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 <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	16 years ago
Allan Caffee	a6c1a3827c	graph API: fix a bug in the rendering of octopus merges 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 <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	16 years ago
Allan Caffee	36a31feae2	graph API: fix extra space during pre_commit_line state 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 <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	16 years ago
Allan Caffee	427fc5b888	graph API: Added logic for colored edges Modified the graph drawing logic to colorize edges based on parent-child relationships similiarly to gitk. Signed-off-by: Allan Caffee <allan.caffee@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	16 years ago
Brandon Casey	f285a2d7ed	Replace calls to strbuf_init(&foo, 0) with STRBUF_INIT initializer 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 <casey@nrlssc.navy.mil> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>	16 years ago
Nanako Shiraishi	064bfbde45	graph.c: make many functions static These function are not used anywhere. Also removes graph_release() that is never called. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>	16 years ago
Adam Simpkins	03300c0ac0	git log --graph: print '' for all commits, including merges 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 <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	a0ebe573a5	graph API: fix "git log --graph --first-parent" 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 <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	f1979d6b3f	graph API: avoid printing unnecessary padding before some octopus merges 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 <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	3395908ee4	graph API: improve display of merge commits 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 <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	4603ec0f96	get_revision(): honor the topo_order flag for boundary commits Now get_revision() sorts the boundary commits when topo_order is set. Since sort_in_topological_order() takes a struct commit_list, it first places the boundary commits into revs->commits. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	3c68d67b57	Fix output of "git log --graph --boundary" Previously the graphing API wasn't aware of the revs->boundary flag, and it always assumed that commits marked UNINTERESTING would not be displayed. As a result, the boundary commits were printed at the end of the log output, but they didn't have any branch lines connecting them to their children in the graph. There was also another bug in the get_revision() code that caused graph_update() to be called twice on the first boundary commit. This caused the graph API to think that a commit had been skipped, and print a "..." line in the output. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	7528f27dd6	log --graph --left-right: show left/right information in place of '' With the --graph option, the graph already outputs 'o' instead of '' for boundary commits. Make it emit '<' or '>' when --left-right is specified. (This change also disables the '^' prefix for UNINTERESTING commits. The graph code currently doesn't print anything special for these commits, since it assumes no UNINTERESTING, non-BOUNDARY commits are displayed. This is potentially a bug if UNINTERESTING non-BOUNDARY commits can actually be displayed via some code path.) [jc: squashed the left-right change from Dscho and Adam's fixup into one] Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	37a75abc98	graph API: don't print branch lines for uninteresting merge parents Previously, the graphing code printed lines coming out of a merge commit for all of its parents, even if some of them were uninteresting. Now it only prints lines for interesting commits. For example, for a merge commit where only the first parent is interesting, the code now prints: * merge commit * interesting child instead of: M merge commit \|\ * interesting child Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	2ecbd0a0db	graph API: fix graph mis-alignment after uninteresting commits The graphing code had a bug that caused it to output branch lines incorrectly after ignoring an uninteresting commit. When computing how to match up the branch lines from the current commit to the next one, it forgot to take into account that it needed to initially start with 2 empty spaces where the missing commit would have gone. So, instead of drawing this, \| * \| <- Commit with uninteresting parent \| / * \| It used to incorrectly draw this: \| * \| <- Commit with uninteresting parent * \| Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	0724cb86c5	graph API: eliminate unnecessary indentation This change improves the calculation of the amount of horizontal padding, so that there is always exactly 1 space of padding. Previously, most commits had 3 spaces of padding, but commits that didn't have any children in the graph had only 1 space of padding. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago
Adam Simpkins	c12172d2ea	Add history graph API This new API allows the commit history to be displayed as a text-based graphical representation. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>	17 years ago

20 Commits (86c91f91794cd6af8e19fbe68ab283d567d2b66f)