summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2006-12-16 18:35:31 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2006-12-16 20:02:02 (UTC)
commit9c5229ea394808f90433ee84439503bee124e1de (patch) (unidiff)
treee43a0a6336bd7c66891ba64da90319c2e866714b
parentaaa24bdd30303128bded8487cd9f63b54c3b8dcd (diff)
downloadcgit-9c5229ea394808f90433ee84439503bee124e1de.zip
cgit-9c5229ea394808f90433ee84439503bee124e1de.tar.gz
cgit-9c5229ea394808f90433ee84439503bee124e1de.tar.bz2
Reformat code to avoid excessive line lengths
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-commit.c17
-rw-r--r--ui-log.c4
-rw-r--r--ui-summary.c8
3 files changed, 18 insertions, 11 deletions
diff --git a/ui-commit.c b/ui-commit.c
index f654208..8916212 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -4,62 +4,63 @@
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 10
11void cgit_print_commit(const char *hex) 11void cgit_print_commit(const char *hex)
12{ 12{
13 struct commit *commit; 13 struct commit *commit;
14 struct commitinfo *info; 14 struct commitinfo *info;
15 struct commit_list *p; 15 struct commit_list *p;
16
17 unsigned char sha1[20]; 16 unsigned char sha1[20];
17 char *query;
18 18
19 if (get_sha1(hex, sha1)) { 19 if (get_sha1(hex, sha1)) {
20 cgit_print_error(fmt("Bad object id: %s", hex)); 20 cgit_print_error(fmt("Bad object id: %s", hex));
21 return; 21 return;
22 } 22 }
23
24 commit = lookup_commit_reference(sha1); 23 commit = lookup_commit_reference(sha1);
25 if (!commit) { 24 if (!commit) {
26 cgit_print_error(fmt("Bad commit reference: %s", hex)); 25 cgit_print_error(fmt("Bad commit reference: %s", hex));
27 return; 26 return;
28 } 27 }
29
30 info = cgit_parse_commit(commit); 28 info = cgit_parse_commit(commit);
31 29
32 html("<table class='commit-info'>\n"); 30 html("<table class='commit-info'>\n");
33 html("<tr><th>author</th><td>"); 31 html("<tr><th>author</th><td>");
34 html_txt(info->author); 32 html_txt(info->author);
35 html(" "); 33 html(" ");
36 html_txt(info->author_email); 34 html_txt(info->author_email);
37 html("</td><td class='right'>"); 35 html("</td><td class='right'>");
38 cgit_print_date(info->author_date); 36 cgit_print_date(info->author_date);
39 html("</td></tr>\n"); 37 html("</td></tr>\n");
40 html("<tr><th>committer</th><td>"); 38 html("<tr><th>committer</th><td>");
41 html_txt(info->committer); 39 html_txt(info->committer);
42 html(" "); 40 html(" ");
43 html_txt(info->committer_email); 41 html_txt(info->committer_email);
44 html("</td><td class='right'>"); 42 html("</td><td class='right'>");
45 cgit_print_date(info->committer_date); 43 cgit_print_date(info->committer_date);
46 html("</td></tr>\n"); 44 html("</td></tr>\n");
47 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='"); 45 html("<tr><th>tree</th><td colspan='2' class='sha1'><a href='");
48 html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("id=%s", sha1_to_hex(commit->tree->object.sha1)))); 46 query = fmt("id=%s", sha1_to_hex(commit->tree->object.sha1));
47 html_attr(cgit_pageurl(cgit_query_repo, "tree", query));
49 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1)); 48 htmlf("'>%s</a></td></tr>\n", sha1_to_hex(commit->tree->object.sha1));
50 49 for (p = commit->parents; p ; p = p->next) {
51 for (p = commit->parents; p ; p = p->next) { 50 html("<tr><th>parent</th>"
52 html("<tr><th>parent</th><td colspan='2' class='sha1'><a href='"); 51 "<td colspan='2' class='sha1'>"
53 html_attr(cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(p->item->object.sha1)))); 52 "<a href='");
53 query = fmt("id=%s", sha1_to_hex(p->item->object.sha1));
54 html_attr(cgit_pageurl(cgit_query_repo, "commit", query));
54 htmlf("'>%s</a></td></tr>\n", 55 htmlf("'>%s</a></td></tr>\n",
55 sha1_to_hex(p->item->object.sha1)); 56 sha1_to_hex(p->item->object.sha1));
56 } 57 }
57 html("</table>\n"); 58 html("</table>\n");
58 html("<div class='commit-subject'>"); 59 html("<div class='commit-subject'>");
59 html_txt(info->subject); 60 html_txt(info->subject);
60 html("</div>"); 61 html("</div>");
61 html("<div class='commit-msg'>"); 62 html("<div class='commit-msg'>");
62 html_txt(info->msg); 63 html_txt(info->msg);
63 html("</div>"); 64 html("</div>");
64 cgit_free_commitinfo(info); 65 cgit_free_commitinfo(info);
65} 66}
diff --git a/ui-log.c b/ui-log.c
index b7da49f..def96f6 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -40,25 +40,27 @@ void cgit_print_log(const char *tip, int ofs, int cnt)
40 int i; 40 int i;
41 41
42 init_revisions(&rev, NULL); 42 init_revisions(&rev, NULL);
43 rev.abbrev = DEFAULT_ABBREV; 43 rev.abbrev = DEFAULT_ABBREV;
44 rev.commit_format = CMIT_FMT_DEFAULT; 44 rev.commit_format = CMIT_FMT_DEFAULT;
45 rev.verbose_header = 1; 45 rev.verbose_header = 1;
46 rev.show_root_diff = 0; 46 rev.show_root_diff = 0;
47 setup_revisions(2, argv, &rev, NULL); 47 setup_revisions(2, argv, &rev, NULL);
48 prepare_revision_walk(&rev); 48 prepare_revision_walk(&rev);
49 49
50 html("<h2>Log</h2>"); 50 html("<h2>Log</h2>");
51 html("<table class='list log'>"); 51 html("<table class='list log'>");
52 html("<tr><th class='left'>Date</th><th class='left'>Message</th><th class='left'>Author</th></tr>\n"); 52 html("<tr><th class='left'>Date</th>"
53 "<th class='left'>Message</th>"
54 "<th class='left'>Author</th></tr>\n");
53 55
54 if (ofs<0) 56 if (ofs<0)
55 ofs = 0; 57 ofs = 0;
56 58
57 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { 59 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
58 free(commit->buffer); 60 free(commit->buffer);
59 commit->buffer = NULL; 61 commit->buffer = NULL;
60 free_commit_list(commit->parents); 62 free_commit_list(commit->parents);
61 commit->parents = NULL; 63 commit->parents = NULL;
62 } 64 }
63 65
64 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 66 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
diff --git a/ui-summary.c b/ui-summary.c
index 5ddeee3..638c8f6 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -19,45 +19,49 @@ static int cgit_print_branch_cb(const char *refname, const unsigned char *sha1,
19 if (commit && !parse_commit(commit)){ 19 if (commit && !parse_commit(commit)){
20 info = cgit_parse_commit(commit); 20 info = cgit_parse_commit(commit);
21 html("<tr><td>"); 21 html("<tr><td>");
22 url = cgit_pageurl(cgit_query_repo, "log", 22 url = cgit_pageurl(cgit_query_repo, "log",
23 fmt("h=%s", refname)); 23 fmt("h=%s", refname));
24 html_link_open(url, NULL, NULL); 24 html_link_open(url, NULL, NULL);
25 strncpy(buf, refname, sizeof(buf)); 25 strncpy(buf, refname, sizeof(buf));
26 html_txt(buf); 26 html_txt(buf);
27 html_link_close(); 27 html_link_close();
28 html("</td><td>"); 28 html("</td><td>");
29 cgit_print_date(commit->date); 29 cgit_print_date(commit->date);
30 html("</td><td>"); 30 html("</td><td>");
31 url = cgit_pageurl(cgit_query_repo, "commit", fmt("id=%s", sha1_to_hex(sha1))); 31 url = cgit_pageurl(cgit_query_repo, "commit",
32 fmt("id=%s", sha1_to_hex(sha1)));
32 html_link_open(url, NULL, NULL); 33 html_link_open(url, NULL, NULL);
33 html_txt(info->subject); 34 html_txt(info->subject);
34 html_link_close(); 35 html_link_close();
35 html("</td><td>"); 36 html("</td><td>");
36 html_txt(info->author); 37 html_txt(info->author);
37 html("</td></tr>\n"); 38 html("</td></tr>\n");
38 cgit_free_commitinfo(info); 39 cgit_free_commitinfo(info);
39 } else { 40 } else {
40 html("<tr><td>"); 41 html("<tr><td>");
41 html_txt(buf); 42 html_txt(buf);
42 html("</td><td>"); 43 html("</td><td>");
43 htmlf("*** bad ref %s", sha1_to_hex(sha1)); 44 htmlf("*** bad ref %s", sha1_to_hex(sha1));
44 html("</td></tr>\n"); 45 html("</td></tr>\n");
45 } 46 }
46 return 0; 47 return 0;
47} 48}
48 49
49static void cgit_print_branches() 50static void cgit_print_branches()
50{ 51{
51 html("<table class='list'>"); 52 html("<table class='list'>");
52 html("<tr><th class='left'>Branch</th><th class='left'>Updated</th><th class='left'>Commit subject</th><th class='left'>Author</th></tr>\n"); 53 html("<tr><th class='left'>Branch</th>"
54 "<th class='left'>Updated</th>"
55 "<th class='left'>Commit subject</th>"
56 "<th class='left'>Author</th></tr>\n");
53 for_each_branch_ref(cgit_print_branch_cb, NULL); 57 for_each_branch_ref(cgit_print_branch_cb, NULL);
54 html("</table>"); 58 html("</table>");
55} 59}
56 60
57void cgit_print_summary() 61void cgit_print_summary()
58{ 62{
59 html("<h2>"); 63 html("<h2>");
60 html_txt("Repo summary page"); 64 html_txt("Repo summary page");
61 html("</h2>"); 65 html("</h2>");
62 cgit_print_branches(); 66 cgit_print_branches();
63} 67}