author | Lars Hjemli <hjemli@gmail.com> | 2008-04-08 19:29:21 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-04-08 19:29:21 (UTC) |
commit | 23296ad648c0e2a9e3cf40a3de322b10ad25cce3 (patch) (unidiff) | |
tree | 136493d8228b0ff4971feb06b0e8aee296367b00 /ui-patch.c | |
parent | e2a44cf0923398396b7a321d5ce894ad3bf6f580 (diff) | |
parent | c6f747649ace1a92ed5dfaae9cc1ea3affe0bf51 (diff) | |
download | cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.zip cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.gz cgit-23296ad648c0e2a9e3cf40a3de322b10ad25cce3.tar.bz2 |
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
...
-rw-r--r-- | ui-patch.c | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -4,12 +4,14 @@ | |||
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
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 | { |
13 | char c = line[len-1]; | 15 | char c = line[len-1]; |
14 | 16 | ||
15 | line[len-1] = '\0'; | 17 | line[len-1] = '\0'; |
@@ -65,21 +67,21 @@ static void filepair_cb(struct diff_filepair *pair) | |||
65 | return; | 67 | return; |
66 | } | 68 | } |
67 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) | 69 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
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; |
75 | unsigned char sha1[20], old_sha1[20]; | 77 | unsigned char sha1[20], old_sha1[20]; |
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)); |
83 | return; | 85 | return; |
84 | } | 86 | } |
85 | commit = lookup_commit_reference(sha1); | 87 | commit = lookup_commit_reference(sha1); |
@@ -92,13 +94,15 @@ void cgit_print_patch(char *hex, struct cacheitem *item) | |||
92 | if (commit->parents && commit->parents->item) | 94 | if (commit->parents && commit->parents->item) |
93 | hashcpy(old_sha1, commit->parents->item->object.sha1); | 95 | hashcpy(old_sha1, commit->parents->item->object.sha1); |
94 | else | 96 | else |
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: "); |
102 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); | 106 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n"); |
103 | htmlf("Subject: %s\n\n", info->subject); | 107 | htmlf("Subject: %s\n\n", info->subject); |
104 | if (info->msg && *info->msg) { | 108 | if (info->msg && *info->msg) { |