author | Lars Hjemli <hjemli@gmail.com> | 2008-10-11 18:09:42 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-10-11 18:09:42 (UTC) |
commit | ed7ff095ca467cdc4c8a1a1459847d68e50c9b91 (patch) (unidiff) | |
tree | 4ed7425520cb76eff0a4e7756869620b2562b6c9 /cmd.c | |
parent | 5632ba35d133ee29d46c031cdd4b4a37097b8ca1 (diff) | |
download | cgit-ed7ff095ca467cdc4c8a1a1459847d68e50c9b91.zip cgit-ed7ff095ca467cdc4c8a1a1459847d68e50c9b91.tar.gz cgit-ed7ff095ca467cdc4c8a1a1459847d68e50c9b91.tar.bz2 |
ui-snapshot: add dwimmery
When downloading a snapshot, the snapshot name will often contain the repo
name combined with a tag. This patch tries to exploit this so that the
correct revision is downloaded even if no specific revision is specified.
PS: this only occurs if neither 'h' nor 'id' is specified in the query-
string.
PPS: this also fixes a bug which occurs when trying to download a filename
with an unsupported suffix: it used to try to print an error message to
the user but failed since it didn't prepare the output properly.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1,165 +1,165 @@ | |||
1 | /* cmd.c: the cgit command dispatcher | 1 | /* cmd.c: the cgit command dispatcher |
2 | * | 2 | * |
3 | * Copyright (C) 2008 Lars Hjemli | 3 | * Copyright (C) 2008 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | #include "cmd.h" | 10 | #include "cmd.h" |
11 | #include "cache.h" | 11 | #include "cache.h" |
12 | #include "ui-shared.h" | 12 | #include "ui-shared.h" |
13 | #include "ui-atom.h" | 13 | #include "ui-atom.h" |
14 | #include "ui-blob.h" | 14 | #include "ui-blob.h" |
15 | #include "ui-clone.h" | 15 | #include "ui-clone.h" |
16 | #include "ui-commit.h" | 16 | #include "ui-commit.h" |
17 | #include "ui-diff.h" | 17 | #include "ui-diff.h" |
18 | #include "ui-log.h" | 18 | #include "ui-log.h" |
19 | #include "ui-patch.h" | 19 | #include "ui-patch.h" |
20 | #include "ui-plain.h" | 20 | #include "ui-plain.h" |
21 | #include "ui-refs.h" | 21 | #include "ui-refs.h" |
22 | #include "ui-repolist.h" | 22 | #include "ui-repolist.h" |
23 | #include "ui-snapshot.h" | 23 | #include "ui-snapshot.h" |
24 | #include "ui-summary.h" | 24 | #include "ui-summary.h" |
25 | #include "ui-tag.h" | 25 | #include "ui-tag.h" |
26 | #include "ui-tree.h" | 26 | #include "ui-tree.h" |
27 | 27 | ||
28 | static void HEAD_fn(struct cgit_context *ctx) | 28 | static void HEAD_fn(struct cgit_context *ctx) |
29 | { | 29 | { |
30 | cgit_clone_head(ctx); | 30 | cgit_clone_head(ctx); |
31 | } | 31 | } |
32 | 32 | ||
33 | static void atom_fn(struct cgit_context *ctx) | 33 | static void atom_fn(struct cgit_context *ctx) |
34 | { | 34 | { |
35 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); | 35 | cgit_print_atom(ctx->qry.head, ctx->qry.path, 10); |
36 | } | 36 | } |
37 | 37 | ||
38 | static void about_fn(struct cgit_context *ctx) | 38 | static void about_fn(struct cgit_context *ctx) |
39 | { | 39 | { |
40 | if (ctx->repo) | 40 | if (ctx->repo) |
41 | cgit_print_repo_readme(); | 41 | cgit_print_repo_readme(); |
42 | else | 42 | else |
43 | cgit_print_site_readme(); | 43 | cgit_print_site_readme(); |
44 | } | 44 | } |
45 | 45 | ||
46 | static void blob_fn(struct cgit_context *ctx) | 46 | static void blob_fn(struct cgit_context *ctx) |
47 | { | 47 | { |
48 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); | 48 | cgit_print_blob(ctx->qry.sha1, ctx->qry.path, ctx->qry.head); |
49 | } | 49 | } |
50 | 50 | ||
51 | static void commit_fn(struct cgit_context *ctx) | 51 | static void commit_fn(struct cgit_context *ctx) |
52 | { | 52 | { |
53 | cgit_print_commit(ctx->qry.sha1); | 53 | cgit_print_commit(ctx->qry.sha1); |
54 | } | 54 | } |
55 | 55 | ||
56 | static void diff_fn(struct cgit_context *ctx) | 56 | static void diff_fn(struct cgit_context *ctx) |
57 | { | 57 | { |
58 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); | 58 | cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path); |
59 | } | 59 | } |
60 | 60 | ||
61 | static void info_fn(struct cgit_context *ctx) | 61 | static void info_fn(struct cgit_context *ctx) |
62 | { | 62 | { |
63 | cgit_clone_info(ctx); | 63 | cgit_clone_info(ctx); |
64 | } | 64 | } |
65 | 65 | ||
66 | static void log_fn(struct cgit_context *ctx) | 66 | static void log_fn(struct cgit_context *ctx) |
67 | { | 67 | { |
68 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, | 68 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, |
69 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); | 69 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); |
70 | } | 70 | } |
71 | 71 | ||
72 | static void ls_cache_fn(struct cgit_context *ctx) | 72 | static void ls_cache_fn(struct cgit_context *ctx) |
73 | { | 73 | { |
74 | ctx->page.mimetype = "text/plain"; | 74 | ctx->page.mimetype = "text/plain"; |
75 | ctx->page.filename = "ls-cache.txt"; | 75 | ctx->page.filename = "ls-cache.txt"; |
76 | cgit_print_http_headers(ctx); | 76 | cgit_print_http_headers(ctx); |
77 | cache_ls(ctx->cfg.cache_root); | 77 | cache_ls(ctx->cfg.cache_root); |
78 | } | 78 | } |
79 | 79 | ||
80 | static void objects_fn(struct cgit_context *ctx) | 80 | static void objects_fn(struct cgit_context *ctx) |
81 | { | 81 | { |
82 | cgit_clone_objects(ctx); | 82 | cgit_clone_objects(ctx); |
83 | } | 83 | } |
84 | 84 | ||
85 | static void repolist_fn(struct cgit_context *ctx) | 85 | static void repolist_fn(struct cgit_context *ctx) |
86 | { | 86 | { |
87 | cgit_print_repolist(); | 87 | cgit_print_repolist(); |
88 | } | 88 | } |
89 | 89 | ||
90 | static void patch_fn(struct cgit_context *ctx) | 90 | static void patch_fn(struct cgit_context *ctx) |
91 | { | 91 | { |
92 | cgit_print_patch(ctx->qry.sha1); | 92 | cgit_print_patch(ctx->qry.sha1); |
93 | } | 93 | } |
94 | 94 | ||
95 | static void plain_fn(struct cgit_context *ctx) | 95 | static void plain_fn(struct cgit_context *ctx) |
96 | { | 96 | { |
97 | cgit_print_plain(ctx); | 97 | cgit_print_plain(ctx); |
98 | } | 98 | } |
99 | 99 | ||
100 | static void refs_fn(struct cgit_context *ctx) | 100 | static void refs_fn(struct cgit_context *ctx) |
101 | { | 101 | { |
102 | cgit_print_refs(); | 102 | cgit_print_refs(); |
103 | } | 103 | } |
104 | 104 | ||
105 | static void snapshot_fn(struct cgit_context *ctx) | 105 | static void snapshot_fn(struct cgit_context *ctx) |
106 | { | 106 | { |
107 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, | 107 | cgit_print_snapshot(ctx->qry.head, ctx->qry.sha1, |
108 | cgit_repobasename(ctx->repo->url), ctx->qry.path, | 108 | cgit_repobasename(ctx->repo->url), ctx->qry.path, |
109 | ctx->repo->snapshots); | 109 | ctx->repo->snapshots, ctx->qry.nohead); |
110 | } | 110 | } |
111 | 111 | ||
112 | static void summary_fn(struct cgit_context *ctx) | 112 | static void summary_fn(struct cgit_context *ctx) |
113 | { | 113 | { |
114 | cgit_print_summary(); | 114 | cgit_print_summary(); |
115 | } | 115 | } |
116 | 116 | ||
117 | static void tag_fn(struct cgit_context *ctx) | 117 | static void tag_fn(struct cgit_context *ctx) |
118 | { | 118 | { |
119 | cgit_print_tag(ctx->qry.sha1); | 119 | cgit_print_tag(ctx->qry.sha1); |
120 | } | 120 | } |
121 | 121 | ||
122 | static void tree_fn(struct cgit_context *ctx) | 122 | static void tree_fn(struct cgit_context *ctx) |
123 | { | 123 | { |
124 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); | 124 | cgit_print_tree(ctx->qry.sha1, ctx->qry.path); |
125 | } | 125 | } |
126 | 126 | ||
127 | #define def_cmd(name, want_repo, want_layout) \ | 127 | #define def_cmd(name, want_repo, want_layout) \ |
128 | {#name, name##_fn, want_repo, want_layout} | 128 | {#name, name##_fn, want_repo, want_layout} |
129 | 129 | ||
130 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) | 130 | struct cgit_cmd *cgit_get_cmd(struct cgit_context *ctx) |
131 | { | 131 | { |
132 | static struct cgit_cmd cmds[] = { | 132 | static struct cgit_cmd cmds[] = { |
133 | def_cmd(HEAD, 1, 0), | 133 | def_cmd(HEAD, 1, 0), |
134 | def_cmd(atom, 1, 0), | 134 | def_cmd(atom, 1, 0), |
135 | def_cmd(about, 0, 1), | 135 | def_cmd(about, 0, 1), |
136 | def_cmd(blob, 1, 0), | 136 | def_cmd(blob, 1, 0), |
137 | def_cmd(commit, 1, 1), | 137 | def_cmd(commit, 1, 1), |
138 | def_cmd(diff, 1, 1), | 138 | def_cmd(diff, 1, 1), |
139 | def_cmd(info, 1, 0), | 139 | def_cmd(info, 1, 0), |
140 | def_cmd(log, 1, 1), | 140 | def_cmd(log, 1, 1), |
141 | def_cmd(ls_cache, 0, 0), | 141 | def_cmd(ls_cache, 0, 0), |
142 | def_cmd(objects, 1, 0), | 142 | def_cmd(objects, 1, 0), |
143 | def_cmd(patch, 1, 0), | 143 | def_cmd(patch, 1, 0), |
144 | def_cmd(plain, 1, 0), | 144 | def_cmd(plain, 1, 0), |
145 | def_cmd(refs, 1, 1), | 145 | def_cmd(refs, 1, 1), |
146 | def_cmd(repolist, 0, 0), | 146 | def_cmd(repolist, 0, 0), |
147 | def_cmd(snapshot, 1, 0), | 147 | def_cmd(snapshot, 1, 0), |
148 | def_cmd(summary, 1, 1), | 148 | def_cmd(summary, 1, 1), |
149 | def_cmd(tag, 1, 1), | 149 | def_cmd(tag, 1, 1), |
150 | def_cmd(tree, 1, 1), | 150 | def_cmd(tree, 1, 1), |
151 | }; | 151 | }; |
152 | int i; | 152 | int i; |
153 | 153 | ||
154 | if (ctx->qry.page == NULL) { | 154 | if (ctx->qry.page == NULL) { |
155 | if (ctx->repo) | 155 | if (ctx->repo) |
156 | ctx->qry.page = "summary"; | 156 | ctx->qry.page = "summary"; |
157 | else | 157 | else |
158 | ctx->qry.page = "repolist"; | 158 | ctx->qry.page = "repolist"; |
159 | } | 159 | } |
160 | 160 | ||
161 | for(i = 0; i < sizeof(cmds)/sizeof(*cmds); i++) | 161 | for(i = 0; i < sizeof(cmds)/sizeof(*cmds); i++) |
162 | if (!strcmp(ctx->qry.page, cmds[i].name)) | 162 | if (!strcmp(ctx->qry.page, cmds[i].name)) |
163 | return &cmds[i]; | 163 | return &cmds[i]; |
164 | return NULL; | 164 | return NULL; |
165 | } | 165 | } |