author | Lars Hjemli <hjemli@gmail.com> | 2006-12-20 21:48:27 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-20 21:48:27 (UTC) |
commit | 36aba00273e7af1b94bf8c5dd5068709d983d01e (patch) (unidiff) | |
tree | d9be4e6f27b115a799af40cad43445f63fbf2238 /cgit.c | |
parent | a53042865a4ac8b1fa1d6b37720787601e181495 (diff) | |
download | cgit-36aba00273e7af1b94bf8c5dd5068709d983d01e.zip cgit-36aba00273e7af1b94bf8c5dd5068709d983d01e.tar.gz cgit-36aba00273e7af1b94bf8c5dd5068709d983d01e.tar.bz2 |
Add basic diff view
Finally, xdiff is used to show per-file diffs via commit view.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -15,48 +15,50 @@ static void cgit_print_repo_page(struct cacheitem *item) | |||
15 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || | 15 | if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || |
16 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { | 16 | cgit_read_config("info/cgit", cgit_repo_config_cb)) { |
17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); | 17 | char *title = fmt("%s - %s", cgit_root_title, "Bad request"); |
18 | cgit_print_docstart(title, item); | 18 | cgit_print_docstart(title, item); |
19 | cgit_print_pageheader(title); | 19 | cgit_print_pageheader(title); |
20 | cgit_print_error(fmt("Unable to scan repository: %s", | 20 | cgit_print_error(fmt("Unable to scan repository: %s", |
21 | strerror(errno))); | 21 | strerror(errno))); |
22 | cgit_print_docend(); | 22 | cgit_print_docend(); |
23 | return; | 23 | return; |
24 | } | 24 | } |
25 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); | 25 | setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1); |
26 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); | 26 | char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc); |
27 | cgit_print_docstart(title, item); | 27 | cgit_print_docstart(title, item); |
28 | cgit_print_pageheader(title); | 28 | cgit_print_pageheader(title); |
29 | if (!cgit_query_page) { | 29 | if (!cgit_query_page) { |
30 | cgit_print_summary(); | 30 | cgit_print_summary(); |
31 | } else if (!strcmp(cgit_query_page, "log")) { | 31 | } else if (!strcmp(cgit_query_page, "log")) { |
32 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100); | 32 | cgit_print_log(cgit_query_head, cgit_query_ofs, 100); |
33 | } else if (!strcmp(cgit_query_page, "tree")) { | 33 | } else if (!strcmp(cgit_query_page, "tree")) { |
34 | cgit_print_tree(cgit_query_sha1); | 34 | cgit_print_tree(cgit_query_sha1); |
35 | } else if (!strcmp(cgit_query_page, "commit")) { | 35 | } else if (!strcmp(cgit_query_page, "commit")) { |
36 | cgit_print_commit(cgit_query_sha1); | 36 | cgit_print_commit(cgit_query_sha1); |
37 | } else if (!strcmp(cgit_query_page, "view")) { | 37 | } else if (!strcmp(cgit_query_page, "view")) { |
38 | cgit_print_view(cgit_query_sha1); | 38 | cgit_print_view(cgit_query_sha1); |
39 | } else if (!strcmp(cgit_query_page, "diff")) { | ||
40 | cgit_print_diff(cgit_query_sha1, cgit_query_sha2); | ||
39 | } | 41 | } |
40 | cgit_print_docend(); | 42 | cgit_print_docend(); |
41 | } | 43 | } |
42 | 44 | ||
43 | static void cgit_fill_cache(struct cacheitem *item) | 45 | static void cgit_fill_cache(struct cacheitem *item) |
44 | { | 46 | { |
45 | static char buf[PATH_MAX]; | 47 | static char buf[PATH_MAX]; |
46 | 48 | ||
47 | getcwd(buf, sizeof(buf)); | 49 | getcwd(buf, sizeof(buf)); |
48 | htmlfd = item->fd; | 50 | htmlfd = item->fd; |
49 | item->st.st_mtime = time(NULL); | 51 | item->st.st_mtime = time(NULL); |
50 | if (cgit_query_repo) | 52 | if (cgit_query_repo) |
51 | cgit_print_repo_page(item); | 53 | cgit_print_repo_page(item); |
52 | else | 54 | else |
53 | cgit_print_repolist(item); | 55 | cgit_print_repolist(item); |
54 | chdir(buf); | 56 | chdir(buf); |
55 | } | 57 | } |
56 | 58 | ||
57 | static void cgit_check_cache(struct cacheitem *item) | 59 | static void cgit_check_cache(struct cacheitem *item) |
58 | { | 60 | { |
59 | int i = 0; | 61 | int i = 0; |
60 | 62 | ||
61 | cache_prepare(item); | 63 | cache_prepare(item); |
62 | top: | 64 | top: |