author | Lars Hjemli <hjemli@gmail.com> | 2007-10-01 09:42:19 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-01 09:42:19 (UTC) |
commit | f527a57c8a55f5fd315e1bc1cb338f5f4a9b20ae (patch) (unidiff) | |
tree | 086e1afad5762c5b6bb09672b58f2c491ffbbc20 | |
parent | 98fcf7227c8dda520c864ea8a51012934115258f (diff) | |
download | cgit-f527a57c8a55f5fd315e1bc1cb338f5f4a9b20ae.zip cgit-f527a57c8a55f5fd315e1bc1cb338f5f4a9b20ae.tar.gz cgit-f527a57c8a55f5fd315e1bc1cb338f5f4a9b20ae.tar.bz2 |
Add prefix parameter to cgit_diff_tree()
This paramter can be used to restrict a diff to the specified path prefix.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | shared.c | 11 | ||||
-rw-r--r-- | ui-diff.c | 3 |
3 files changed, 11 insertions, 5 deletions
@@ -125,97 +125,97 @@ extern int cgit_max_lock_attempts; | |||
125 | extern int cgit_cache_root_ttl; | 125 | extern int cgit_cache_root_ttl; |
126 | extern int cgit_cache_repo_ttl; | 126 | extern int cgit_cache_repo_ttl; |
127 | extern int cgit_cache_dynamic_ttl; | 127 | extern int cgit_cache_dynamic_ttl; |
128 | extern int cgit_cache_static_ttl; | 128 | extern int cgit_cache_static_ttl; |
129 | extern int cgit_cache_max_create_time; | 129 | extern int cgit_cache_max_create_time; |
130 | extern int cgit_summary_log; | 130 | extern int cgit_summary_log; |
131 | 131 | ||
132 | extern int cgit_max_msg_len; | 132 | extern int cgit_max_msg_len; |
133 | extern int cgit_max_repodesc_len; | 133 | extern int cgit_max_repodesc_len; |
134 | extern int cgit_max_commit_count; | 134 | extern int cgit_max_commit_count; |
135 | 135 | ||
136 | extern int cgit_query_has_symref; | 136 | extern int cgit_query_has_symref; |
137 | extern int cgit_query_has_sha1; | 137 | extern int cgit_query_has_sha1; |
138 | 138 | ||
139 | extern char *cgit_querystring; | 139 | extern char *cgit_querystring; |
140 | extern char *cgit_query_repo; | 140 | extern char *cgit_query_repo; |
141 | extern char *cgit_query_page; | 141 | extern char *cgit_query_page; |
142 | extern char *cgit_query_search; | 142 | extern char *cgit_query_search; |
143 | extern char *cgit_query_head; | 143 | extern char *cgit_query_head; |
144 | extern char *cgit_query_sha1; | 144 | extern char *cgit_query_sha1; |
145 | extern char *cgit_query_sha2; | 145 | extern char *cgit_query_sha2; |
146 | extern char *cgit_query_path; | 146 | extern char *cgit_query_path; |
147 | extern char *cgit_query_name; | 147 | extern char *cgit_query_name; |
148 | extern int cgit_query_ofs; | 148 | extern int cgit_query_ofs; |
149 | 149 | ||
150 | extern int htmlfd; | 150 | extern int htmlfd; |
151 | 151 | ||
152 | extern int cgit_get_cmd_index(const char *cmd); | 152 | extern int cgit_get_cmd_index(const char *cmd); |
153 | extern struct repoinfo *cgit_get_repoinfo(const char *url); | 153 | extern struct repoinfo *cgit_get_repoinfo(const char *url); |
154 | extern void cgit_global_config_cb(const char *name, const char *value); | 154 | extern void cgit_global_config_cb(const char *name, const char *value); |
155 | extern void cgit_repo_config_cb(const char *name, const char *value); | 155 | extern void cgit_repo_config_cb(const char *name, const char *value); |
156 | extern void cgit_querystring_cb(const char *name, const char *value); | 156 | extern void cgit_querystring_cb(const char *name, const char *value); |
157 | 157 | ||
158 | extern int chk_zero(int result, char *msg); | 158 | extern int chk_zero(int result, char *msg); |
159 | extern int chk_positive(int result, char *msg); | 159 | extern int chk_positive(int result, char *msg); |
160 | extern int chk_non_negative(int result, char *msg); | 160 | extern int chk_non_negative(int result, char *msg); |
161 | 161 | ||
162 | extern int hextoint(char c); | 162 | extern int hextoint(char c); |
163 | extern char *trim_end(const char *str, char c); | 163 | extern char *trim_end(const char *str, char c); |
164 | 164 | ||
165 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 165 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
166 | 166 | ||
167 | extern int cgit_diff_files(const unsigned char *old_sha1, | 167 | extern int cgit_diff_files(const unsigned char *old_sha1, |
168 | const unsigned char *new_sha1, | 168 | const unsigned char *new_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,...); |
178 | 178 | ||
179 | extern void html(const char *txt); | 179 | extern void html(const char *txt); |
180 | extern void htmlf(const char *format,...); | 180 | extern void htmlf(const char *format,...); |
181 | extern void html_txt(char *txt); | 181 | extern void html_txt(char *txt); |
182 | extern void html_ntxt(int len, char *txt); | 182 | extern void html_ntxt(int len, char *txt); |
183 | extern void html_attr(char *txt); | 183 | extern void html_attr(char *txt); |
184 | extern void html_hidden(char *name, char *value); | 184 | extern void html_hidden(char *name, char *value); |
185 | extern void html_link_open(char *url, char *title, char *class); | 185 | extern void html_link_open(char *url, char *title, char *class); |
186 | extern void html_link_close(void); | 186 | extern void html_link_close(void); |
187 | extern void html_filemode(unsigned short mode); | 187 | extern void html_filemode(unsigned short mode); |
188 | extern int html_include(const char *filename); | 188 | extern int html_include(const char *filename); |
189 | 189 | ||
190 | extern int cgit_read_config(const char *filename, configfn fn); | 190 | extern int cgit_read_config(const char *filename, configfn fn); |
191 | extern int cgit_parse_query(char *txt, configfn fn); | 191 | extern int cgit_parse_query(char *txt, configfn fn); |
192 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 192 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
193 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 193 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
194 | extern void cgit_parse_url(const char *url); | 194 | extern void cgit_parse_url(const char *url); |
195 | 195 | ||
196 | extern char *cache_safe_filename(const char *unsafe); | 196 | extern char *cache_safe_filename(const char *unsafe); |
197 | extern int cache_lock(struct cacheitem *item); | 197 | extern int cache_lock(struct cacheitem *item); |
198 | extern int cache_unlock(struct cacheitem *item); | 198 | extern int cache_unlock(struct cacheitem *item); |
199 | extern int cache_cancel_lock(struct cacheitem *item); | 199 | extern int cache_cancel_lock(struct cacheitem *item); |
200 | extern int cache_exist(struct cacheitem *item); | 200 | extern int cache_exist(struct cacheitem *item); |
201 | extern int cache_expired(struct cacheitem *item); | 201 | extern int cache_expired(struct cacheitem *item); |
202 | 202 | ||
203 | extern char *cgit_repourl(const char *reponame); | 203 | extern char *cgit_repourl(const char *reponame); |
204 | extern char *cgit_fileurl(const char *reponame, const char *pagename, | 204 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |
205 | const char *filename, const char *query); | 205 | const char *filename, const char *query); |
206 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 206 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
207 | const char *query); | 207 | const char *query); |
208 | 208 | ||
209 | extern const char *cgit_repobasename(const char *reponame); | 209 | extern const char *cgit_repobasename(const char *reponame); |
210 | 210 | ||
211 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 211 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
212 | char *rev, char *path); | 212 | char *rev, char *path); |
213 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 213 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
214 | char *rev, char *path, int ofs); | 214 | char *rev, char *path, int ofs); |
215 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 215 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
216 | char *rev); | 216 | char *rev); |
217 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 217 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
218 | char *head, char *rev, char *archivename); | 218 | char *head, char *rev, char *archivename); |
219 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 219 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
220 | char *new_rev, char *old_rev, char *path); | 220 | char *new_rev, char *old_rev, char *path); |
221 | 221 | ||
@@ -341,78 +341,85 @@ int filediff_cb(void *priv, mmbuffer_t *mb, int nbuf) | |||
341 | continue; | 341 | continue; |
342 | } | 342 | } |
343 | 343 | ||
344 | /* we have a complete line */ | 344 | /* we have a complete line */ |
345 | if (!diffbuf) { | 345 | if (!diffbuf) { |
346 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); | 346 | ((linediff_fn)priv)(mb[i].ptr, mb[i].size); |
347 | continue; | 347 | continue; |
348 | } | 348 | } |
349 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); | 349 | diffbuf = xrealloc(diffbuf, buflen + mb[i].size); |
350 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); | 350 | memcpy(diffbuf + buflen, mb[i].ptr, mb[i].size); |
351 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); | 351 | ((linediff_fn)priv)(diffbuf, buflen + mb[i].size); |
352 | free(diffbuf); | 352 | free(diffbuf); |
353 | diffbuf = NULL; | 353 | diffbuf = NULL; |
354 | buflen = 0; | 354 | buflen = 0; |
355 | } | 355 | } |
356 | if (diffbuf) { | 356 | if (diffbuf) { |
357 | ((linediff_fn)priv)(diffbuf, buflen); | 357 | ((linediff_fn)priv)(diffbuf, buflen); |
358 | free(diffbuf); | 358 | free(diffbuf); |
359 | diffbuf = NULL; | 359 | diffbuf = NULL; |
360 | buflen = 0; | 360 | buflen = 0; |
361 | } | 361 | } |
362 | return 0; | 362 | return 0; |
363 | } | 363 | } |
364 | 364 | ||
365 | int cgit_diff_files(const unsigned char *old_sha1, | 365 | int cgit_diff_files(const unsigned char *old_sha1, |
366 | const unsigned char *new_sha1, | 366 | const unsigned char *new_sha1, |
367 | linediff_fn fn) | 367 | linediff_fn fn) |
368 | { | 368 | { |
369 | mmfile_t file1, file2; | 369 | mmfile_t file1, file2; |
370 | xpparam_t diff_params; | 370 | xpparam_t diff_params; |
371 | xdemitconf_t emit_params; | 371 | xdemitconf_t emit_params; |
372 | xdemitcb_t emit_cb; | 372 | xdemitcb_t emit_cb; |
373 | 373 | ||
374 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) | 374 | if (!load_mmfile(&file1, old_sha1) || !load_mmfile(&file2, new_sha1)) |
375 | return 1; | 375 | return 1; |
376 | 376 | ||
377 | diff_params.flags = XDF_NEED_MINIMAL; | 377 | diff_params.flags = XDF_NEED_MINIMAL; |
378 | emit_params.ctxlen = 3; | 378 | emit_params.ctxlen = 3; |
379 | emit_params.flags = XDL_EMIT_FUNCNAMES; | 379 | emit_params.flags = XDL_EMIT_FUNCNAMES; |
380 | emit_params.find_func = NULL; | 380 | emit_params.find_func = NULL; |
381 | emit_cb.outf = filediff_cb; | 381 | emit_cb.outf = filediff_cb; |
382 | emit_cb.priv = fn; | 382 | emit_cb.priv = fn; |
383 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); | 383 | xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); |
384 | return 0; | 384 | return 0; |
385 | } | 385 | } |
386 | 386 | ||
387 | void cgit_diff_tree(const unsigned char *old_sha1, | 387 | void cgit_diff_tree(const unsigned char *old_sha1, |
388 | const unsigned char *new_sha1, | 388 | const unsigned char *new_sha1, |
389 | filepair_fn fn) | 389 | filepair_fn fn, const char *prefix) |
390 | { | 390 | { |
391 | struct diff_options opt; | 391 | struct diff_options opt; |
392 | int ret; | 392 | int ret; |
393 | int prefixlen; | ||
393 | 394 | ||
394 | diff_setup(&opt); | 395 | diff_setup(&opt); |
395 | opt.output_format = DIFF_FORMAT_CALLBACK; | 396 | opt.output_format = DIFF_FORMAT_CALLBACK; |
396 | opt.detect_rename = 1; | 397 | opt.detect_rename = 1; |
397 | opt.rename_limit = cgit_renamelimit; | 398 | opt.rename_limit = cgit_renamelimit; |
398 | opt.recursive = 1; | 399 | opt.recursive = 1; |
399 | opt.format_callback = cgit_diff_tree_cb; | 400 | opt.format_callback = cgit_diff_tree_cb; |
400 | 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 | } | ||
401 | diff_setup_done(&opt); | 408 | diff_setup_done(&opt); |
402 | 409 | ||
403 | if (old_sha1 && !is_null_sha1(old_sha1)) | 410 | if (old_sha1 && !is_null_sha1(old_sha1)) |
404 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); | 411 | ret = diff_tree_sha1(old_sha1, new_sha1, "", &opt); |
405 | else | 412 | else |
406 | ret = diff_root_tree_sha1(new_sha1, "", &opt); | 413 | ret = diff_root_tree_sha1(new_sha1, "", &opt); |
407 | diffcore_std(&opt); | 414 | diffcore_std(&opt); |
408 | diff_flush(&opt); | 415 | diff_flush(&opt); |
409 | } | 416 | } |
410 | 417 | ||
411 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) | 418 | void cgit_diff_commit(struct commit *commit, filepair_fn fn) |
412 | { | 419 | { |
413 | unsigned char *old_sha1 = NULL; | 420 | unsigned char *old_sha1 = NULL; |
414 | 421 | ||
415 | if (commit->parents) | 422 | if (commit->parents) |
416 | old_sha1 = commit->parents->item->object.sha1; | 423 | old_sha1 = commit->parents->item->object.sha1; |
417 | cgit_diff_tree(old_sha1, commit->object.sha1, fn); | 424 | cgit_diff_tree(old_sha1, commit->object.sha1, fn, NULL); |
418 | } | 425 | } |
@@ -86,55 +86,54 @@ static void filepair_cb(struct diff_filepair *pair) | |||
86 | return; | 86 | return; |
87 | } | 87 | } |
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) | 88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
89 | cgit_print_error("Error running diff"); | 89 | cgit_print_error("Error running diff"); |
90 | } | 90 | } |
91 | 91 | ||
92 | void cgit_print_diff(const char *new_rev, const char *old_rev) | 92 | void cgit_print_diff(const char *new_rev, const char *old_rev) |
93 | { | 93 | { |
94 | unsigned char sha1[20], sha2[20]; | 94 | unsigned char sha1[20], sha2[20]; |
95 | enum object_type type; | 95 | enum object_type type; |
96 | unsigned long size; | 96 | unsigned long size; |
97 | struct commit *commit, *commit2; | 97 | struct commit *commit, *commit2; |
98 | 98 | ||
99 | if (!new_rev) | 99 | if (!new_rev) |
100 | new_rev = cgit_query_head; | 100 | new_rev = cgit_query_head; |
101 | get_sha1(new_rev, sha1); | 101 | get_sha1(new_rev, sha1); |
102 | type = sha1_object_info(sha1, &size); | 102 | type = sha1_object_info(sha1, &size); |
103 | if (type == OBJ_BAD) { | 103 | if (type == OBJ_BAD) { |
104 | cgit_print_error(fmt("Bad object name: %s", new_rev)); | 104 | cgit_print_error(fmt("Bad object name: %s", new_rev)); |
105 | return; | 105 | return; |
106 | } | 106 | } |
107 | if (type != OBJ_COMMIT) { | 107 | if (type != OBJ_COMMIT) { |
108 | cgit_print_error(fmt("Unhandled object type: %s", | 108 | cgit_print_error(fmt("Unhandled object type: %s", |
109 | typename(type))); | 109 | typename(type))); |
110 | return; | 110 | return; |
111 | } | 111 | } |
112 | 112 | ||
113 | commit = lookup_commit_reference(sha1); | 113 | commit = lookup_commit_reference(sha1); |
114 | if (!commit || parse_commit(commit)) | 114 | if (!commit || parse_commit(commit)) |
115 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); | 115 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha1))); |
116 | 116 | ||
117 | if (old_rev) | 117 | if (old_rev) |
118 | get_sha1(old_rev, sha2); | 118 | get_sha1(old_rev, sha2); |
119 | else if (commit->parents && commit->parents->item) | 119 | else if (commit->parents && commit->parents->item) |
120 | hashcpy(sha2, commit->parents->item->object.sha1); | 120 | hashcpy(sha2, commit->parents->item->object.sha1); |
121 | else | 121 | else |
122 | hashclr(sha2); | 122 | hashclr(sha2); |
123 | 123 | ||
124 | if (!is_null_sha1(sha2)) { | 124 | if (!is_null_sha1(sha2)) { |
125 | type = sha1_object_info(sha2, &size); | 125 | type = sha1_object_info(sha2, &size); |
126 | if (type == OBJ_BAD) { | 126 | if (type == OBJ_BAD) { |
127 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); | 127 | cgit_print_error(fmt("Bad object name: %s", sha1_to_hex(sha2))); |
128 | return; | 128 | return; |
129 | } | 129 | } |
130 | commit2 = lookup_commit_reference(sha2); | 130 | commit2 = lookup_commit_reference(sha2); |
131 | if (!commit2 || parse_commit(commit2)) | 131 | if (!commit2 || parse_commit(commit2)) |
132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); | 132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); |
133 | } | 133 | } |
134 | |||
135 | html("<table class='diff'>"); | 134 | html("<table class='diff'>"); |
136 | html("<tr><td>"); | 135 | html("<tr><td>"); |
137 | cgit_diff_tree(sha2, sha1, filepair_cb); | 136 | cgit_diff_tree(sha2, sha1, filepair_cb, NULL); |
138 | html("</td></tr>"); | 137 | html("</td></tr>"); |
139 | html("</table>"); | 138 | html("</table>"); |
140 | } | 139 | } |