-rw-r--r-- | cgit.c | 2 | ||||
-rw-r--r-- | cgit.css | 11 | ||||
-rw-r--r-- | cgit.h | 4 | ||||
-rw-r--r-- | cgitrc | 7 | ||||
-rwxr-xr-x | gen-version.sh | 2 | ||||
-rw-r--r-- | shared.c | 15 | ||||
-rw-r--r-- | ui-commit.c | 4 | ||||
-rw-r--r-- | ui-diff.c | 41 |
8 files changed, 57 insertions, 29 deletions
@@ -106,9 +106,9 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
106 | case CMD_TAG: | 106 | case CMD_TAG: |
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"); |
114 | } | 114 | } |
@@ -271,12 +271,8 @@ table.diffstat { | |||
271 | border: solid 1px #aaa; | 271 | border: solid 1px #aaa; |
272 | background-color: #eee; | 272 | background-color: #eee; |
273 | } | 273 | } |
274 | 274 | ||
275 | table.diffstat tr:hover { | ||
276 | background-color: #ccc; | ||
277 | } | ||
278 | |||
279 | table.diffstat th { | 275 | table.diffstat th { |
280 | font-weight: normal; | 276 | font-weight: normal; |
281 | text-align: left; | 277 | text-align: left; |
282 | text-decoration: underline; | 278 | text-decoration: underline; |
@@ -338,16 +334,21 @@ div.diffstat-summary { | |||
338 | color: #888; | 334 | color: #888; |
339 | padding-top: 0.5em; | 335 | padding-top: 0.5em; |
340 | } | 336 | } |
341 | 337 | ||
338 | table.diff { | ||
339 | width: 100%; | ||
340 | } | ||
341 | |||
342 | table.diff td { | 342 | table.diff td { |
343 | font-family: monospace; | 343 | font-family: monospace; |
344 | white-space: pre; | 344 | white-space: pre; |
345 | } | 345 | } |
346 | 346 | ||
347 | table.diff td div.head { | 347 | table.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 | ||
352 | table.diff td div.hunk { | 353 | table.diff td div.hunk { |
353 | color: #009; | 354 | color: #009; |
@@ -169,9 +169,9 @@ extern int cgit_diff_files(const unsigned char *old_sha1, | |||
169 | linediff_fn fn); | 169 | linediff_fn fn); |
170 | 170 | ||
171 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 171 | extern 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 | ||
175 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 175 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
176 | 176 | ||
177 | extern char *fmt(const char *format,...); | 177 | extern char *fmt(const char *format,...); |
@@ -237,9 +237,9 @@ extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char * | |||
237 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 237 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
238 | extern void cgit_print_tree(const char *rev, char *path); | 238 | extern void cgit_print_tree(const char *rev, char *path); |
239 | extern void cgit_print_commit(char *hex); | 239 | extern void cgit_print_commit(char *hex); |
240 | extern void cgit_print_tag(char *revname); | 240 | extern void cgit_print_tag(char *revname); |
241 | extern void cgit_print_diff(const char *new_hex, const char *old_hex); | 241 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); |
242 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, | 242 | extern 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); |
245 | extern void cgit_print_snapshot_links(const char *repo, const char *head, | 245 | extern void cgit_print_snapshot_links(const char *repo, const char *head, |
@@ -40,8 +40,15 @@ | |||
40 | ## | 40 | ## |
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 |
47 | ## | 54 | ## |
diff --git a/gen-version.sh b/gen-version.sh index 739c83e..3a08015 100755 --- a/gen-version.sh +++ b/gen-version.sh | |||
@@ -5,9 +5,9 @@ V=$1 | |||
5 | 5 | ||
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 |
7 | if test -d .git | 7 | if test -d .git |
8 | then | 8 | then |
9 | V=$(git describe --abbrev=4 HEAD 2>/dev/null | sed -e 's/-/./g') | 9 | V=$(git describe --abbrev=4 HEAD 2>/dev/null) |
10 | fi | 10 | fi |
11 | 11 | ||
12 | new="CGIT_VERSION = $V" | 12 | new="CGIT_VERSION = $V" |
13 | old=$(cat VERSION 2>/dev/null) | 13 | old=$(cat VERSION 2>/dev/null) |
@@ -37,8 +37,9 @@ int cgit_cache_repo_ttl = 5; | |||
37 | int cgit_cache_dynamic_ttl = 5; | 37 | int cgit_cache_dynamic_ttl = 5; |
38 | int cgit_cache_static_ttl = -1; | 38 | int cgit_cache_static_ttl = -1; |
39 | int cgit_cache_max_create_time = 5; | 39 | int cgit_cache_max_create_time = 5; |
40 | int cgit_summary_log = 0; | 40 | int cgit_summary_log = 0; |
41 | int cgit_renamelimit = -1; | ||
41 | 42 | ||
42 | int cgit_max_msg_len = 60; | 43 | int cgit_max_msg_len = 60; |
43 | int cgit_max_repodesc_len = 60; | 44 | int cgit_max_repodesc_len = 60; |
44 | int cgit_max_commit_count = 50; | 45 | int cgit_max_commit_count = 50; |
@@ -181,8 +182,10 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
181 | else if (!strcmp(name, "summary-log")) | 182 | else if (!strcmp(name, "summary-log")) |
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")) |
188 | cgit_repo = add_repo(value); | 191 | cgit_repo = add_repo(value); |
@@ -382,19 +385,27 @@ int cgit_diff_files(const unsigned char *old_sha1, | |||
382 | } | 385 | } |
383 | 386 | ||
384 | void cgit_diff_tree(const unsigned char *old_sha1, | 387 | void 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)) |
400 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 411 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
@@ -409,6 +420,6 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) | |||
409 | unsigned char *old_sha1 = NULL; | 420 | unsigned char *old_sha1 = NULL; |
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 | |||
@@ -74,10 +74,10 @@ void print_fileinfo(struct fileinfo *info) | |||
74 | html_filemode(info->old_mode); | 74 | html_filemode(info->old_mode); |
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", |
83 | info->old_path); | 83 | info->old_path); |
@@ -8,8 +8,11 @@ | |||
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | 11 | ||
12 | unsigned char old_rev_sha1[20]; | ||
13 | unsigned 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 | */ |
15 | static void print_line(char *line, int len) | 18 | static void print_line(char *line, int len) |
@@ -66,10 +69,18 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
66 | if (mode2 != mode1) | 69 | if (mode2 != mode1) |
67 | htmlf("..%.6o", mode2); | 70 | htmlf("..%.6o", mode2); |
68 | } | 71 | } |
69 | html("<br/>--- a/"); | 72 | html("<br/>--- a/"); |
73 | if (mode1 != 0) | ||
74 | cgit_tree_link(path1, NULL, NULL, cgit_query_head, | ||
75 | sha1_to_hex(old_rev_sha1), path1); | ||
76 | else | ||
70 | html_txt(path1); | 77 | html_txt(path1); |
71 | html("<br/>+++ b/"); | 78 | html("<br/>+++ b/"); |
79 | if (mode2 != 0) | ||
80 | cgit_tree_link(path2, NULL, NULL, cgit_query_head, | ||
81 | sha1_to_hex(new_rev_sha1), path2); | ||
82 | else | ||
72 | html_txt(path2); | 83 | html_txt(path2); |
73 | } | 84 | } |
74 | html("</div>"); | 85 | html("</div>"); |
75 | } | 86 | } |
@@ -88,19 +99,18 @@ static void filepair_cb(struct diff_filepair *pair) | |||
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) | 99 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
89 | cgit_print_error("Error running diff"); | 100 | cgit_print_error("Error running diff"); |
90 | } | 101 | } |
91 | 102 | ||
92 | void cgit_print_diff(const char *new_rev, const char *old_rev) | 103 | void 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; |
106 | } | 116 | } |
@@ -109,32 +119,31 @@ void cgit_print_diff(const char *new_rev, const char *old_rev) | |||
109 | typename(type))); | 119 | typename(type))); |
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 | } |