diff options
author | Lars Hjemli | 2008-04-08 21:29:21 +0200 |
---|---|---|
committer | Lars Hjemli | 2008-04-08 21:29:21 +0200 |
commit | 23296ad648c0e2a9e3cf40a3de322b10ad25cce3 (patch) | |
tree | 136493d8228b0ff4971feb06b0e8aee296367b00 /ui-patch.c | |
parent | Use GIT-1.5.5-rc2 (diff) | |
parent | Reset ctx.repo to NULL when the config parser is finished (diff) | |
download | cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.gz cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.zip |
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-patch.c')
-rw-r--r-- | ui-patch.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/ui-patch.c b/ui-patch.c index 7ee2c41..c1c4ce3 100644 --- a/ui-patch.c +++ b/ui-patch.c | |||
@@ -7,6 +7,8 @@ | |||
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "html.h" | ||
11 | #include "ui-shared.h" | ||
10 | 12 | ||
11 | static void print_line(char *line, int len) | 13 | static void print_line(char *line, int len) |
12 | { | 14 | { |
@@ -68,7 +70,7 @@ static void filepair_cb(struct diff_filepair *pair) | |||
68 | html("Error running diff"); | 70 | html("Error running diff"); |
69 | } | 71 | } |
70 | 72 | ||
71 | void cgit_print_patch(char *hex, struct cacheitem *item) | 73 | void cgit_print_patch(char *hex) |
72 | { | 74 | { |
73 | struct commit *commit; | 75 | struct commit *commit; |
74 | struct commitinfo *info; | 76 | struct commitinfo *info; |
@@ -76,7 +78,7 @@ void cgit_print_patch(char *hex, struct cacheitem *item) | |||
76 | char *patchname; | 78 | char *patchname; |
77 | 79 | ||
78 | if (!hex) | 80 | if (!hex) |
79 | hex = cgit_query_head; | 81 | hex = ctx.qry.head; |
80 | 82 | ||
81 | if (get_sha1(hex, sha1)) { | 83 | if (get_sha1(hex, sha1)) { |
82 | cgit_print_error(fmt("Bad object id: %s", hex)); | 84 | cgit_print_error(fmt("Bad object id: %s", hex)); |
@@ -95,7 +97,9 @@ void cgit_print_patch(char *hex, struct cacheitem *item) | |||
95 | hashclr(old_sha1); | 97 | hashclr(old_sha1); |
96 | 98 | ||
97 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); | 99 | patchname = fmt("%s.patch", sha1_to_hex(sha1)); |
98 | cgit_print_snapshot_start("text/plain", patchname, item); | 100 | ctx.page.mimetype = "text/plain"; |
101 | ctx.page.filename = patchname; | ||
102 | cgit_print_http_headers(&ctx); | ||
99 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); | 103 | htmlf("From %s Mon Sep 17 00:00:00 2001\n", sha1_to_hex(sha1)); |
100 | htmlf("From: %s%s\n", info->author, info->author_email); | 104 | htmlf("From: %s%s\n", info->author, info->author_email); |
101 | html("Date: "); | 105 | html("Date: "); |