diff options
author | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 19:34:48 (JST) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-12-06 19:34:48 (JST) |
commit | e550440233875b298f8574e9273457516791010f (patch) | |
tree | 37464c686f1f2d8c5ba513c7dca5daa886dc81a6 /ui-refs.c | |
parent | 3157ea3b7e5204dba2892ffb54d641746c4c7ca4 (diff) | |
parent | c57aceb1d2f1a7d9fd3218fc8c6e9ea01b2952d2 (diff) | |
download | cgit-e550440233875b298f8574e9273457516791010f.zip cgit-e550440233875b298f8574e9273457516791010f.tar.gz |
Merge branch 'snapshot-fixes'
Diffstat (limited to 'ui-refs.c')
-rw-r--r-- | ui-refs.c | 37 |
1 files changed, 34 insertions, 3 deletions
@@ -78,12 +78,37 @@ static int print_branch(struct refinfo *ref) | |||
78 | static void print_tag_header() | 78 | static void print_tag_header() |
79 | { | 79 | { |
80 | html("<tr class='nohover'><th class='left'>Tag</th>" | 80 | html("<tr class='nohover'><th class='left'>Tag</th>" |
81 | "<th class='left'>Reference</th>" | 81 | "<th class='left'>Download</th>" |
82 | "<th class='left'>Author</th>" | 82 | "<th class='left'>Author</th>" |
83 | "<th class='left' colspan='2'>Age</th></tr>\n"); | 83 | "<th class='left' colspan='2'>Age</th></tr>\n"); |
84 | header = 1; | 84 | header = 1; |
85 | } | 85 | } |
86 | 86 | ||
87 | static void print_tag_downloads(const struct cgit_repo *repo, const char *ref) | ||
88 | { | ||
89 | const struct cgit_snapshot_format* f; | ||
90 | char *filename; | ||
91 | const char *basename; | ||
92 | |||
93 | if (!ref || strlen(ref) < 2) | ||
94 | return; | ||
95 | |||
96 | basename = cgit_repobasename(repo->url); | ||
97 | if (prefixcmp(ref, basename) != 0) { | ||
98 | if ((ref[0] == 'v' || ref[0] == 'V') && isdigit(ref[1])) | ||
99 | ref++; | ||
100 | if (isdigit(ref[0])) | ||
101 | ref = xstrdup(fmt("%s-%s", basename, ref)); | ||
102 | } | ||
103 | |||
104 | for (f = cgit_snapshot_formats; f->suffix; f++) { | ||
105 | if (!(repo->snapshots & f->bit)) | ||
106 | continue; | ||
107 | filename = fmt("%s%s", ref, f->suffix); | ||
108 | cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); | ||
109 | html(" "); | ||
110 | } | ||
111 | } | ||
87 | static int print_tag(struct refinfo *ref) | 112 | static int print_tag(struct refinfo *ref) |
88 | { | 113 | { |
89 | struct tag *tag; | 114 | struct tag *tag; |
@@ -98,7 +123,10 @@ static int print_tag(struct refinfo *ref) | |||
98 | html("<tr><td>"); | 123 | html("<tr><td>"); |
99 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); | 124 | cgit_tag_link(name, NULL, NULL, ctx.qry.head, name); |
100 | html("</td><td>"); | 125 | html("</td><td>"); |
101 | cgit_object_link(tag->tagged); | 126 | if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) |
127 | print_tag_downloads(ctx.repo, name); | ||
128 | else | ||
129 | cgit_object_link(tag->tagged); | ||
102 | html("</td><td>"); | 130 | html("</td><td>"); |
103 | if (info->tagger) | 131 | if (info->tagger) |
104 | html(info->tagger); | 132 | html(info->tagger); |
@@ -112,7 +140,10 @@ static int print_tag(struct refinfo *ref) | |||
112 | html("<tr><td>"); | 140 | html("<tr><td>"); |
113 | html_txt(name); | 141 | html_txt(name); |
114 | html("</td><td>"); | 142 | html("</td><td>"); |
115 | cgit_object_link(ref->object); | 143 | if (ctx.repo->snapshots && (tag->tagged->type == OBJ_COMMIT)) |
144 | print_tag_downloads(ctx.repo, name); | ||
145 | else | ||
146 | cgit_object_link(ref->object); | ||
116 | html("</td></tr>\n"); | 147 | html("</td></tr>\n"); |
117 | } | 148 | } |
118 | return 0; | 149 | return 0; |