aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Lars Hjemli <hjemli@gmail.com>2006-12-16 02:17:36 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2006-12-16 02:17:36 (JST)
commit2101e26fd68f816e77de62b93df4c32fd1110d0c (patch)
treed70d28734c4fbfd0a4e4a40bcfd445eb50dc1666
parent420712ac2531f65a2b94d5ec6d8e03de6942331e (diff)
downloadcgit-2101e26fd68f816e77de62b93df4c32fd1110d0c.zip
cgit-2101e26fd68f816e77de62b93df4c32fd1110d0c.tar.gz
Add a common commit parser
Make a better commit parser, replacing the ugly one in ui-log.c Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r--cgit.h9
-rw-r--r--parsing.c53
-rw-r--r--ui-log.c76
3 files changed, 75 insertions, 63 deletions
diff --git a/cgit.h b/cgit.h
index 82e8681..268db53 100644
--- a/cgit.h
+++ b/cgit.h
@@ -15,6 +15,14 @@ struct cacheitem {
15 int fd; 15 int fd;
16}; 16};
17 17
18struct commitinfo {
19 struct commit *commit;
20 char *author;
21 char *committer;
22 char *subject;
23 char *msg;
24};
25
18extern const char cgit_version[]; 26extern const char cgit_version[];
19 27
20extern char *cgit_root; 28extern char *cgit_root;
@@ -63,6 +71,7 @@ extern void html_link_close(void);
63 71
64extern int cgit_read_config(const char *filename, configfn fn); 72extern int cgit_read_config(const char *filename, configfn fn);
65extern int cgit_parse_query(char *txt, configfn fn); 73extern int cgit_parse_query(char *txt, configfn fn);
74extern struct commitinfo *cgit_parse_commit(struct commit *commit);
66 75
67extern void cache_prepare(struct cacheitem *item); 76extern void cache_prepare(struct cacheitem *item);
68extern int cache_lock(struct cacheitem *item); 77extern int cache_lock(struct cacheitem *item);
diff --git a/parsing.c b/parsing.c
index 98b3243..6cab0e9 100644
--- a/parsing.c
+++ b/parsing.c
@@ -104,3 +104,56 @@ int cgit_parse_query(char *txt, configfn fn)
104 (*fn)(txt, value); 104 (*fn)(txt, value);
105 return 0; 105 return 0;
106} 106}
107
108char *substr(const char *head, const char *tail)
109{
110 char *buf;
111
112 buf = xmalloc(tail - head + 1);
113 strncpy(buf, head, tail - head);
114 buf[tail - head] = '\0';
115 return buf;
116}
117
118struct commitinfo *cgit_parse_commit(struct commit *commit)
119{
120 struct commitinfo *ret;
121 char *p = commit->buffer, *t = commit->buffer;
122
123 ret = xmalloc(sizeof(*ret));
124 ret->commit = commit;
125
126 if (strncmp(p, "tree ", 5))
127 die("Bad commit: %s", sha1_to_hex(commit->object.sha1));
128 else
129 p += 46; // "tree " + hex[40] + "\n"
130
131 while (!strncmp(p, "parent ", 7))
132 p += 48; // "parent " + hex[40] + "\n"
133
134 if (!strncmp(p, "author ", 7)) {
135 p += 7;
136 t = strchr(p, '<') - 1;
137 ret->author = substr(p, t);
138 p = strchr(p, '\n') + 1;
139 }
140
141 if (!strncmp(p, "committer ", 9)) {
142 p += 9;
143 t = strchr(p, '<') - 1;
144 ret->committer = substr(p, t);
145 p = strchr(p, '\n') + 1;
146 }
147
148 while (*p == '\n')
149 p = strchr(p, '\n') + 1;
150
151 t = strchr(p, '\n');
152 ret->subject = substr(p, t);
153
154 while (*p == '\n')
155 p = strchr(p, '\n') + 1;
156 ret->msg = p;
157
158 return ret;
159}
diff --git a/ui-log.c b/ui-log.c
index dce50f7..31331ef 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -8,69 +8,14 @@
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11static int get_one_line(char *txt) 11void print_commit(struct commit *commit)
12{ 12{
13 char *t;
14
15 for(t=txt; *t != '\n' && t != '\0'; t++)
16 ;
17 *t = '\0';
18 return t-txt-1;
19}
20
21static void cgit_print_commit_shortlog(struct commit *commit)
22{
23 char *h, *t, *p;
24 char *tree = NULL, *author = NULL, *subject = NULL;
25 int len;
26 time_t sec;
27 struct tm *time;
28 char buf[32]; 13 char buf[32];
14 struct commitinfo *info;
15 struct tm *time;
29 16
30 h = t = commit->buffer; 17 info = cgit_parse_commit(commit);
31 18 time = gmtime(&commit->date);
32 if (strncmp(h, "tree ", 5))
33 die("Bad commit format: %s",
34 sha1_to_hex(commit->object.sha1));
35
36 len = get_one_line(h);
37 tree = h+5;
38 h += len + 2;
39
40 while (!strncmp(h, "parent ", 7))
41 h += get_one_line(h) + 2;
42
43 if (!strncmp(h, "author ", 7)) {
44 author = h+7;
45 h += get_one_line(h) + 2;
46 t = author;
47 while(t!=h && *t!='<')
48 t++;
49 *t='\0';
50 p = t;
51 while(--t!=author && *t==' ')
52 *t='\0';
53 while(++p!=h && *p!='>')
54 ;
55 while(++p!=h && !isdigit(*p))
56 ;
57
58 t = p;
59 while(++p && isdigit(*p))
60 ;
61 *p = '\0';
62 sec = atoi(t);
63 time = gmtime(&sec);
64 }
65
66 while((len = get_one_line(h)) > 0)
67 h += len+2;
68
69 h++;
70 len = get_one_line(h);
71
72 subject = h;
73
74 html("<tr><td>"); 19 html("<tr><td>");
75 strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time); 20 strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M:%S", time);
76 html_txt(buf); 21 html_txt(buf);
@@ -78,18 +23,23 @@ static void cgit_print_commit_shortlog(struct commit *commit)
78 char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1)); 23 char *qry = fmt("id=%s", sha1_to_hex(commit->object.sha1));
79 char *url = cgit_pageurl(cgit_query_repo, "view", qry); 24 char *url = cgit_pageurl(cgit_query_repo, "view", qry);
80 html_link_open(url, NULL, NULL); 25 html_link_open(url, NULL, NULL);
81 html_txt(subject); 26 html_txt(info->subject);
82 html_link_close(); 27 html_link_close();
83 html("</td><td>"); 28 html("</td><td>");
84 html_txt(author); 29 html_txt(info->author);
85 html("</td><td><a href='"); 30 html("</td><td><a href='");
86 html_attr(cgit_pageurl(cgit_query_repo, "tree", 31 html_attr(cgit_pageurl(cgit_query_repo, "tree",
87 fmt("id=%s", 32 fmt("id=%s",
88 sha1_to_hex(commit->tree->object.sha1)))); 33 sha1_to_hex(commit->tree->object.sha1))));
89 html("'>tree</a>"); 34 html("'>tree</a>");
90 html("</td></tr>\n"); 35 html("</td></tr>\n");
36 free(info->author);
37 free(info->committer);
38 free(info->subject);
39 free(info);
91} 40}
92 41
42
93void cgit_print_log(const char *tip, int ofs, int cnt) 43void cgit_print_log(const char *tip, int ofs, int cnt)
94{ 44{
95 struct rev_info rev; 45 struct rev_info rev;
@@ -120,7 +70,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt)
120 } 70 }
121 71
122 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 72 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
123 cgit_print_commit_shortlog(commit); 73 print_commit(commit);
124 free(commit->buffer); 74 free(commit->buffer);
125 commit->buffer = NULL; 75 commit->buffer = NULL;
126 free_commit_list(commit->parents); 76 free_commit_list(commit->parents);