author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 21:13:12 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 21:27:53 (UTC) |
commit | 6a8749d3bd1570faa3dc07e80efc8fcef5953aa0 (patch) (unidiff) | |
tree | 1c76a6b2434cea448bc8d73f452904d8024a8ccb /cgit.h | |
parent | 8a3685bcf2612206fc24a2421acb53dd83aeab85 (diff) | |
download | cgit-6a8749d3bd1570faa3dc07e80efc8fcef5953aa0.zip cgit-6a8749d3bd1570faa3dc07e80efc8fcef5953aa0.tar.gz cgit-6a8749d3bd1570faa3dc07e80efc8fcef5953aa0.tar.bz2 |
Add commitdiff between commit and each of it's parent
A link is added next to each parent of a commit, leading to the new
diff-functionality in ui-diff.c.
Also added support for a path-parameter to filelevel diffs accessed via the
diffstat.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,182 +1,182 @@ | |||
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 | 19 | ||
20 | 20 | ||
21 | typedef void (*configfn)(const char *name, const char *value); | 21 | typedef void (*configfn)(const char *name, const char *value); |
22 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 22 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
23 | typedef void (*linediff_fn)(char *line, int len); | 23 | typedef void (*linediff_fn)(char *line, int len); |
24 | 24 | ||
25 | struct cacheitem { | 25 | struct cacheitem { |
26 | char *name; | 26 | char *name; |
27 | struct stat st; | 27 | struct stat st; |
28 | int ttl; | 28 | int ttl; |
29 | int fd; | 29 | int fd; |
30 | }; | 30 | }; |
31 | 31 | ||
32 | struct repoinfo { | 32 | struct repoinfo { |
33 | char *url; | 33 | char *url; |
34 | char *name; | 34 | char *name; |
35 | char *path; | 35 | char *path; |
36 | char *desc; | 36 | char *desc; |
37 | char *owner; | 37 | char *owner; |
38 | char *module_link; | 38 | char *module_link; |
39 | int snapshots; | 39 | int snapshots; |
40 | }; | 40 | }; |
41 | 41 | ||
42 | struct repolist { | 42 | struct repolist { |
43 | int length; | 43 | int length; |
44 | int count; | 44 | int count; |
45 | struct repoinfo *repos; | 45 | struct repoinfo *repos; |
46 | }; | 46 | }; |
47 | 47 | ||
48 | struct commitinfo { | 48 | struct commitinfo { |
49 | struct commit *commit; | 49 | struct commit *commit; |
50 | char *author; | 50 | char *author; |
51 | char *author_email; | 51 | char *author_email; |
52 | unsigned long author_date; | 52 | unsigned long author_date; |
53 | char *committer; | 53 | char *committer; |
54 | char *committer_email; | 54 | char *committer_email; |
55 | unsigned long committer_date; | 55 | unsigned long committer_date; |
56 | char *subject; | 56 | char *subject; |
57 | char *msg; | 57 | char *msg; |
58 | }; | 58 | }; |
59 | 59 | ||
60 | struct taginfo { | 60 | struct taginfo { |
61 | char *tagger; | 61 | char *tagger; |
62 | char *tagger_email; | 62 | char *tagger_email; |
63 | int tagger_date; | 63 | int tagger_date; |
64 | char *msg; | 64 | char *msg; |
65 | }; | 65 | }; |
66 | 66 | ||
67 | extern const char cgit_version[]; | 67 | extern const char cgit_version[]; |
68 | 68 | ||
69 | extern struct repolist cgit_repolist; | 69 | extern struct repolist cgit_repolist; |
70 | extern struct repoinfo *cgit_repo; | 70 | extern struct repoinfo *cgit_repo; |
71 | 71 | ||
72 | extern char *cgit_root_title; | 72 | extern char *cgit_root_title; |
73 | extern char *cgit_css; | 73 | extern char *cgit_css; |
74 | extern char *cgit_logo; | 74 | extern char *cgit_logo; |
75 | extern char *cgit_logo_link; | 75 | extern char *cgit_logo_link; |
76 | extern char *cgit_module_link; | 76 | extern char *cgit_module_link; |
77 | extern char *cgit_virtual_root; | 77 | extern char *cgit_virtual_root; |
78 | extern char *cgit_cache_root; | 78 | extern char *cgit_cache_root; |
79 | 79 | ||
80 | extern int cgit_nocache; | 80 | extern int cgit_nocache; |
81 | extern int cgit_snapshots; | 81 | extern int cgit_snapshots; |
82 | extern int cgit_max_lock_attempts; | 82 | extern int cgit_max_lock_attempts; |
83 | extern int cgit_cache_root_ttl; | 83 | extern int cgit_cache_root_ttl; |
84 | extern int cgit_cache_repo_ttl; | 84 | extern int cgit_cache_repo_ttl; |
85 | extern int cgit_cache_dynamic_ttl; | 85 | extern int cgit_cache_dynamic_ttl; |
86 | extern int cgit_cache_static_ttl; | 86 | extern int cgit_cache_static_ttl; |
87 | extern int cgit_cache_max_create_time; | 87 | extern int cgit_cache_max_create_time; |
88 | 88 | ||
89 | extern int cgit_max_msg_len; | 89 | extern int cgit_max_msg_len; |
90 | extern int cgit_max_commit_count; | 90 | extern int cgit_max_commit_count; |
91 | 91 | ||
92 | extern char *cgit_repo_name; | 92 | extern char *cgit_repo_name; |
93 | extern char *cgit_repo_desc; | 93 | extern char *cgit_repo_desc; |
94 | extern char *cgit_repo_owner; | 94 | extern char *cgit_repo_owner; |
95 | 95 | ||
96 | extern int cgit_query_has_symref; | 96 | extern int cgit_query_has_symref; |
97 | extern int cgit_query_has_sha1; | 97 | extern int cgit_query_has_sha1; |
98 | 98 | ||
99 | extern char *cgit_querystring; | 99 | extern char *cgit_querystring; |
100 | extern char *cgit_query_repo; | 100 | extern char *cgit_query_repo; |
101 | extern char *cgit_query_page; | 101 | extern char *cgit_query_page; |
102 | extern char *cgit_query_search; | 102 | extern char *cgit_query_search; |
103 | extern char *cgit_query_head; | 103 | extern char *cgit_query_head; |
104 | extern char *cgit_query_sha1; | 104 | extern char *cgit_query_sha1; |
105 | extern char *cgit_query_sha2; | 105 | extern char *cgit_query_sha2; |
106 | extern char *cgit_query_path; | 106 | extern char *cgit_query_path; |
107 | extern char *cgit_query_name; | 107 | extern char *cgit_query_name; |
108 | extern int cgit_query_ofs; | 108 | extern int cgit_query_ofs; |
109 | 109 | ||
110 | extern int htmlfd; | 110 | extern int htmlfd; |
111 | 111 | ||
112 | extern void cgit_global_config_cb(const char *name, const char *value); | 112 | extern void cgit_global_config_cb(const char *name, const char *value); |
113 | extern void cgit_repo_config_cb(const char *name, const char *value); | 113 | extern void cgit_repo_config_cb(const char *name, const char *value); |
114 | extern void cgit_querystring_cb(const char *name, const char *value); | 114 | extern void cgit_querystring_cb(const char *name, const char *value); |
115 | 115 | ||
116 | extern int chk_zero(int result, char *msg); | 116 | extern int chk_zero(int result, char *msg); |
117 | extern int chk_positive(int result, char *msg); | 117 | extern int chk_positive(int result, char *msg); |
118 | 118 | ||
119 | extern int hextoint(char c); | 119 | extern int hextoint(char c); |
120 | 120 | ||
121 | extern void *cgit_free_commitinfo(struct commitinfo *info); | 121 | extern void *cgit_free_commitinfo(struct commitinfo *info); |
122 | 122 | ||
123 | extern int cgit_diff_files(const unsigned char *old_sha1, | 123 | extern int cgit_diff_files(const unsigned char *old_sha1, |
124 | const unsigned char *new_sha1, | 124 | const unsigned char *new_sha1, |
125 | linediff_fn fn); | 125 | linediff_fn fn); |
126 | 126 | ||
127 | extern void cgit_diff_tree(const unsigned char *old_sha1, | 127 | extern void cgit_diff_tree(const unsigned char *old_sha1, |
128 | const unsigned char *new_sha1, | 128 | const unsigned char *new_sha1, |
129 | filepair_fn fn); | 129 | filepair_fn fn); |
130 | 130 | ||
131 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); | 131 | extern void cgit_diff_commit(struct commit *commit, filepair_fn fn); |
132 | 132 | ||
133 | extern char *fmt(const char *format,...); | 133 | extern char *fmt(const char *format,...); |
134 | 134 | ||
135 | extern void html(const char *txt); | 135 | extern void html(const char *txt); |
136 | extern void htmlf(const char *format,...); | 136 | extern void htmlf(const char *format,...); |
137 | extern void html_txt(char *txt); | 137 | extern void html_txt(char *txt); |
138 | extern void html_ntxt(int len, char *txt); | 138 | extern void html_ntxt(int len, char *txt); |
139 | extern void html_attr(char *txt); | 139 | extern void html_attr(char *txt); |
140 | extern void html_hidden(char *name, char *value); | 140 | extern void html_hidden(char *name, char *value); |
141 | extern void html_link_open(char *url, char *title, char *class); | 141 | extern void html_link_open(char *url, char *title, char *class); |
142 | extern void html_link_close(void); | 142 | extern void html_link_close(void); |
143 | extern void html_filemode(unsigned short mode); | 143 | extern void html_filemode(unsigned short mode); |
144 | 144 | ||
145 | extern int cgit_read_config(const char *filename, configfn fn); | 145 | extern int cgit_read_config(const char *filename, configfn fn); |
146 | extern int cgit_parse_query(char *txt, configfn fn); | 146 | extern int cgit_parse_query(char *txt, configfn fn); |
147 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); | 147 | extern struct commitinfo *cgit_parse_commit(struct commit *commit); |
148 | extern struct taginfo *cgit_parse_tag(struct tag *tag); | 148 | extern struct taginfo *cgit_parse_tag(struct tag *tag); |
149 | 149 | ||
150 | extern char *cache_safe_filename(const char *unsafe); | 150 | extern char *cache_safe_filename(const char *unsafe); |
151 | extern int cache_lock(struct cacheitem *item); | 151 | extern int cache_lock(struct cacheitem *item); |
152 | extern int cache_unlock(struct cacheitem *item); | 152 | extern int cache_unlock(struct cacheitem *item); |
153 | extern int cache_cancel_lock(struct cacheitem *item); | 153 | extern int cache_cancel_lock(struct cacheitem *item); |
154 | extern int cache_exist(struct cacheitem *item); | 154 | extern int cache_exist(struct cacheitem *item); |
155 | extern int cache_expired(struct cacheitem *item); | 155 | extern int cache_expired(struct cacheitem *item); |
156 | 156 | ||
157 | extern char *cgit_repourl(const char *reponame); | 157 | extern char *cgit_repourl(const char *reponame); |
158 | extern char *cgit_pageurl(const char *reponame, const char *pagename, | 158 | extern char *cgit_pageurl(const char *reponame, const char *pagename, |
159 | const char *query); | 159 | const char *query); |
160 | 160 | ||
161 | extern void cgit_print_error(char *msg); | 161 | extern void cgit_print_error(char *msg); |
162 | extern void cgit_print_date(unsigned long secs); | 162 | extern void cgit_print_date(unsigned long secs); |
163 | extern void cgit_print_docstart(char *title, struct cacheitem *item); | 163 | extern void cgit_print_docstart(char *title, struct cacheitem *item); |
164 | extern void cgit_print_docend(); | 164 | extern void cgit_print_docend(); |
165 | extern void cgit_print_pageheader(char *title, int show_search); | 165 | extern void cgit_print_pageheader(char *title, int show_search); |
166 | extern void cgit_print_snapshot_start(const char *mimetype, | 166 | extern void cgit_print_snapshot_start(const char *mimetype, |
167 | const char *filename, | 167 | const char *filename, |
168 | struct cacheitem *item); | 168 | struct cacheitem *item); |
169 | 169 | ||
170 | extern void cgit_print_repolist(struct cacheitem *item); | 170 | extern void cgit_print_repolist(struct cacheitem *item); |
171 | extern void cgit_print_summary(); | 171 | extern void cgit_print_summary(); |
172 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep); | 172 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep); |
173 | extern void cgit_print_view(const char *hex, char *path); | 173 | extern void cgit_print_view(const char *hex, char *path); |
174 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); | 174 | extern void cgit_print_blob(struct cacheitem *item, const char *hex, char *path); |
175 | extern void cgit_print_tree(const char *hex, char *path); | 175 | extern void cgit_print_tree(const char *hex, char *path); |
176 | extern void cgit_print_commit(const char *hex); | 176 | extern void cgit_print_commit(const char *hex); |
177 | extern void cgit_print_diff(const char *old_hex, const char *new_hex); | 177 | extern void cgit_print_diff(const char *old_hex, const char *new_hex, char *path); |
178 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, | 178 | extern void cgit_print_snapshot(struct cacheitem *item, const char *hex, |
179 | const char *format, const char *prefix, | 179 | const char *format, const char *prefix, |
180 | const char *filename); | 180 | const char *filename); |
181 | 181 | ||
182 | #endif /* CGIT_H */ | 182 | #endif /* CGIT_H */ |