summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2007-07-22 22:46:15 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2007-07-22 22:47:18 (UTC)
commitf405d0bf75427c627778027e9900359335d6774e (patch) (unidiff)
tree2db75faf97df382edc7667cd8cd06e833361a937
parenteb45342e735818b3c68cbab9b61b23e79ae74418 (diff)
downloadcgit-f405d0bf75427c627778027e9900359335d6774e.zip
cgit-f405d0bf75427c627778027e9900359335d6774e.tar.gz
cgit-f405d0bf75427c627778027e9900359335d6774e.tar.bz2
Add support for line number in url fragment
With this change, urls like http://hjemli.net/git/cgit/tree/ui-tree.c#43 can be used to jump directly to the specified line number. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--cgit.css9
-rw-r--r--ui-tree.c2
2 files changed, 10 insertions, 1 deletions
diff --git a/cgit.css b/cgit.css
index 43a40a3..54bbfcc 100644
--- a/cgit.css
+++ b/cgit.css
@@ -183,64 +183,73 @@ div.error {
183 font-weight: bold; 183 font-weight: bold;
184 margin: 1em 2em; 184 margin: 1em 2em;
185} 185}
186 186
187a.ls-blob, a.ls-dir, a.ls-mod { 187a.ls-blob, a.ls-dir, a.ls-mod {
188 font-family: monospace; 188 font-family: monospace;
189} 189}
190 190
191td.ls-size { 191td.ls-size {
192 text-align: right; 192 text-align: right;
193} 193}
194 194
195td.ls-size { 195td.ls-size {
196 font-family: monospace; 196 font-family: monospace;
197} 197}
198 198
199td.ls-mode { 199td.ls-mode {
200 font-family: monospace; 200 font-family: monospace;
201} 201}
202 202
203table.blob { 203table.blob {
204 margin-top: 0.5em; 204 margin-top: 0.5em;
205 border-top: solid 1px black; 205 border-top: solid 1px black;
206} 206}
207 207
208table.blob td.no { 208table.blob td.no {
209 border-right: solid 1px black; 209 border-right: solid 1px black;
210 color: black; 210 color: black;
211 background-color: #eee; 211 background-color: #eee;
212 text-align: right; 212 text-align: right;
213} 213}
214 214
215table.blob td.no a {
216 color: black;
217}
218
219table.blob td.no a:hover {
220 color: black;
221 text-decoration: none;
222}
223
215table.blob td.txt { 224table.blob td.txt {
216 white-space: pre; 225 white-space: pre;
217 font-family: monospace; 226 font-family: monospace;
218 padding-left: 0.5em; 227 padding-left: 0.5em;
219} 228}
220 229
221table.nowrap td { 230table.nowrap td {
222 white-space: nowrap; 231 white-space: nowrap;
223} 232}
224 233
225table.commit-info { 234table.commit-info {
226 border-collapse: collapse; 235 border-collapse: collapse;
227 margin-top: 1.5em; 236 margin-top: 1.5em;
228} 237}
229 238
230table.commit-info th { 239table.commit-info th {
231 text-align: left; 240 text-align: left;
232 font-weight: normal; 241 font-weight: normal;
233 padding: 0.1em 1em 0.1em 0.1em; 242 padding: 0.1em 1em 0.1em 0.1em;
234 vertical-align: top; 243 vertical-align: top;
235} 244}
236 245
237table.commit-info td { 246table.commit-info td {
238 font-weight: normal; 247 font-weight: normal;
239 padding: 0.1em 1em 0.1em 0.1em; 248 padding: 0.1em 1em 0.1em 0.1em;
240} 249}
241 250
242div.commit-subject { 251div.commit-subject {
243 font-weight: bold; 252 font-weight: bold;
244 font-size: 125%; 253 font-size: 125%;
245 margin: 1.5em 0em 0.5em 0em; 254 margin: 1.5em 0em 0.5em 0em;
246 padding: 0em; 255 padding: 0em;
diff --git a/ui-tree.c b/ui-tree.c
index 75ce449..634132f 100644
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -14,65 +14,65 @@ int header = 0;
14 14
15static void print_object(const unsigned char *sha1, char *path) 15static void print_object(const unsigned char *sha1, char *path)
16{ 16{
17 enum object_type type; 17 enum object_type type;
18 unsigned char *buf; 18 unsigned char *buf;
19 unsigned long size, lineno, start, idx; 19 unsigned long size, lineno, start, idx;
20 20
21 type = sha1_object_info(sha1, &size); 21 type = sha1_object_info(sha1, &size);
22 if (type == OBJ_BAD) { 22 if (type == OBJ_BAD) {
23 cgit_print_error(fmt("Bad object name: %s", 23 cgit_print_error(fmt("Bad object name: %s",
24 sha1_to_hex(sha1))); 24 sha1_to_hex(sha1)));
25 return; 25 return;
26 } 26 }
27 27
28 buf = read_sha1_file(sha1, &type, &size); 28 buf = read_sha1_file(sha1, &type, &size);
29 if (!buf) { 29 if (!buf) {
30 cgit_print_error(fmt("Error reading object %s", 30 cgit_print_error(fmt("Error reading object %s",
31 sha1_to_hex(sha1))); 31 sha1_to_hex(sha1)));
32 return; 32 return;
33 } 33 }
34 34
35 html(" blob: <a href='"); 35 html(" blob: <a href='");
36 html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1)))); 36 html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
37 htmlf("'>%s</a>",sha1_to_hex(sha1)); 37 htmlf("'>%s</a>",sha1_to_hex(sha1));
38 38
39 html("<table class='blob'>\n"); 39 html("<table class='blob'>\n");
40 idx = 0; 40 idx = 0;
41 start = 0; 41 start = 0;
42 lineno = 0; 42 lineno = 0;
43 while(idx < size) { 43 while(idx < size) {
44 if (buf[idx] == '\n') { 44 if (buf[idx] == '\n') {
45 buf[idx] = '\0'; 45 buf[idx] = '\0';
46 htmlf("<tr><td class='no'>%d</td><td class='txt'>", 46 htmlf("<tr><td class='no'><a name='%d'>%1$d</a></td><td class='txt'>",
47 ++lineno); 47 ++lineno);
48 html_txt(buf + start); 48 html_txt(buf + start);
49 html("</td></tr>\n"); 49 html("</td></tr>\n");
50 start = idx + 1; 50 start = idx + 1;
51 } 51 }
52 idx++; 52 idx++;
53 } 53 }
54 html("</table>\n"); 54 html("</table>\n");
55} 55}
56 56
57 57
58static int ls_item(const unsigned char *sha1, const char *base, int baselen, 58static int ls_item(const unsigned char *sha1, const char *base, int baselen,
59 const char *pathname, unsigned int mode, int stage) 59 const char *pathname, unsigned int mode, int stage)
60{ 60{
61 char *name; 61 char *name;
62 char *fullpath; 62 char *fullpath;
63 enum object_type type; 63 enum object_type type;
64 unsigned long size = 0; 64 unsigned long size = 0;
65 65
66 name = xstrdup(pathname); 66 name = xstrdup(pathname);
67 fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "", 67 fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
68 cgit_query_path ? "/" : "", name); 68 cgit_query_path ? "/" : "", name);
69 69
70 type = sha1_object_info(sha1, &size); 70 type = sha1_object_info(sha1, &size);
71 if (type == OBJ_BAD && !S_ISDIRLNK(mode)) { 71 if (type == OBJ_BAD && !S_ISDIRLNK(mode)) {
72 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>", 72 htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
73 name, 73 name,
74 sha1_to_hex(sha1)); 74 sha1_to_hex(sha1));
75 return 0; 75 return 0;
76 } 76 }
77 77
78 html("<tr><td class='ls-mode'>"); 78 html("<tr><td class='ls-mode'>");