From: Lars Hjemli <hjemli@gmail.com>
Date: Sat, 19 Feb 2011 13:01:59 +0000 (+0100)
Subject: Merge branch 'jh/graph'
X-Git-Url: https://gitweb.ps.run/ps-cgit/commitdiff_plain/31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63?hp=-c

Merge branch 'jh/graph'

* jh/graph:
  ui-log: Move 'Age' column when commit graph is present
  ui-log: Line-wrap long commit subjects when showmsg is enabled
  ui-log: Colorize commit graph
  ui-log: Implement support for commit graphs
  ui-log: Change display of full commit messages (and notes)

Conflicts:
	cgit.css
---

31e1f9af1d46bd7dfdb3b2ac580c0d0cc8dbaa63
diff --combined cgit.css
index a2a685b,1ebef55..008cff8
--- a/cgit.css
+++ b/cgit.css
@@@ -153,26 -153,44 +153,44 @@@ table.list td 
  	padding: 0.1em 0.5em 0.1em 0.5em;
  }
  
- table.list td.logsubject {
+ table.list td.commitgraph {
  	font-family: monospace;
- 	font-weight: bold;
+ 	white-space: pre;
  }
  
- table.list td.logmsg {
- 	font-family: monospace;
- 	white-space: pre;
- 	padding: 1em 0.5em 2em 0.5em;
+ table.list td.commitgraph .column1 {
+ 	color: #a00;
+ }
+ 
+ table.list td.commitgraph .column2 {
+ 	color: #0a0;
+ }
+ 
+ table.list td.commitgraph .column3 {
+ 	color: #aa0;
  }
  
- table.list td.lognotes-label {
- 	text-align:right;
- 	vertical-align:top;
+ table.list td.commitgraph .column4 {
+ 	color: #00a;
  }
  
- table.list td.lognotes {
+ table.list td.commitgraph .column5 {
+ 	color: #a0a;
+ }
+ 
+ table.list td.commitgraph .column6 {
+ 	color: #0aa;
+ }
+ 
+ table.list td.logsubject {
+ 	font-family: monospace;
+ 	font-weight: bold;
+ }
+ 
+ table.list td.logmsg {
  	font-family: monospace;
  	white-space: pre;
- 	padding: 0em 0.5em 2em 0.5em;
+ 	padding: 0 0.5em;
  }
  
  table.list td a {
@@@ -743,17 -761,3 +761,17 @@@ table.ssdiff td.space 
  table.ssdiff td.space div {
  	min-height: 3em;
  }
 +
 +/* Syntax highlighting */
 +table.blob .num  { color:#2928ff; }
 +table.blob .esc  { color:#ff00ff; }
 +table.blob .str  { color:#ff0000; }
 +table.blob .dstr { color:#818100; }
 +table.blob .slc  { color:#838183; font-style:italic; }
 +table.blob .com  { color:#838183; font-style:italic; }
 +table.blob .dir  { color:#008200; }
 +table.blob .sym  { color:#000000; }
 +table.blob .kwa  { color:#000000; font-weight:bold; }
 +table.blob .kwb  { color:#830000; }
 +table.blob .kwc  { color:#000000; font-weight:bold; }
 +table.blob .kwd  { color:#010181; }
diff --combined cgitrc.5.txt
index 8e51ca5,b45c46b..3c20fe1
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@@ -90,7 -90,12 +90,12 @@@ embedded:
  	Flag which, when set to "1", will make cgit generate a html fragment
  	suitable for embedding in other html pages. Default value: none. See
  	also: "noheader".
- 	
+ 
+ enable-commit-graph::
+ 	Flag which, when set to "1", will make cgit print an ASCII-art commit
+ 	history graph to the left of the commit messages in the repository
+ 	log page. Default value: "0".
+ 
  enable-filter-overrides::
  	Flag which, when set to "1", allows all filter settings to be
  	overridden in repository-specific cgitrc files. Default value: none.
@@@ -354,6 -359,10 +359,10 @@@ repo.defbranch:
  repo.desc::
  	The value to show as repository description. Default value: none.
  
+ repo.enable-commit-graph::
+ 	A flag which can be used to disable the global setting
+ 	`enable-commit-graph'. Default value: none.
+ 
  repo.enable-log-filecount::
  	A flag which can be used to disable the global setting
  	`enable-log-filecount'. Default value: none.
@@@ -431,7 -440,7 +440,7 @@@ cache-size=100
  
  
  # Specify some default clone prefixes
 -clone-prefix=git://foobar.com ssh://foobar.com/pub/git http://foobar.com/git
 +clone-prefix=git://example.com ssh://example.com/pub/git http://example.com/git
  
  # Specify the css url
  css=/css/cgit.css
@@@ -441,6 -450,10 +450,10 @@@
  enable-index-links=1
  
  
+ # Enable ASCII art commit history graph on the log pages
+ enable-commit-graph=1
+ 
+ 
  # Show number of affected files per commit on the log pages
  enable-log-filecount=1
  
@@@ -462,14 -475,14 +475,14 @@@ max-stats=quarte
  
  
  # Set the title and heading of the repository index page
 -root-title=foobar.com git repositories
 +root-title=example.com git repositories
  
  
  # Set a subheading for the repository index page
  root-desc=tracking the foobar development
  
  
 -# Include some more info about foobar.com on the index page
 +# Include some more info about example.com on the index page
  root-readme=/var/www/htdocs/about.html
  
  
@@@ -503,14 -516,14 +516,14 @@@ mimetype.svg=image/svg+xm
  repo.url=foo
  repo.path=/pub/git/foo.git
  repo.desc=the master foo repository
 -repo.owner=fooman@foobar.com
 +repo.owner=fooman@example.com
  repo.readme=info/web/about.html
  
  
  repo.url=bar
  repo.path=/pub/git/bar.git
  repo.desc=the bars for your foo
 -repo.owner=barman@foobar.com
 +repo.owner=barman@example.com
  repo.readme=info/web/about.html