author | Jeff Smith <whydoubt@yahoo.com> | 2010-07-29 14:32:30 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-04 01:10:07 (UTC) |
commit | 059b39344fdcde324dff1099fc4b70c7aab12a96 (patch) (unidiff) | |
tree | 4a12cf7645b89c06684e09a1e5dded9a5ddeae38 /cgit.h | |
parent | f9143171267e39f66a02ad2ecb0da2e8cc7f4142 (diff) | |
download | cgit-059b39344fdcde324dff1099fc4b70c7aab12a96.zip cgit-059b39344fdcde324dff1099fc4b70c7aab12a96.tar.gz cgit-059b39344fdcde324dff1099fc4b70c7aab12a96.tar.bz2 |
ui-commit: Display git notes when present
Signed-off-by: Jeff Smith <whydoubt@yahoo.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.h | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,149 +1,150 @@ | |||
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 <string-list.h> | 18 | #include <string-list.h> |
19 | #include <xdiff-interface.h> | 19 | #include <xdiff-interface.h> |
20 | #include <xdiff/xdiff.h> | 20 | #include <xdiff/xdiff.h> |
21 | #include <utf8.h> | 21 | #include <utf8.h> |
22 | #include <notes.h> | ||
22 | 23 | ||
23 | 24 | ||
24 | /* | 25 | /* |
25 | * Dateformats used on misc. pages | 26 | * Dateformats used on misc. pages |
26 | */ | 27 | */ |
27 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 28 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
28 | #define FMT_SHORTDATE "%Y-%m-%d" | 29 | #define FMT_SHORTDATE "%Y-%m-%d" |
29 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" | 30 | #define FMT_ATOMDATE "%Y-%m-%dT%H:%M:%SZ" |
30 | 31 | ||
31 | 32 | ||
32 | /* | 33 | /* |
33 | * Limits used for relative dates | 34 | * Limits used for relative dates |
34 | */ | 35 | */ |
35 | #define TM_MIN 60 | 36 | #define TM_MIN 60 |
36 | #define TM_HOUR (TM_MIN * 60) | 37 | #define TM_HOUR (TM_MIN * 60) |
37 | #define TM_DAY (TM_HOUR * 24) | 38 | #define TM_DAY (TM_HOUR * 24) |
38 | #define TM_WEEK (TM_DAY * 7) | 39 | #define TM_WEEK (TM_DAY * 7) |
39 | #define TM_YEAR (TM_DAY * 365) | 40 | #define TM_YEAR (TM_DAY * 365) |
40 | #define TM_MONTH (TM_YEAR / 12.0) | 41 | #define TM_MONTH (TM_YEAR / 12.0) |
41 | 42 | ||
42 | 43 | ||
43 | /* | 44 | /* |
44 | * Default encoding | 45 | * Default encoding |
45 | */ | 46 | */ |
46 | #define PAGE_ENCODING "UTF-8" | 47 | #define PAGE_ENCODING "UTF-8" |
47 | 48 | ||
48 | typedef void (*configfn)(const char *name, const char *value); | 49 | typedef void (*configfn)(const char *name, const char *value); |
49 | typedef void (*filepair_fn)(struct diff_filepair *pair); | 50 | typedef void (*filepair_fn)(struct diff_filepair *pair); |
50 | typedef void (*linediff_fn)(char *line, int len); | 51 | typedef void (*linediff_fn)(char *line, int len); |
51 | 52 | ||
52 | struct cgit_filter { | 53 | struct cgit_filter { |
53 | char *cmd; | 54 | char *cmd; |
54 | char **argv; | 55 | char **argv; |
55 | int old_stdout; | 56 | int old_stdout; |
56 | int pipe_fh[2]; | 57 | int pipe_fh[2]; |
57 | int pid; | 58 | int pid; |
58 | int exitstatus; | 59 | int exitstatus; |
59 | }; | 60 | }; |
60 | 61 | ||
61 | struct cgit_repo { | 62 | struct cgit_repo { |
62 | char *url; | 63 | char *url; |
63 | char *name; | 64 | char *name; |
64 | char *path; | 65 | char *path; |
65 | char *desc; | 66 | char *desc; |
66 | char *owner; | 67 | char *owner; |
67 | char *defbranch; | 68 | char *defbranch; |
68 | char *module_link; | 69 | char *module_link; |
69 | char *readme; | 70 | char *readme; |
70 | char *section; | 71 | char *section; |
71 | char *clone_url; | 72 | char *clone_url; |
72 | int snapshots; | 73 | int snapshots; |
73 | int enable_log_filecount; | 74 | int enable_log_filecount; |
74 | int enable_log_linecount; | 75 | int enable_log_linecount; |
75 | int enable_remote_branches; | 76 | int enable_remote_branches; |
76 | int enable_subject_links; | 77 | int enable_subject_links; |
77 | int max_stats; | 78 | int max_stats; |
78 | time_t mtime; | 79 | time_t mtime; |
79 | struct cgit_filter *about_filter; | 80 | struct cgit_filter *about_filter; |
80 | struct cgit_filter *commit_filter; | 81 | struct cgit_filter *commit_filter; |
81 | struct cgit_filter *source_filter; | 82 | struct cgit_filter *source_filter; |
82 | }; | 83 | }; |
83 | 84 | ||
84 | typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, | 85 | typedef void (*repo_config_fn)(struct cgit_repo *repo, const char *name, |
85 | const char *value); | 86 | const char *value); |
86 | 87 | ||
87 | struct cgit_repolist { | 88 | struct cgit_repolist { |
88 | int length; | 89 | int length; |
89 | int count; | 90 | int count; |
90 | struct cgit_repo *repos; | 91 | struct cgit_repo *repos; |
91 | }; | 92 | }; |
92 | 93 | ||
93 | struct commitinfo { | 94 | struct commitinfo { |
94 | struct commit *commit; | 95 | struct commit *commit; |
95 | char *author; | 96 | char *author; |
96 | char *author_email; | 97 | char *author_email; |
97 | unsigned long author_date; | 98 | unsigned long author_date; |
98 | char *committer; | 99 | char *committer; |
99 | char *committer_email; | 100 | char *committer_email; |
100 | unsigned long committer_date; | 101 | unsigned long committer_date; |
101 | char *subject; | 102 | char *subject; |
102 | char *msg; | 103 | char *msg; |
103 | char *msg_encoding; | 104 | char *msg_encoding; |
104 | }; | 105 | }; |
105 | 106 | ||
106 | struct taginfo { | 107 | struct taginfo { |
107 | char *tagger; | 108 | char *tagger; |
108 | char *tagger_email; | 109 | char *tagger_email; |
109 | unsigned long tagger_date; | 110 | unsigned long tagger_date; |
110 | char *msg; | 111 | char *msg; |
111 | }; | 112 | }; |
112 | 113 | ||
113 | struct refinfo { | 114 | struct refinfo { |
114 | const char *refname; | 115 | const char *refname; |
115 | struct object *object; | 116 | struct object *object; |
116 | union { | 117 | union { |
117 | struct taginfo *tag; | 118 | struct taginfo *tag; |
118 | struct commitinfo *commit; | 119 | struct commitinfo *commit; |
119 | }; | 120 | }; |
120 | }; | 121 | }; |
121 | 122 | ||
122 | struct reflist { | 123 | struct reflist { |
123 | struct refinfo **refs; | 124 | struct refinfo **refs; |
124 | int alloc; | 125 | int alloc; |
125 | int count; | 126 | int count; |
126 | }; | 127 | }; |
127 | 128 | ||
128 | struct cgit_query { | 129 | struct cgit_query { |
129 | int has_symref; | 130 | int has_symref; |
130 | int has_sha1; | 131 | int has_sha1; |
131 | char *raw; | 132 | char *raw; |
132 | char *repo; | 133 | char *repo; |
133 | char *page; | 134 | char *page; |
134 | char *search; | 135 | char *search; |
135 | char *grep; | 136 | char *grep; |
136 | char *head; | 137 | char *head; |
137 | char *sha1; | 138 | char *sha1; |
138 | char *sha2; | 139 | char *sha2; |
139 | char *path; | 140 | char *path; |
140 | char *name; | 141 | char *name; |
141 | char *mimetype; | 142 | char *mimetype; |
142 | char *url; | 143 | char *url; |
143 | char *period; | 144 | char *period; |
144 | int ofs; | 145 | int ofs; |
145 | int nohead; | 146 | int nohead; |
146 | char *sort; | 147 | char *sort; |
147 | int showmsg; | 148 | int showmsg; |
148 | int ssdiff; | 149 | int ssdiff; |
149 | int show_all; | 150 | int show_all; |