diff options
author | Lars Hjemli <hjemli@gmail.com> | 2008-04-09 04:29:21 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-09 04:29:21 (JST) |
commit | 23296ad648c0e2a9e3cf40a3de322b10ad25cce3 (patch) | |
tree | 136493d8228b0ff4971feb06b0e8aee296367b00 /ui-diff.c | |
parent | e2a44cf0923398396b7a321d5ce894ad3bf6f580 (diff) | |
parent | c6f747649ace1a92ed5dfaae9cc1ea3affe0bf51 (diff) | |
download | cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.zip cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.gz |
Merge branch 'lh/cleanup'
* lh/cleanup: (21 commits)
Reset ctx.repo to NULL when the config parser is finished
Move cgit_parse_query() from parsing.c to html.c as http_parse_querystring()
Move function for configfile parsing into configfile.[ch]
Add cache.h
Remove global and obsolete cgit_cmd
Makefile: copy the QUIET constructs from the Makefile in git.git
Move cgit_version from shared.c to cgit.c
Makefile: autobuild dependency rules
Initial Makefile cleanup
Move non-generic functions from shared.c to cgit.c
Add ui-shared.h
Add separate header-files for each page/view
Refactor snapshot support
Add command dispatcher
Remove obsolete cacheitem parameter to ui-functions
Add struct cgit_page to cgit_context
Introduce html.h
Improve initialization of git directory
Move cgit_repo into cgit_context
Add all config variables into struct cgit_context
...
Diffstat (limited to 'ui-diff.c')
-rw-r--r-- | ui-diff.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -7,7 +7,8 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | #include "html.h" | |
11 | #include "ui-shared.h" | ||
11 | 12 | ||
12 | unsigned char old_rev_sha1[20]; | 13 | unsigned char old_rev_sha1[20]; |
13 | unsigned char new_rev_sha1[20]; | 14 | unsigned char new_rev_sha1[20]; |
@@ -71,13 +72,13 @@ static void header(unsigned char *sha1, char *path1, int mode1, | |||
71 | } | 72 | } |
72 | html("<br/>--- a/"); | 73 | html("<br/>--- a/"); |
73 | if (mode1 != 0) | 74 | if (mode1 != 0) |
74 | cgit_tree_link(path1, NULL, NULL, cgit_query_head, | 75 | cgit_tree_link(path1, NULL, NULL, ctx.qry.head, |
75 | sha1_to_hex(old_rev_sha1), path1); | 76 | sha1_to_hex(old_rev_sha1), path1); |
76 | else | 77 | else |
77 | html_txt(path1); | 78 | html_txt(path1); |
78 | html("<br/>+++ b/"); | 79 | html("<br/>+++ b/"); |
79 | if (mode2 != 0) | 80 | if (mode2 != 0) |
80 | cgit_tree_link(path2, NULL, NULL, cgit_query_head, | 81 | cgit_tree_link(path2, NULL, NULL, ctx.qry.head, |
81 | sha1_to_hex(new_rev_sha1), path2); | 82 | sha1_to_hex(new_rev_sha1), path2); |
82 | else | 83 | else |
83 | html_txt(path2); | 84 | html_txt(path2); |
@@ -107,7 +108,7 @@ void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefi | |||
107 | struct commit *commit, *commit2; | 108 | struct commit *commit, *commit2; |
108 | 109 | ||
109 | if (!new_rev) | 110 | if (!new_rev) |
110 | new_rev = cgit_query_head; | 111 | new_rev = ctx.qry.head; |
111 | get_sha1(new_rev, new_rev_sha1); | 112 | get_sha1(new_rev, new_rev_sha1); |
112 | type = sha1_object_info(new_rev_sha1, &size); | 113 | type = sha1_object_info(new_rev_sha1, &size); |
113 | if (type == OBJ_BAD) { | 114 | if (type == OBJ_BAD) { |