|
diff --git a/ui-refs.c b/ui-refs.c index 98738db..94ff6be 100644 --- a/ ui-refs.c+++ b/ ui-refs.c |
|
@@ -13,129 +13,129 @@ |
13 | static int header; |
13 | static int header; |
14 | |
14 | |
15 | static int cmp_age(int age1, int age2) |
15 | static int cmp_age(int age1, int age2) |
16 | { |
16 | { |
17 | if (age1 != 0 && age2 != 0) |
17 | if (age1 != 0 && age2 != 0) |
18 | return age2 - age1; |
18 | return age2 - age1; |
19 | |
19 | |
20 | if (age1 == 0 && age2 == 0) |
20 | if (age1 == 0 && age2 == 0) |
21 | return 0; |
21 | return 0; |
22 | |
22 | |
23 | if (age1 == 0) |
23 | if (age1 == 0) |
24 | return +1; |
24 | return +1; |
25 | |
25 | |
26 | return -1; |
26 | return -1; |
27 | } |
27 | } |
28 | |
28 | |
29 | static int cmp_ref_name(const void *a, const void *b) |
29 | static int cmp_ref_name(const void *a, const void *b) |
30 | { |
30 | { |
31 | struct refinfo *r1 = *(struct refinfo **)a; |
31 | struct refinfo *r1 = *(struct refinfo **)a; |
32 | struct refinfo *r2 = *(struct refinfo **)b; |
32 | struct refinfo *r2 = *(struct refinfo **)b; |
33 | |
33 | |
34 | return strcmp(r1->refname, r2->refname); |
34 | return strcmp(r1->refname, r2->refname); |
35 | } |
35 | } |
36 | |
36 | |
37 | static int cmp_branch_age(const void *a, const void *b) |
37 | static int cmp_branch_age(const void *a, const void *b) |
38 | { |
38 | { |
39 | struct refinfo *r1 = *(struct refinfo **)a; |
39 | struct refinfo *r1 = *(struct refinfo **)a; |
40 | struct refinfo *r2 = *(struct refinfo **)b; |
40 | struct refinfo *r2 = *(struct refinfo **)b; |
41 | |
41 | |
42 | return cmp_age(r1->commit->committer_date, r2->commit->committer_date); |
42 | return cmp_age(r1->commit->committer_date, r2->commit->committer_date); |
43 | } |
43 | } |
44 | |
44 | |
45 | static int cmp_tag_age(const void *a, const void *b) |
45 | static int cmp_tag_age(const void *a, const void *b) |
46 | { |
46 | { |
47 | struct refinfo *r1 = *(struct refinfo **)a; |
47 | struct refinfo *r1 = *(struct refinfo **)a; |
48 | struct refinfo *r2 = *(struct refinfo **)b; |
48 | struct refinfo *r2 = *(struct refinfo **)b; |
49 | int r1date, r2date; |
49 | int r1date, r2date; |
50 | |
50 | |
51 | if (r1->object->type != OBJ_COMMIT) |
51 | if (r1->object->type != OBJ_COMMIT) |
52 | r1date = r1->tag->tagger_date; |
52 | r1date = r1->tag->tagger_date; |
53 | else |
53 | else |
54 | r1date = r1->commit->committer_date; |
54 | r1date = r1->commit->committer_date; |
55 | |
55 | |
56 | if (r2->object->type != OBJ_COMMIT) |
56 | if (r2->object->type != OBJ_COMMIT) |
57 | r2date = r2->tag->tagger_date; |
57 | r2date = r2->tag->tagger_date; |
58 | else |
58 | else |
59 | r2date = r2->commit->committer_date; |
59 | r2date = r2->commit->committer_date; |
60 | |
60 | |
61 | return cmp_age(r1date, r2date); |
61 | return cmp_age(r1date, r2date); |
62 | } |
62 | } |
63 | |
63 | |
64 | static int print_branch(struct refinfo *ref) |
64 | static int print_branch(struct refinfo *ref) |
65 | { |
65 | { |
66 | struct commitinfo *info = ref->commit; |
66 | struct commitinfo *info = ref->commit; |
67 | char *name = (char *)ref->refname; |
67 | char *name = (char *)ref->refname; |
68 | |
68 | |
69 | if (!info) |
69 | if (!info) |
70 | return 1; |
70 | return 1; |
71 | html("<tr><td>"); |
71 | html("<tr><td>"); |
72 | cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL, |
72 | cgit_log_link(name, NULL, NULL, name, NULL, NULL, 0, NULL, NULL, |
73 | ctx.qry.showmsg); |
73 | ctx.qry.showmsg); |
74 | html("</td><td>"); |
74 | html("</td><td>"); |
75 | |
75 | |
76 | if (ref->object->type == OBJ_COMMIT) { |
76 | if (ref->object->type == OBJ_COMMIT) { |
77 | cgit_commit_link(info->subject, NULL, NULL, name, NULL, 0); |
77 | cgit_commit_link(info->subject, NULL, NULL, name, NULL, NULL, 0); |
78 | html("</td><td>"); |
78 | html("</td><td>"); |
79 | html_txt(info->author); |
79 | html_txt(info->author); |
80 | html("</td><td colspan='2'>"); |
80 | html("</td><td colspan='2'>"); |
81 | cgit_print_age(info->commit->date, -1, NULL); |
81 | cgit_print_age(info->commit->date, -1, NULL); |
82 | } else { |
82 | } else { |
83 | html("</td><td></td><td>"); |
83 | html("</td><td></td><td>"); |
84 | cgit_object_link(ref->object); |
84 | cgit_object_link(ref->object); |
85 | } |
85 | } |
86 | html("</td></tr>\n"); |
86 | html("</td></tr>\n"); |
87 | return 0; |
87 | return 0; |
88 | } |
88 | } |
89 | |
89 | |
90 | static void print_tag_header() |
90 | static void print_tag_header() |
91 | { |
91 | { |
92 | html("<tr class='nohover'><th class='left'>Tag</th>" |
92 | html("<tr class='nohover'><th class='left'>Tag</th>" |
93 | "<th class='left'>Download</th>" |
93 | "<th class='left'>Download</th>" |
94 | "<th class='left'>Author</th>" |
94 | "<th class='left'>Author</th>" |
95 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
95 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
96 | header = 1; |
96 | header = 1; |
97 | } |
97 | } |
98 | |
98 | |
99 | static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) |
99 | static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) |
100 | { |
100 | { |
101 | const struct cgit_snapshot_format* f; |
101 | const struct cgit_snapshot_format* f; |
102 | char *filename; |
102 | char *filename; |
103 | const char *basename; |
103 | const char *basename; |
104 | |
104 | |
105 | if (!ref || strlen(ref) < 2) |
105 | if (!ref || strlen(ref) < 2) |
106 | return; |
106 | return; |
107 | |
107 | |
108 | basename = cgit_repobasename(repo->url); |
108 | basename = cgit_repobasename(repo->url); |
109 | if (prefixcmp(ref, basename) != 0) { |
109 | if (prefixcmp(ref, basename) != 0) { |
110 | if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) |
110 | if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) |
111 | ref++; |
111 | ref++; |
112 | if (isdigit(ref[0])) |
112 | if (isdigit(ref[0])) |
113 | ref = xstrdup(fmt("%s-%s", basename, ref)); |
113 | ref = xstrdup(fmt("%s-%s", basename, ref)); |
114 | } |
114 | } |
115 | |
115 | |
116 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
116 | for (f = cgit_snapshot_formats; f->suffix; f++) { |
117 | if (!(repo->snapshots & f->bit)) |
117 | if (!(repo->snapshots & f->bit)) |
118 | continue; |
118 | continue; |
119 | filename = fmt("%s%s", ref, f->suffix); |
119 | filename = fmt("%s%s", ref, f->suffix); |
120 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
120 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |
121 | html(" "); |
121 | html(" "); |
122 | } |
122 | } |
123 | } |
123 | } |
124 | static int print_tag(struct refinfo *ref) |
124 | static int print_tag(struct refinfo *ref) |
125 | { |
125 | { |
126 | struct tag *tag; |
126 | struct tag *tag; |
127 | struct taginfo *info; |
127 | struct taginfo *info; |
128 | char *name = (char *)ref->refname; |
128 | char *name = (char *)ref->refname; |
129 | |
129 | |
130 | if (ref->object->type == OBJ_TAG) { |
130 | if (ref->object->type == OBJ_TAG) { |
131 | tag = (struct tag *)ref->object; |
131 | tag = (struct tag *)ref->object; |
132 | info = ref->tag; |
132 | info = ref->tag; |
133 | if (!tag || !info) |
133 | if (!tag || !info) |
134 | return 1; |
134 | return 1; |
135 | html("<tr><td>"); |
135 | html("<tr><td>"); |
136 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
136 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
137 | html("</td><td>"); |
137 | html("</td><td>"); |
138 | if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) |
138 | if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) |
139 | print_tag_downloads(ctx.repo, name); |
139 | print_tag_downloads(ctx.repo, name); |
140 | else |
140 | else |
141 | cgit_object_link(tag->tagged); |
141 | cgit_object_link(tag->tagged); |
|