author | Lars Hjemli <hjemli@gmail.com> | 2007-12-10 20:47:29 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-12-11 01:43:24 (UTC) |
commit | 620bb3e5e4ff87da740fe7232ba74330b5f862d4 (patch) (unidiff) | |
tree | 152cc090cfc56c387393f6aa6666b9d87ad4a23a /cgit.h | |
parent | afcdd083dab81afef744e261d81a452698188c30 (diff) | |
download | cgit-620bb3e5e4ff87da740fe7232ba74330b5f862d4.zip cgit-620bb3e5e4ff87da740fe7232ba74330b5f862d4.tar.gz cgit-620bb3e5e4ff87da740fe7232ba74330b5f862d4.tar.bz2 |
Add plain patch view
The new view mimics the output from `git format-patch`, making it possible
to cherry-pick directly from cgit with something like `curl $url | git am`.
Inspired by a patch to `git-apply` by Mike Hommey:
http://thread.gmane.org/gmane.comp.version-control.git/67611/focus=67610
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1,96 +1,97 @@ | |||
1 | #ifndef CGIT_H | 1 | #ifndef CGIT_H |
2 | #define CGIT_H | 2 | #define CGIT_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <git-compat-util.h> | 5 | #include <git-compat-util.h> |
6 | #include <cache.h> | 6 | #include <cache.h> |
7 | #include <grep.h> | 7 | #include <grep.h> |
8 | #include <object.h> | 8 | #include <object.h> |
9 | #include <tree.h> | 9 | #include <tree.h> |
10 | #include <commit.h> | 10 | #include <commit.h> |
11 | #include <tag.h> | 11 | #include <tag.h> |
12 | #include <diff.h> | 12 | #include <diff.h> |
13 | #include <diffcore.h> | 13 | #include <diffcore.h> |
14 | #include <refs.h> | 14 | #include <refs.h> |
15 | #include <revision.h> | 15 | #include <revision.h> |
16 | #include <log-tree.h> | 16 | #include <log-tree.h> |
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <xdiff/xdiff.h> | 18 | #include <xdiff/xdiff.h> |
19 | #include <utf8.h> | 19 | #include <utf8.h> |
20 | 20 | ||
21 | 21 | ||
22 | /* | 22 | /* |
23 | * The valid cgit repo-commands | 23 | * The valid cgit repo-commands |
24 | */ | 24 | */ |
25 | #define CMD_LOG 1 | 25 | #define CMD_LOG 1 |
26 | #define CMD_COMMIT 2 | 26 | #define CMD_COMMIT 2 |
27 | #define CMD_DIFF 3 | 27 | #define CMD_DIFF 3 |
28 | #define CMD_TREE 4 | 28 | #define CMD_TREE 4 |
29 | #define CMD_BLOB 5 | 29 | #define CMD_BLOB 5 |
30 | #define CMD_SNAPSHOT 6 | 30 | #define CMD_SNAPSHOT 6 |
31 | #define CMD_TAG 7 | 31 | #define CMD_TAG 7 |
32 | #define CMD_REFS 8 | 32 | #define CMD_REFS 8 |
33 | #define CMD_PATCH 9 | ||
33 | 34 | ||
34 | /* | 35 | /* |
35 | * Dateformats used on misc. pages | 36 | * Dateformats used on misc. pages |
36 | */ | 37 | */ |
37 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" | 38 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S" |
38 | #define FMT_SHORTDATE "%Y-%m-%d" | 39 | #define FMT_SHORTDATE "%Y-%m-%d" |
39 | 40 | ||
40 | 41 | ||
41 | /* | 42 | /* |
42 | * Limits used for relative dates | 43 | * Limits used for relative dates |
43 | */ | 44 | */ |
44 | #define TM_MIN 60 | 45 | #define TM_MIN 60 |
45 | #define TM_HOUR (TM_MIN * 60) | 46 | #define TM_HOUR (TM_MIN * 60) |
46 | #define TM_DAY (TM_HOUR * 24) | 47 | #define TM_DAY (TM_HOUR * 24) |
47 | #define TM_WEEK (TM_DAY * 7) | 48 | #define TM_WEEK (TM_DAY * 7) |
48 | #define TM_YEAR (TM_DAY * 365) | 49 | #define TM_YEAR (TM_DAY * 365) |
49 | #define TM_MONTH (TM_YEAR / 12.0) | 50 | #define TM_MONTH (TM_YEAR / 12.0) |
50 | 51 | ||
51 | 52 | ||
52 | /* | 53 | /* |
53 | * Default encoding | 54 | * Default encoding |
54 | */ | 55 | */ |
55 | #define PAGE_ENCODING "UTF-8" | 56 | #define PAGE_ENCODING "UTF-8" |
56 | 57 | ||
57 | typedef void (*configfn)(const char *name, const char *value); | 58 | typedef void (*configfn)(const char *name, const char *value); |
58 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 59 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
59 | typedef void (*linediff_fn)(char *line, int len); | 60 | typedef void (*linediff_fn)(char *line, int len); |
60 | 61 | ||
61 | struct cacheitem { | 62 | struct cacheitem { |
62 | char *name; | 63 | char *name; |
63 | struct stat st; | 64 | struct stat st; |
64 | int ttl; | 65 | int ttl; |
65 | int fd; | 66 | int fd; |
66 | }; | 67 | }; |
67 | 68 | ||
68 | struct repoinfo { | 69 | struct repoinfo { |
69 | char *url; | 70 | char *url; |
70 | char *name; | 71 | char *name; |
71 | char *path; | 72 | char *path; |
72 | char *desc; | 73 | char *desc; |
73 | char *owner; | 74 | char *owner; |
74 | char *defbranch; | 75 | char *defbranch; |
75 | char *group; | 76 | char *group; |
76 | char *module_link; | 77 | char *module_link; |
77 | char *readme; | 78 | char *readme; |
78 | char *clone_url; | 79 | char *clone_url; |
79 | int snapshots; | 80 | int snapshots; |
80 | int enable_log_filecount; | 81 | int enable_log_filecount; |
81 | int enable_log_linecount; | 82 | int enable_log_linecount; |
82 | }; | 83 | }; |
83 | 84 | ||
84 | struct repolist { | 85 | struct repolist { |
85 | int length; | 86 | int length; |
86 | int count; | 87 | int count; |
87 | struct repoinfo *repos; | 88 | struct repoinfo *repos; |
88 | }; | 89 | }; |
89 | 90 | ||
90 | struct commitinfo { | 91 | struct commitinfo { |
91 | struct commit *commit; | 92 | struct commit *commit; |
92 | char *author; | 93 | char *author; |
93 | char *author_email; | 94 | char *author_email; |
94 | unsigned long author_date; | 95 | unsigned long author_date; |
95 | char *committer; | 96 | char *committer; |
96 | char *committer_email; | 97 | char *committer_email; |
@@ -222,72 +223,73 @@ extern void html_option(char *value, char *text, char *selected_value); | |||
222 | extern void html_link_open(char *url, char *title, char *class); | 223 | extern void html_link_open(char *url, char *title, char *class); |
223 | extern void html_link_close(void); | 224 | extern void html_link_close(void); |
224 | extern void html_filemode(unsigned short mode); | 225 | extern void html_filemode(unsigned short mode); |
225 | extern int html_include(const char *filename); | 226 | extern int html_include(const char *filename); |
226 | 227 | ||
227 | extern int cgit_read_config(const char *filename, configfn fn); | 228 | extern int cgit_read_config(const char *filename, configfn fn); |
228 | extern int cgit_parse_query(char *txt, configfn fn); | 229 | extern int cgit_parse_query(char *txt, configfn fn); |
229 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 230 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
230 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 231 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
231 | extern void cgit_parse_url(const char *url); | 232 | extern void cgit_parse_url(const char *url); |
232 | 233 | ||
233 | extern char *cache_safe_filename(const char *unsafe); | 234 | extern char *cache_safe_filename(const char *unsafe); |
234 | extern int cache_lock(struct cacheitem *item); | 235 | extern int cache_lock(struct cacheitem *item); |
235 | extern int cache_unlock(struct cacheitem *item); | 236 | extern int cache_unlock(struct cacheitem *item); |
236 | extern int cache_cancel_lock(struct cacheitem *item); | 237 | extern int cache_cancel_lock(struct cacheitem *item); |
237 | extern int cache_exist(struct cacheitem *item); | 238 | extern int cache_exist(struct cacheitem *item); |
238 | extern int cache_expired(struct cacheitem *item); | 239 | extern int cache_expired(struct cacheitem *item); |
239 | 240 | ||
240 | extern char *cgit_repourl(const char *reponame); | 241 | extern char *cgit_repourl(const char *reponame); |
241 | extern char *cgit_fileurl(const char *reponame, const char *pagename, | 242 | extern char *cgit_fileurl(const char *reponame, const char *pagename, |
242 | const char *filename, const char *query); | 243 | const char *filename, const char *query); |
243 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 244 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
244 | const char *query); | 245 | const char *query); |
245 | 246 | ||
246 | extern const char *cgit_repobasename(const char *reponame); | 247 | extern const char *cgit_repobasename(const char *reponame); |
247 | 248 | ||
248 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, | 249 | extern void cgit_tree_link(char *name, char *title, char *class, char *head, |
249 | char *rev, char *path); | 250 | char *rev, char *path); |
250 | extern void cgit_log_link(char *name, char *title, char *class, char *head, | 251 | extern void cgit_log_link(char *name, char *title, char *class, char *head, |
251 | char *rev, char *path, int ofs, char *grep, | 252 | char *rev, char *path, int ofs, char *grep, |
252 | char *pattern); | 253 | char *pattern); |
253 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, | 254 | extern void cgit_commit_link(char *name, char *title, char *class, char *head, |
254 | char *rev); | 255 | char *rev); |
255 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, | 256 | extern void cgit_refs_link(char *name, char *title, char *class, char *head, |
256 | char *rev, char *path); | 257 | char *rev, char *path); |
257 | extern void cgit_snapshot_link(char *name, char *title, char *class, | 258 | extern void cgit_snapshot_link(char *name, char *title, char *class, |
258 | char *head, char *rev, char *archivename); | 259 | char *head, char *rev, char *archivename); |
259 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, | 260 | extern void cgit_diff_link(char *name, char *title, char *class, char *head, |
260 | char *new_rev, char *old_rev, char *path); | 261 | char *new_rev, char *old_rev, char *path); |
261 | 262 | ||
262 | extern void cgit_object_link(struct object *obj); | 263 | extern void cgit_object_link(struct object *obj); |
263 | 264 | ||
264 | extern void cgit_print_error(char *msg); | 265 | extern void cgit_print_error(char *msg); |
265 | extern void cgit_print_date(time_t secs, char *format); | 266 | extern void cgit_print_date(time_t secs, char *format); |
266 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); | 267 | extern void cgit_print_age(time_t t, time_t max_relative, char *format); |
267 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 268 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
268 | extern void cgit_print_docend(); | 269 | extern void cgit_print_docend(); |
269 | extern void cgit_print_pageheader(char *title, int show_search); | 270 | extern void cgit_print_pageheader(char *title, int show_search); |
270 | extern void cgit_print_snapshot_start(const char *mimetype, | 271 | extern void cgit_print_snapshot_start(const char *mimetype, |
271 | const char *filename, | 272 | const char *filename, |
272 | struct cacheitem *item); | 273 | struct cacheitem *item); |
273 | extern void cgit_print_branches(int maxcount); | 274 | extern void cgit_print_branches(int maxcount); |
274 | extern void cgit_print_tags(int maxcount); | 275 | extern void cgit_print_tags(int maxcount); |
275 | 276 | ||
276 | extern void cgit_print_repolist(struct cacheitem *item); | 277 | extern void cgit_print_repolist(struct cacheitem *item); |
277 | extern void cgit_print_summary(); | 278 | extern void cgit_print_summary(); |
278 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, | 279 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, |
279 | char *pattern, char *path, int pager); | 280 | char *pattern, char *path, int pager); |
280 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 281 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
281 | extern void cgit_print_tree(const char *rev, char *path); | 282 | extern void cgit_print_tree(const char *rev, char *path); |
282 | extern void cgit_print_commit(char *hex); | 283 | extern void cgit_print_commit(char *hex); |
283 | extern void cgit_print_refs(); | 284 | extern void cgit_print_refs(); |
284 | extern void cgit_print_tag(char *revname); | 285 | extern void cgit_print_tag(char *revname); |
285 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); | 286 | extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); |
287 | extern void cgit_print_patch(char *hex, struct cacheitem *item); | ||
286 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, | 288 | extern void cgit_print_snapshot(struct cacheitem *item, const char *head, |
287 | const char *hex, const char *prefix, | 289 | const char *hex, const char *prefix, |
288 | const char *filename, int snapshot); | 290 | const char *filename, int snapshot); |
289 | extern void cgit_print_snapshot_links(const char *repo, const char *head, | 291 | extern void cgit_print_snapshot_links(const char *repo, const char *head, |
290 | const char *hex, int snapshots); | 292 | const char *hex, int snapshots); |
291 | extern int cgit_parse_snapshots_mask(const char *str); | 293 | extern int cgit_parse_snapshots_mask(const char *str); |
292 | 294 | ||
293 | #endif /* CGIT_H */ | 295 | #endif /* CGIT_H */ |