aboutsummaryrefslogtreecommitdiffstats
path: root/cgit.c
diff options
context:
space:
mode:
authorLars Hjemli <hjemli@gmail.com>2006-12-20 22:48:27 +0100
committerLars Hjemli <hjemli@gmail.com>2006-12-20 22:48:27 +0100
commit36aba00273e7af1b94bf8c5dd5068709d983d01e (patch)
treed9be4e6f27b115a799af40cad43445f63fbf2238 /cgit.c
parentUse html_filemode in ui-tree.c (diff)
downloadcgit-36aba00273e7af1b94bf8c5dd5068709d983d01e.tar.xz
cgit-36aba00273e7af1b94bf8c5dd5068709d983d01e.zip
Add basic diff view
Finally, xdiff is used to show per-file diffs via commit view. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (limited to '')
-rw-r--r--cgit.c2
-rw-r--r--cgit.css25
2 files changed, 27 insertions, 0 deletions
diff --git a/cgit.c b/cgit.c
index 372b436..ac43441 100644
--- a/cgit.c
+++ b/cgit.c
@@ -36,6 +36,8 @@ static void cgit_print_repo_page(struct cacheitem *item)
cgit_print_commit(cgit_query_sha1);
} else if (!strcmp(cgit_query_page, "view")) {
cgit_print_view(cgit_query_sha1);
+ } else if (!strcmp(cgit_query_page, "diff")) {
+ cgit_print_diff(cgit_query_sha1, cgit_query_sha2);
}
cgit_print_docend();
}
diff --git a/cgit.css b/cgit.css
index 5f01926..7b8e468 100644
--- a/cgit.css
+++ b/cgit.css
@@ -77,12 +77,18 @@ div.error {
font-weight: bold;
margin: 1em 2em;
}
+div.ls-blob, div.ls-dir {
+ font-family: monospace;
+}
div.ls-dir a {
font-weight: bold;
}
th.filesize, td.filesize {
text-align: right;
}
+td.filesize {
+ font-family: monospace;
+}
td.filemode {
font-family: monospace;
}
@@ -154,6 +160,25 @@ table.diffstat td.summary {
color: #888;
padding-top: 0.5em;
}
+
+table.diff td {
+ border: solid 1px black;
+ font-family: monospace;
+ white-space: pre;
+}
+
+table.diff td div.hunk {
+ background: #ccc;
+}
+
+table.diff td div.add {
+ color: green;
+}
+
+table.diff td div.del {
+ color: red;
+}
+
.sha1 {
font-family: courier;
font-size: 90%;