cgit/ui-log.c, branch lh/grep

Merge branch 'stable'

2012-01-03T16:06:58Z

ui-log.c: do not show remote heads if enable-remote-branches=0

2012-01-03T15:35:06Z

If remote branches are not enabled, the branches are still listed in the log view. This patch removes them if enable-remote-branches=0.

Merge branch 'stable'

2011-06-02T10:33:23Z

ui-log.c: do not link from age column

2011-06-02T10:30:26Z

The link url wasn't properly escaped, and since the link was identical to the one used on the commit message it didn't serve any special purpose. Signed-off-by: Lars Hjemli

make enable-log-linecount independent of -filecount

2011-03-26T14:20:55Z

You should be able to independently switch file and line count on and off. This patch makes the code work like the documentation suggests: no dependency for line counts to be displayed only when file counts are. Signed-off-by: Julius Plenz Signed-off-by: Lars Hjemli

ui-log: Move 'Age' column when commit graph is present

2010-11-16T07:18:37Z

When the commit graph is present, we prefer to draw it along the left edge, and moving the 'Age' column to the right of the 'Author' column, like in gitk. Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli

ui-log: Line-wrap long commit subjects when showmsg is enabled

2010-11-16T07:18:37Z

When showmsg is disabled ui-log truncates long commit subjects. This is good. However, the same is not desirable when showmsg is enabled, since you then end up with a truncated commit subject followed by the rest of the commit message below. Instead, when showmsg is enabled (and we're using all this space to display the entire commit message, anyway), line-wrap the commit subject instead of truncating it. Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli

ui-log: Colorize commit graph

2010-11-16T07:18:37Z

Use the existing coloring logic in Git's graph code to color the lines between commits in the commit graph. Whereas Git normally uses ANSI color escapes to produce colors, we here use graph_set_column_colors() to replace those with HTML color escapes, that embed the graph lines in tags that apply the desired color using CSS. Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli

ui-log: Implement support for commit graphs

2010-11-16T07:18:36Z

Teach CGit to print an ASCII art commit graph to the left of the commit message, similar to 'git log --graph'. The graph adds extra lines (table rows) to the log when needed to add/remove/shuffle edges in the graph. When 'showmsg' is enabled, the graph is automatically padded to account for the extra lines added by the commit message/notes. This feature is controlled by a new config variable: "enable-commit-graph" (disabled by default), and individual repos can control it by setting "repo.enable-commit-graph". Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli

ui-log: Change display of full commit messages (and notes)

2010-11-16T07:18:36Z

When showmsg is enabled, ui-log (in addition to the table row containing the details of the current commit) adds a second table row containing the remainder of the commit message, and yet another table row containing the commit notes (if any). The vertical margins between commit subject, commit message and commit notes are controlled by CSS. In preparation for the commit graph (which will be printed to the left of the commit message/notes) we need to eliminate these vertical margins (as they would produce ugly gaps in the commit graph) and instead achieve them by adding newlines to the commit message/notes. Furthermore, we can no longer print the "Notes:" header in the "Age" column, since the graph will be drawn between the "Age" column and the "Commit message" column. This patch therefore prepares the commit message and commit notes in a single buffer (properly formatting the notes using the NOTES_SHOW_HEADER and NOTES_INDENT flags to format_note()), and then prints the entire buffer into a single table row. Signed-off-by: Johan Herland Signed-off-by: Lars Hjemli