about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorLars Hjemli2008-03-24 16:38:47 +0100
committerLars Hjemli2008-03-24 16:38:47 +0100
commitc5984a9896b39748e61daf6e620483749654b102 (patch)
tree5576deee2c5bcc92ae85ab07af215295c52d4143
parentRefactor snapshot support (diff)
downloadcgit-c5984a9896b39748e61daf6e620483749654b102.tar.gz
cgit-c5984a9896b39748e61daf6e620483749654b102.zip
Add separate header-files for each page/view
Yet another step towards removing cgit.h.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat
-rw-r--r--cgit.h17
-rw-r--r--cmd.c11
-rw-r--r--ui-blob.h6
-rw-r--r--ui-commit.h6
-rw-r--r--ui-diff.h7
-rw-r--r--ui-log.h7
-rw-r--r--ui-patch.h6
-rw-r--r--ui-refs.c172
-rw-r--r--ui-refs.h8
-rw-r--r--ui-repolist.h6
-rw-r--r--ui-snapshot.h8
-rw-r--r--ui-summary.c174
-rw-r--r--ui-summary.h6
-rw-r--r--ui-tag.h6
-rw-r--r--ui-tree.h6
15 files changed, 257 insertions, 189 deletions
diff --git a/cgit.h b/cgit.h index e2d5126..1b23369 100644 --- a/cgit.h +++ b/cgit.h
@@ -269,23 +269,6 @@ extern void cgit_print_docstart(struct cgit_context *ctx);
269extern void cgit_print_docend(); 269extern void cgit_print_docend();
270extern void cgit_print_pageheader(struct cgit_context *ctx); 270extern void cgit_print_pageheader(struct cgit_context *ctx);
271extern void cgit_print_filemode(unsigned short mode); 271extern void cgit_print_filemode(unsigned short mode);
272extern void cgit_print_branches(int maxcount);
273extern void cgit_print_tags(int maxcount);
274
275extern void cgit_print_repolist();
276extern void cgit_print_summary();
277extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
278 char *pattern, char *path, int pager);
279extern void cgit_print_blob(const char *hex, char *path);
280extern void cgit_print_tree(const char *rev, char *path);
281extern void cgit_print_commit(char *hex);
282extern void cgit_print_refs();
283extern void cgit_print_tag(char *revname);
284extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix);
285extern void cgit_print_patch(char *hex);
286extern void cgit_print_snapshot(const char *head, const char *hex,
287 const char *prefix, const char *filename,
288 int snapshot);
289extern void cgit_print_snapshot_links(const char *repo, const char *head, 272extern void cgit_print_snapshot_links(const char *repo, const char *head,
290 const char *hex, int snapshots); 273 const char *hex, int snapshots);
291extern int cgit_parse_snapshots_mask(const char *str); 274extern int cgit_parse_snapshots_mask(const char *str);
diff --git a/cmd.c b/cmd.c index 489a11c..e0eacbe 100644 --- a/cmd.c +++ b/cmd.c
@@ -8,6 +8,17 @@
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "cmd.h" 10#include "cmd.h"
11#include "ui-blob.h"
12#include "ui-commit.h"
13#include "ui-diff.h"
14#include "ui-log.h"
15#include "ui-patch.h"
16#include "ui-refs.h"
17#include "ui-repolist.h"
18#include "ui-snapshot.h"
19#include "ui-summary.h"
20#include "ui-tag.h"
21#include "ui-tree.h"
11 22
12static void blob_fn(struct cgit_context *ctx) 23static void blob_fn(struct cgit_context *ctx)
13{ 24{
diff --git a/ui-blob.h b/ui-blob.h new file mode 100644 index 0000000..5a920a8 --- /dev/null +++ b/ui-blob.h
@@ -0,0 +1,6 @@
1#ifndef UI_BLOB_H
2#define UI_BLOB_H
3
4extern void cgit_print_blob(const char *hex, char *path);
5
6#endif /* UI_BLOB_H */
diff --git a/ui-commit.h b/ui-commit.h new file mode 100644 index 0000000..40bcb31 --- /dev/null +++ b/ui-commit.h
@@ -0,0 +1,6 @@
1#ifndef UI_COMMIT_H
2#define UI_COMMIT_H
3
4extern void cgit_print_commit(char *hex);
5
6#endif /* UI_COMMIT_H */
diff --git a/ui-diff.h b/ui-diff.h new file mode 100644 index 0000000..2307322 --- /dev/null +++ b/ui-diff.h
@@ -0,0 +1,7 @@
1#ifndef UI_DIFF_H
2#define UI_DIFF_H
3
4extern void cgit_print_diff(const char *new_hex, const char *old_hex,
5 const char *prefix);
6
7#endif /* UI_DIFF_H */
diff --git a/ui-log.h b/ui-log.h new file mode 100644 index 0000000..877e40e --- /dev/null +++ b/ui-log.h
@@ -0,0 +1,7 @@
1#ifndef UI_LOG_H
2#define UI_LOG_H
3
4extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep,
5 char *pattern, char *path, int pager);
6
7#endif /* UI_LOG_H */
diff --git a/ui-patch.h b/ui-patch.h new file mode 100644 index 0000000..9f68212 --- /dev/null +++ b/ui-patch.h
@@ -0,0 +1,6 @@
1#ifndef UI_PATCH_H
2#define UI_PATCH_H
3
4extern void cgit_print_patch(char *hex);
5
6#endif /* UI_PATCH_H */
diff --git a/ui-refs.c b/ui-refs.c index e2a16f4..fc82ca7 100644 --- a/ui-refs.c +++ b/ui-refs.c
@@ -9,6 +9,178 @@
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11 11
12static int header;
13
14static int cmp_age(int age1, int age2)
15{
16 if (age1 != 0 && age2 != 0)
17 return age2 - age1;
18
19 if (age1 == 0 && age2 == 0)
20 return 0;
21
22 if (age1 == 0)
23 return +1;
24
25 return -1;
26}
27
28static int cmp_ref_name(const void *a, const void *b)
29{
30 struct refinfo *r1 = *(struct refinfo **)a;
31 struct refinfo *r2 = *(struct refinfo **)b;
32
33 return strcmp(r1->refname, r2->refname);
34}
35
36static int cmp_branch_age(const void *a, const void *b)
37{
38 struct refinfo *r1 = *(struct refinfo **)a;
39 struct refinfo *r2 = *(struct refinfo **)b;
40
41 return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
42}
43
44static int cmp_tag_age(const void *a, const void *b)
45{
46 struct refinfo *r1 = *(struct refinfo **)a;
47 struct refinfo *r2 = *(struct refinfo **)b;
48
49 return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
50}
51
52static int print_branch(struct refinfo *ref)
53{
54 struct commitinfo *info = ref->commit;
55 char *name = (char *)ref->refname;
56
57 if (!info)
58 return 1;
59 html("<tr><td>");
60 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
61 html("</td><td>");
62
63 if (ref->object->type == OBJ_COMMIT) {
64 cgit_print_age(info->commit->date, -1, NULL);
65 html("</td><td>");
66 html_txt(info->author);
67 html("</td><td>");
68 cgit_commit_link(info->subject, NULL, NULL, name, NULL);
69 } else {
70 html("</td><td></td><td>");
71 cgit_object_link(ref->object);
72 }
73 html("</td></tr>\n");
74 return 0;
75}
76
77static void print_tag_header()
78{
79 html("<tr class='nohover'><th class='left'>Tag</th>"
80 "<th class='left'>Age</th>"
81 "<th class='left'>Author</th>"
82 "<th class='left'>Reference</th></tr>\n");
83 header = 1;
84}
85
86static int print_tag(struct refinfo *ref)
87{
88 struct tag *tag;
89 struct taginfo *info;
90 char *url, *name = (char *)ref->refname;
91
92 if (ref->object->type == OBJ_TAG) {
93 tag = (struct tag *)ref->object;
94 info = ref->tag;
95 if (!tag || !info)
96 return 1;
97 html("<tr><td>");
98 url = cgit_pageurl(ctx.qry.repo, "tag",
99 fmt("id=%s", name));
100 html_link_open(url, NULL, NULL);
101 html_txt(name);
102 html_link_close();
103 html("</td><td>");
104 if (info->tagger_date > 0)
105 cgit_print_age(info->tagger_date, -1, NULL);
106 html("</td><td>");
107 if (info->tagger)
108 html(info->tagger);
109 html("</td><td>");
110 cgit_object_link(tag->tagged);
111 html("</td></tr>\n");
112 } else {
113 if (!header)
114 print_tag_header();
115 html("<tr><td>");
116 html_txt(name);
117 html("</td><td colspan='2'/><td>");
118 cgit_object_link(ref->object);
119 html("</td></tr>\n");
120 }
121 return 0;
122}
123
124static void print_refs_link(char *path)
125{
126 html("<tr class='nohover'><td colspan='4'>");
127 cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
128 html("</td></tr>");
129}
130
131void cgit_print_branches(int maxcount)
132{
133 struct reflist list;
134 int i;
135
136 html("<tr class='nohover'><th class='left'>Branch</th>"
137 "<th class='left'>Idle</th>"
138 "<th class='left'>Author</th>"
139 "<th class='left'>Head commit</th></tr>\n");
140
141 list.refs = NULL;
142 list.alloc = list.count = 0;
143 for_each_branch_ref(cgit_refs_cb, &list);
144
145 if (maxcount == 0 || maxcount > list.count)
146 maxcount = list.count;
147
148 if (maxcount < list.count) {
149 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
150 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
151 }
152
153 for(i=0; i<maxcount; i++)
154 print_branch(list.refs[i]);
155
156 if (maxcount < list.count)
157 print_refs_link("heads");
158}
159
160void cgit_print_tags(int maxcount)
161{
162 struct reflist list;
163 int i;
164
165 header = 0;
166 list.refs = NULL;
167 list.alloc = list.count = 0;
168 for_each_tag_ref(cgit_refs_cb, &list);
169 if (list.count == 0)
170 return;
171 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
172 if (!maxcount)
173 maxcount = list.count;
174 else if (maxcount > list.count)
175 maxcount = list.count;
176 print_tag_header();
177 for(i=0; i<maxcount; i++)
178 print_tag(list.refs[i]);
179
180 if (maxcount < list.count)
181 print_refs_link("tags");
182}
183
12void cgit_print_refs() 184void cgit_print_refs()
13{ 185{
14 186
diff --git a/ui-refs.h b/ui-refs.h new file mode 100644 index 0000000..b35c04a --- /dev/null +++ b/ui-refs.h
@@ -0,0 +1,8 @@
1#ifndef UI_REFS_H
2#define UI_REFS_H
3
4extern void cgit_print_branches(int maxcount);
5extern void cgit_print_tags(int maxcount);
6extern void cgit_print_refs();
7
8#endif /* UI_REFS_H */
diff --git a/ui-repolist.h b/ui-repolist.h new file mode 100644 index 0000000..c23e5d2 --- /dev/null +++ b/ui-repolist.h
@@ -0,0 +1,6 @@
1#ifndef UI_REPOLIST_H
2#define UI_REPOLIST_H
3
4extern void cgit_print_repolist();
5
6#endif /* UI_REPOLIST_H */
diff --git a/ui-snapshot.h b/ui-snapshot.h new file mode 100644 index 0000000..6e03761 --- /dev/null +++ b/ui-snapshot.h
@@ -0,0 +1,8 @@
1#ifndef UI_SNAPSHOT_H
2#define UI_SNAPSHOT_H
3
4extern void cgit_print_snapshot(const char *head, const char *hex,
5 const char *prefix, const char *filename,
6 int snapshot);
7
8#endif /* UI_SNAPSHOT_H */
diff --git a/ui-summary.c b/ui-summary.c index 0afa0a3..0b66b52 100644 --- a/ui-summary.c +++ b/ui-summary.c
@@ -8,178 +8,8 @@
8 8
9#include "cgit.h" 9#include "cgit.h"
10#include "html.h" 10#include "html.h"
11 11#include "ui-log.h"
12static int header; 12#include "ui-refs.h"
13
14static int cmp_age(int age1, int age2)
15{
16 if (age1 != 0 && age2 != 0)
17 return age2 - age1;
18
19 if (age1 == 0 && age2 == 0)
20 return 0;
21
22 if (age1 == 0)
23 return +1;
24
25 return -1;
26}
27
28static int cmp_ref_name(const void *a, const void *b)
29{
30 struct refinfo *r1 = *(struct refinfo **)a;
31 struct refinfo *r2 = *(struct refinfo **)b;
32
33 return strcmp(r1->refname, r2->refname);
34}
35
36static int cmp_branch_age(const void *a, const void *b)
37{
38 struct refinfo *r1 = *(struct refinfo **)a;
39 struct refinfo *r2 = *(struct refinfo **)b;
40
41 return cmp_age(r1->commit->committer_date, r2->commit->committer_date);
42}
43
44static int cmp_tag_age(const void *a, const void *b)
45{
46 struct refinfo *r1 = *(struct refinfo **)a;
47 struct refinfo *r2 = *(struct refinfo **)b;
48
49 return cmp_age(r1->tag->tagger_date, r2->tag->tagger_date);
50}
51
52static int print_branch(struct refinfo *ref)
53{
54 struct commitinfo *info = ref->commit;
55 char *name = (char *)ref->refname;
56
57 if (!info)
58 return 1;
59 html("<tr><td>");
60 cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL);
61 html("</td><td>");
62
63 if (ref->object->type == OBJ_COMMIT) {
64 cgit_print_age(info->commit->date, -1, NULL);
65 html("</td><td>");
66 html_txt(info->author);
67 html("</td><td>");
68 cgit_commit_link(info->subject, NULL, NULL, name, NULL);
69 } else {
70 html("</td><td></td><td>");
71 cgit_object_link(ref->object);
72 }
73 html("</td></tr>\n");
74 return 0;
75}
76
77static void print_tag_header()
78{
79 html("<tr class='nohover'><th class='left'>Tag</th>"
80 "<th class='left'>Age</th>"
81 "<th class='left'>Author</th>"
82 "<th class='left'>Reference</th></tr>\n");
83 header = 1;
84}
85
86static int print_tag(struct refinfo *ref)
87{
88 struct tag *tag;
89 struct taginfo *info;
90 char *url, *name = (char *)ref->refname;
91
92 if (ref->object->type == OBJ_TAG) {
93 tag = (struct tag *)ref->object;
94 info = ref->tag;
95 if (!tag || !info)
96 return 1;
97 html("<tr><td>");
98 url = cgit_pageurl(ctx.qry.repo, "tag",
99 fmt("id=%s", name));
100 html_link_open(url, NULL, NULL);
101 html_txt(name);
102 html_link_close();
103 html("</td><td>");
104 if (info->tagger_date > 0)
105 cgit_print_age(info->tagger_date, -1, NULL);
106 html("</td><td>");
107 if (info->tagger)
108 html(info->tagger);
109 html("</td><td>");
110 cgit_object_link(tag->tagged);
111 html("</td></tr>\n");
112 } else {
113 if (!header)
114 print_tag_header();
115 html("<tr><td>");
116 html_txt(name);
117 html("</td><td colspan='2'/><td>");
118 cgit_object_link(ref->object);
119 html("</td></tr>\n");
120 }
121 return 0;
122}
123
124static void print_refs_link(char *path)
125{
126 html("<tr class='nohover'><td colspan='4'>");
127 cgit_refs_link("[...]", NULL, NULL, ctx.qry.head, NULL, path);
128 html("</td></tr>");
129}
130
131void cgit_print_branches(int maxcount)
132{
133 struct reflist list;
134 int i;
135
136 html("<tr class='nohover'><th class='left'>Branch</th>"
137 "<th class='left'>Idle</th>"
138 "<th class='left'>Author</th>"
139 "<th class='left'>Head commit</th></tr>\n");
140
141 list.refs = NULL;
142 list.alloc = list.count = 0;
143 for_each_branch_ref(cgit_refs_cb, &list);
144
145 if (maxcount == 0 || maxcount > list.count)
146 maxcount = list.count;
147
148 if (maxcount < list.count) {
149 qsort(list.refs, list.count, sizeof(*list.refs), cmp_branch_age);
150 qsort(list.refs, maxcount, sizeof(*list.refs), cmp_ref_name);
151 }
152
153 for(i=0; i<maxcount; i++)
154 print_branch(list.refs[i]);
155
156 if (maxcount < list.count)
157 print_refs_link("heads");
158}
159
160void cgit_print_tags(int maxcount)
161{
162 struct reflist list;
163 int i;
164
165 header = 0;
166 list.refs = NULL;
167 list.alloc = list.count = 0;
168 for_each_tag_ref(cgit_refs_cb, &list);
169 if (list.count == 0)
170 return;
171 qsort(list.refs, list.count, sizeof(*list.refs), cmp_tag_age);
172 if (!maxcount)
173 maxcount = list.count;
174 else if (maxcount > list.count)
175 maxcount = list.count;
176 print_tag_header();
177 for(i=0; i<maxcount; i++)
178 print_tag(list.refs[i]);
179
180 if (maxcount < list.count)
181 print_refs_link("tags");
182}
183 13
184void cgit_print_summary() 14void cgit_print_summary()
185{ 15{
diff --git a/ui-summary.h b/ui-summary.h new file mode 100644 index 0000000..37aedd2 --- /dev/null +++ b/ui-summary.h
@@ -0,0 +1,6 @@
1#ifndef UI_SUMMARY_H
2#define UI_SUMMARY_H
3
4extern void cgit_print_summary();
5
6#endif /* UI_SUMMARY_H */
diff --git a/ui-tag.h b/ui-tag.h new file mode 100644 index 0000000..d295cdc --- /dev/null +++ b/ui-tag.h
@@ -0,0 +1,6 @@
1#ifndef UI_TAG_H
2#define UI_TAG_H
3
4extern void cgit_print_tag(char *revname);
5
6#endif /* UI_TAG_H */
diff --git a/ui-tree.h b/ui-tree.h new file mode 100644 index 0000000..bbd34e3 --- /dev/null +++ b/ui-tree.h
@@ -0,0 +1,6 @@
1#ifndef UI_TREE_H
2#define UI_TREE_H
3
4extern void cgit_print_tree(const char *rev, char *path);
5
6#endif /* UI_TREE_H */
© 2022 C. Duckworth. generated by cgit. comments, issues, and patches welcome at < git at acdw dot net >.