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

diff --git a/Makefile b/Makefile
index 31d88ef4defbbde46b6928cda7f7760e87a72803..a9887517a14f72235f04a86eb3ae4d8ec67a156d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -4,10 +4,22 @@ CGIT_SCRIPT_PATH = /var/www/htdocs/cgit
 CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH)
 CGIT_CONFIG = /etc/cgitrc
 CACHE_ROOT = /var/cache/cgit
+prefix = /usr
+libdir = $(prefix)/lib
+filterdir = $(libdir)/cgit/filters
+docdir = $(prefix)/share/doc/cgit
+htmldir = $(docdir)
+pdfdir = $(docdir)
+mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 1.7.3
+GIT_VER = 1.7.4
 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2
 INSTALL = install
+MAN5_TXT = $(wildcard *.5.txt)
+MAN_TXT  = $(MAN5_TXT)
+DOC_MAN5 = $(patsubst %.txt,%,$(MAN5_TXT))
+DOC_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
+DOC_PDF  = $(patsubst %.txt,%.pdf,$(MAN_TXT))
 
 # Define NO_STRCASESTR if you don't have strcasestr.
 #
@@ -111,7 +123,8 @@ endif
 
 
 .PHONY: all libgit test install uninstall clean force-version get-git \
-       doc man-doc html-doc clean-doc
+       doc clean-doc install-doc install-man install-html install-pdf \
+       uninstall-doc uninstall-man uninstall-html uninstall-pdf
 
 all: cgit
 
@@ -167,21 +180,58 @@ install: all
        $(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
        $(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
        $(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(filterdir)
+       $(INSTALL) -m 0755 filters/* $(DESTDIR)$(filterdir)
+
+install-doc: install-man install-html install-pdf
+
+install-man: doc-man
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(mandir)/man5
+       $(INSTALL) -m 0644 $(DOC_MAN5) $(DESTDIR)$(mandir)/man5
+
+install-html: doc-html
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(htmldir)
+       $(INSTALL) -m 0644 $(DOC_HTML) $(DESTDIR)$(htmldir)
+
+install-pdf: doc-pdf
+       $(INSTALL) -m 0755 -d $(DESTDIR)$(pdfdir)
+       $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir)
 
 uninstall:
        rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
        rm -f $(CGIT_DATA_PATH)/cgit.css
        rm -f $(CGIT_DATA_PATH)/cgit.png
 
-doc: man-doc html-doc pdf-doc
+uninstall-doc: uninstall-man uninstall-html uninstall-pdf
+
+uninstall-man:
+       @for i in $(DOC_MAN5); do \
+           rm -fv $(DESTDIR)$(mandir)/man5/$$i; \
+       done
+
+uninstall-html:
+       @for i in $(DOC_HTML); do \
+           rm -fv $(DESTDIR)$(htmldir)/$$i; \
+       done
+
+uninstall-pdf:
+       @for i in $(DOC_PDF); do \
+           rm -fv $(DESTDIR)$(pdfdir)/$$i; \
+       done
+
+doc: doc-man doc-html doc-pdf
+doc-man: doc-man5
+doc-man5: $(DOC_MAN5)
+doc-html: $(DOC_HTML)
+doc-pdf: $(DOC_PDF)
 
-man-doc: cgitrc.5.txt
-       a2x -f manpage cgitrc.5.txt
+%.5 : %.5.txt
+       a2x -f manpage $<
 
-html-doc: cgitrc.5.txt
-       a2x -f xhtml --stylesheet=cgit-doc.css cgitrc.5.txt
+$(DOC_HTML): %.html : %.txt
+       a2x -f xhtml --stylesheet=cgit-doc.css $<
 
-pdf-doc: cgitrc.5.txt
+$(DOC_PDF): %.pdf : %.txt
        a2x -f pdf cgitrc.5.txt
 
 clean: clean-doc

diff --git a/cgit.css b/cgit.css
index 1ebef557d17f61f507f373c26ed15ffc3f1bb9d3..008cff8e0c766fa4bf85a6f7fbaee7e644335b60 100644 (file)
--- a/cgit.css
+++ b/cgit.css
@@ -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 --git a/cgitrc.5.txt b/cgitrc.5.txt
index b45c46b55b367f2db8341f2a6acdbebff05fb026..3c20fe1a075f88da8c51a5ab790d2ce20c43d02f 100644 (file)
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -440,7 +440,7 @@ cache-size=1000
 
 
 # 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
@@ -475,14 +475,14 @@ max-stats=quarter
 
 
 # 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
 
 
@@ -516,14 +516,14 @@ mimetype.svg=image/svg+xml
 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
 
 

diff --git a/git b/git
index 87b50542a08ac6caa083ddc376e674424e37940a..7ed863a85a6ce2c4ac4476848310b8f917ab41f9 160000 (submodule)
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit 87b50542a08ac6caa083ddc376e674424e37940a
+Subproject commit 7ed863a85a6ce2c4ac4476848310b8f917ab41f9

diff --git a/ui-stats.c b/ui-stats.c
index 946a6ea9a53f8efb709fe36032651eb2e297476d..2a0c17460b0894f22e81eea7eacf7693b8d99d54 100644 (file)
--- a/ui-stats.c
+++ b/ui-stats.c
@@ -1,5 +1,3 @@
-#include <string-list.h>
-
 #include "cgit.h"
 #include "html.h"
 #include "ui-shared.h"