-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 | 45 |
8 files changed, 59 insertions, 31 deletions
@@ -109,3 +109,3 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
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; |
@@ -274,6 +274,2 @@ table.diffstat { | |||
274 | 274 | ||
275 | table.diffstat tr:hover { | ||
276 | background-color: #ccc; | ||
277 | } | ||
278 | |||
279 | table.diffstat th { | 275 | table.diffstat th { |
@@ -341,2 +337,6 @@ div.diffstat-summary { | |||
341 | 337 | ||
338 | table.diff { | ||
339 | width: 100%; | ||
340 | } | ||
341 | |||
342 | table.diff td { | 342 | table.diff td { |
@@ -348,3 +348,4 @@ 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 | } |
@@ -172,3 +172,3 @@ 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 | ||
@@ -240,3 +240,3 @@ 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, |
@@ -43,2 +43,9 @@ | |||
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 |
diff --git a/gen-version.sh b/gen-version.sh index 739c83e..3a08015 100755 --- a/gen-version.sh +++ b/gen-version.sh | |||
@@ -8,3 +8,3 @@ 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 |
@@ -40,2 +40,3 @@ 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 | ||
@@ -184,2 +185,4 @@ void cgit_global_config_cb(const char *name, const char *value) | |||
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")) |
@@ -385,3 +388,3 @@ 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 | { |
@@ -389,2 +392,3 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
389 | int ret; | 392 | int ret; |
393 | int prefixlen; | ||
390 | 394 | ||
@@ -393,2 +397,3 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
393 | opt.detect_rename = 1; | 397 | opt.detect_rename = 1; |
398 | opt.rename_limit = cgit_renamelimit; | ||
394 | opt.recursive = 1; | 399 | opt.recursive = 1; |
@@ -396,2 +401,8 @@ void cgit_diff_tree(const unsigned char *old_sha1, | |||
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); |
@@ -412,3 +423,3 @@ void cgit_diff_commit(struct commit *commit, filepair_fn fn) | |||
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 | |||
@@ -77,4 +77,4 @@ void print_fileinfo(struct fileinfo *info) | |||
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) |
@@ -11,2 +11,5 @@ | |||
11 | 11 | ||
12 | unsigned char old_rev_sha1[20]; | ||
13 | unsigned char new_rev_sha1[20]; | ||
14 | |||
12 | /* | 15 | /* |
@@ -69,5 +72,13 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
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 | } |
@@ -91,5 +102,4 @@ static void filepair_cb(struct diff_filepair *pair) | |||
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; |
@@ -100,4 +110,4 @@ void cgit_print_diff(const char *new_rev, const char *old_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) { |
@@ -112,27 +122,26 @@ void cgit_print_diff(const char *new_rev, const char *old_rev) | |||
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>"); |