aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cgit.c2
-rw-r--r--cgit.css11
-rw-r--r--cgit.h4
-rw-r--r--cgitrc7
-rwxr-xr-xgen-version.sh2
-rw-r--r--shared.c15
-rw-r--r--ui-commit.c4
-rw-r--r--ui-diff.c45
8 files changed, 59 insertions, 31 deletions
diff --git a/cgit.c b/cgit.c
index c86d290..1b85b15 100644
--- a/cgit.c
+++ b/cgit.c
@@ -107,7 +107,7 @@ static void cgit_print_repo_page(struct cacheitem *item)
107 cgit_print_tag(cgit_query_sha1); 107 cgit_print_tag(cgit_query_sha1);
108 break; 108 break;
109 case CMD_DIFF: 109 case CMD_DIFF:
110 cgit_print_diff(cgit_query_sha1, cgit_query_sha2); 110 cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
111 break; 111 break;
112 default: 112 default:
113 cgit_print_error("Invalid request"); 113 cgit_print_error("Invalid request");
diff --git a/cgit.css b/cgit.css
index 65ff5c3..b8c3d81 100644
--- a/cgit.css
+++ b/cgit.css
@@ -272,10 +272,6 @@ table.diffstat {
272 background-color: #eee; 272 background-color: #eee;
273} 273}
274 274
275table.diffstat tr:hover {
276 background-color: #ccc;
277}
278
279table.diffstat th { 275table.diffstat th {
280 font-weight: normal; 276 font-weight: normal;
281 text-align: left; 277 text-align: left;
@@ -339,6 +335,10 @@ div.diffstat-summary {
339 padding-top: 0.5em; 335 padding-top: 0.5em;
340} 336}
341 337
338table.diff {
339 width: 100%;
340}
341
342table.diff td { 342table.diff td {
343 font-family: monospace; 343 font-family: monospace;
344 white-space: pre; 344 white-space: pre;
@@ -346,7 +346,8 @@ table.diff td {
346 346
347table.diff td div.head { 347table.diff td div.head {
348 font-weight: bold; 348 font-weight: bold;
349 padding-top: 1em; 349 margin-top: 1em;
350 background-color: #eee;
350} 351}
351 352
352table.diff td div.hunk { 353table.diff td div.hunk {
diff --git a/cgit.h b/cgit.h
index e3d9cb8..e96311f 100644
--- a/cgit.h
+++ b/cgit.h
@@ -170,7 +170,7 @@ extern int cgit_diff_files(const unsigned char *old_sha1,
170 170
171extern void cgit_diff_tree(const unsigned char *old_sha1, 171extern void cgit_diff_tree(const unsigned char *old_sha1,
172 const unsigned char *new_sha1, 172 const unsigned char *new_sha1,
173 filepair_fn fn); 173 filepair_fn fn, const char *prefix);
174 174
175extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); 175extern void cgit_diff_commit(struct commit *commit, filepair_fn fn);
176 176
@@ -238,7 +238,7 @@ extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path)
238extern void cgit_print_tree(const char *rev, char *path); 238extern void cgit_print_tree(const char *rev, char *path);
239extern void cgit_print_commit(char *hex); 239extern void cgit_print_commit(char *hex);
240extern void cgit_print_tag(char *revname); 240extern void cgit_print_tag(char *revname);
241extern void cgit_print_diff(const char *new_hex, const char *old_hex); 241extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
242extern void cgit_print_snapshot(struct cacheitem *item, const char *head, 242extern void cgit_print_snapshot(struct cacheitem *item, const char *head,
243 const char *hex, const char *prefix, 243 const char *hex, const char *prefix,
244 const char *filename, int snapshot); 244 const char *filename, int snapshot);
diff --git a/cgitrc b/cgitrc
index 34ea116..796a62c 100644
--- a/cgitrc
+++ b/cgitrc
@@ -41,6 +41,13 @@
41#agefile=info/web/last-modified 41#agefile=info/web/last-modified
42 42
43 43
44## Git detects renames, but with a limit on the number of files to
45## consider. This option can be used to specify another limit (or -1 to
46## use the default limit).
47##
48#renamelimit=-1
49
50
44## Specify a root for virtual urls. This makes cgit generate urls like 51## Specify a root for virtual urls. This makes cgit generate urls like
45## 52##
46## http://localhost/git/repo/log/?h=branch 53## http://localhost/git/repo/log/?h=branch
diff --git a/gen-version.sh b/gen-version.sh
index 739c83e..3a08015 100755
--- a/gen-version.sh
+++ b/gen-version.sh
@@ -6,7 +6,7 @@ V=$1
6# Use `git describe` to get current version if we're inside a git repo 6# Use `git describe` to get current version if we're inside a git repo
7if test -d .git 7if test -d .git
8then 8then
9 V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') 9 V=$(git describe --abbrev=4 HEAD 2>/dev/null)
10fi 10fi
11 11
12new="CGIT_VERSION = $V" 12new="CGIT_VERSION = $V"
diff --git a/shared.c b/shared.c
index 0fe513f..3d4feea 100644
--- a/shared.c
+++ b/shared.c
@@ -38,6 +38,7 @@ int cgit_cache_dynamic_ttl = 5;
38int cgit_cache_static_ttl = -1; 38int cgit_cache_static_ttl = -1;
39int cgit_cache_max_create_time = 5; 39int cgit_cache_max_create_time = 5;
40int cgit_summary_log = 0; 40int cgit_summary_log = 0;
41int cgit_renamelimit = -1;
41 42
42int cgit_max_msg_len = 60; 43int cgit_max_msg_len = 60;
43int cgit_max_repodesc_len = 60; 44int cgit_max_repodesc_len = 60;
@@ -182,6 +183,8 @@ void cgit_global_config_cb(const char *name, const char *value)
182 cgit_summary_log = atoi(value); 183 cgit_summary_log = atoi(value);
183 else if (!strcmp(name, "agefile")) 184 else if (!strcmp(name, "agefile"))
184 cgit_agefile = xstrdup(value); 185 cgit_agefile = xstrdup(value);
186 else if (!strcmp(name, "renamelimit"))
187 cgit_renamelimit = atoi(value);
185 else if (!strcmp(name, "repo.group")) 188 else if (!strcmp(name, "repo.group"))
186 cgit_repo_group = xstrdup(value); 189 cgit_repo_group = xstrdup(value);
187 else if (!strcmp(name, "repo.url")) 190 else if (!strcmp(name, "repo.url"))
@@ -383,17 +386,25 @@ int cgit_diff_files(const unsigned char *old_sha1,
383 386
384void cgit_diff_tree(const unsigned char *old_sha1, 387void cgit_diff_tree(const unsigned char *old_sha1,
385 const unsigned char *new_sha1, 388 const unsigned char *new_sha1,
386 filepair_fn fn) 389 filepair_fn fn, const char *prefix)
387{ 390{
388 struct diff_options opt; 391 struct diff_options opt;
389 int ret; 392 int ret;
393 int prefixlen;
390 394
391 diff_setup(&opt); 395 diff_setup(&opt);
392 opt.output_format = DIFF_FORMAT_CALLBACK; 396 opt.output_format = DIFF_FORMAT_CALLBACK;
393 opt.detect_rename = 1; 397 opt.detect_rename = 1;
398 opt.rename_limit = cgit_renamelimit;
394 opt.recursive = 1; 399 opt.recursive = 1;
395 opt.format_callback = cgit_diff_tree_cb; 400 opt.format_callback = cgit_diff_tree_cb;
396 opt.format_callback_data = fn; 401 opt.format_callback_data = fn;
402 if (prefix) {
403 opt.nr_paths = 1;
404 opt.paths = &prefix;
405 prefixlen = strlen(prefix);
406 opt.pathlens = &prefixlen;
407 }
397 diff_setup_done(&opt); 408 diff_setup_done(&opt);
398 409
399 if (old_sha1 && !is_null_sha1(old_sha1)) 410 if (old_sha1 && !is_null_sha1(old_sha1))
@@ -410,5 +421,5 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn)
410 421
411 if (commit->parents) 422 if (commit->parents)
412 old_sha1 = commit->parents->item->object.sha1; 423 old_sha1 = commit->parents->item->object.sha1;
413 cgit_diff_tree(old_sha1, commit->object.sha1, fn); 424 cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL);
414} 425}
diff --git a/ui-commit.c b/ui-commit.c
index 90e09ed..4ac8955 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -75,8 +75,8 @@ void print_fileinfo(struct fileinfo *info)
75 html("]</span>"); 75 html("]</span>");
76 } 76 }
77 htmlf("</td><td class='%s'>", class); 77 htmlf("</td><td class='%s'>", class);
78 cgit_tree_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev, 78 cgit_diff_link(info->new_path, NULL, NULL, cgit_query_head, curr_rev,
79 info->new_path); 79 NULL, info->new_path);
80 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED) 80 if (info->status == DIFF_STATUS_COPIED || info->status == DIFF_STATUS_RENAMED)
81 htmlf(" (%s from %s)", 81 htmlf(" (%s from %s)",
82 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed", 82 info->status == DIFF_STATUS_COPIED ? "copied" : "renamed",
diff --git a/ui-diff.c b/ui-diff.c
index 0be845f..ac9a3fa 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -9,6 +9,9 @@
9#include "cgit.h" 9#include "cgit.h"
10 10
11 11
12unsigned char old_rev_sha1[20];
13unsigned char new_rev_sha1[20];
14
12/* 15/*
13 * print a single line returned from xdiff 16 * print a single line returned from xdiff
14 */ 17 */
@@ -67,9 +70,17 @@ static void header(unsigned char *sha1, char *path1, int mode1,
67 htmlf("..%.6o", mode2); 70 htmlf("..%.6o", mode2);
68 } 71 }
69 html("<br/>--- a/"); 72 html("<br/>--- a/");
70 html_txt(path1); 73 if (mode1 != 0)
74 cgit_tree_link(path1, NULL, NULL, cgit_query_head,
75 sha1_to_hex(old_rev_sha1), path1);
76 else
77 html_txt(path1);
71 html("<br/>+++ b/"); 78 html("<br/>+++ b/");
72 html_txt(path2); 79 if (mode2 != 0)
80 cgit_tree_link(path2, NULL, NULL, cgit_query_head,
81 sha1_to_hex(new_rev_sha1), path2);
82 else
83 html_txt(path2);
73 } 84 }
74 html("</div>"); 85 html("</div>");
75} 86}
@@ -89,17 +100,16 @@ static void filepair_cb(struct diff_filepair *pair)
89 cgit_print_error("Error running diff"); 100 cgit_print_error("Error running diff");
90} 101}
91 102
92void cgit_print_diff(const char *new_rev, const char *old_rev) 103void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix)
93{ 104{
94 unsigned char sha1[20], sha2[20];
95 enum object_type type; 105 enum object_type type;
96 unsigned long size; 106 unsigned long size;
97 struct commit *commit, *commit2; 107 struct commit *commit, *commit2;
98 108
99 if (!new_rev) 109 if (!new_rev)
100 new_rev = cgit_query_head; 110 new_rev = cgit_query_head;
101 get_sha1(new_rev, sha1); 111 get_sha1(new_rev, new_rev_sha1);
102 type = sha1_object_info(sha1, &size); 112 type = sha1_object_info(new_rev_sha1, &size);
103 if (type == OBJ_BAD) { 113 if (type == OBJ_BAD) {
104 cgit_print_error(fmt("Bad object name: %s", new_rev)); 114 cgit_print_error(fmt("Bad object name: %s", new_rev));
105 return; 115 return;
@@ -110,31 +120,30 @@ void cgit_print_diff(const char *new_rev, const char *old_rev)
110 return; 120 return;
111 } 121 }
112 122
113 commit = lookup_commit_reference(sha1); 123 commit = lookup_commit_reference(new_rev_sha1);
114 if (!commit || parse_commit(commit)) 124 if (!commit || parse_commit(commit))
115 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); 125 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(new_rev_sha1)));
116 126
117 if (old_rev) 127 if (old_rev)
118 get_sha1(old_rev, sha2); 128 get_sha1(old_rev, old_rev_sha1);
119 else if (commit->parents && commit->parents->item) 129 else if (commit->parents && commit->parents->item)
120 hashcpy(sha2, commit->parents->item->object.sha1); 130 hashcpy(old_rev_sha1, commit->parents->item->object.sha1);
121 else 131 else
122 hashclr(sha2); 132 hashclr(old_rev_sha1);
123 133
124 if (!is_null_sha1(sha2)) { 134 if (!is_null_sha1(old_rev_sha1)) {
125 type = sha1_object_info(sha2, &size); 135 type = sha1_object_info(old_rev_sha1, &size);
126 if (type == OBJ_BAD) { 136 if (type == OBJ_BAD) {
127 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); 137 cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(old_rev_sha1)));
128 return; 138 return;
129 } 139 }
130 commit2 = lookup_commit_reference(sha2); 140 commit2 = lookup_commit_reference(old_rev_sha1);
131 if (!commit2 || parse_commit(commit2)) 141 if (!commit2 || parse_commit(commit2))
132 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); 142 cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(old_rev_sha1)));
133 } 143 }
134
135 html("<table class='diff'>"); 144 html("<table class='diff'>");
136 html("<tr><td>"); 145 html("<tr><td>");
137 cgit_diff_tree(sha2, sha1, filepair_cb); 146 cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb, prefix);
138 html("</td></tr>"); 147 html("</td></tr>");
139 html("</table>"); 148 html("</table>");
140} 149}