author | Lars Hjemli <hjemli@gmail.com> | 2010-08-22 11:29:57 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-08-22 11:29:57 (UTC) |
commit | 6d7552bc072599313ef423d69156d824c075572a (patch) (unidiff) | |
tree | 3189efeb6ca80dc6dcf0811ff2d8011e2b3e8c7b /ui-log.c | |
parent | 379e80e3a83481d3639c5d312eeddcce57c486b2 (diff) | |
download | cgit-6d7552bc072599313ef423d69156d824c075572a.zip cgit-6d7552bc072599313ef423d69156d824c075572a.tar.gz cgit-6d7552bc072599313ef423d69156d824c075572a.tar.bz2 |
Use GIT-1.7.2.2
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-log.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -51,129 +51,129 @@ void show_commit_decorations(struct commit *commit) | |||
51 | ctx.qry.vpath, 0, NULL, NULL, | 51 | ctx.qry.vpath, 0, NULL, NULL, |
52 | ctx.qry.showmsg); | 52 | ctx.qry.showmsg); |
53 | } | 53 | } |
54 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { | 54 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
55 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); | 55 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
56 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 56 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
57 | } | 57 | } |
58 | else if (!prefixcmp(deco->name, "refs/tags/")) { | 58 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
59 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); | 59 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
60 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); | 60 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
61 | } | 61 | } |
62 | else if (!prefixcmp(deco->name, "refs/remotes/")) { | 62 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
63 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); | 63 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
64 | cgit_log_link(buf, NULL, "remote-deco", NULL, | 64 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
65 | sha1_to_hex(commit->object.sha1), | 65 | sha1_to_hex(commit->object.sha1), |
66 | ctx.qry.vpath, 0, NULL, NULL, | 66 | ctx.qry.vpath, 0, NULL, NULL, |
67 | ctx.qry.showmsg); | 67 | ctx.qry.showmsg); |
68 | } | 68 | } |
69 | else { | 69 | else { |
70 | strncpy(buf, deco->name, sizeof(buf) - 1); | 70 | strncpy(buf, deco->name, sizeof(buf) - 1); |
71 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, | 71 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
72 | sha1_to_hex(commit->object.sha1), | 72 | sha1_to_hex(commit->object.sha1), |
73 | ctx.qry.vpath, 0); | 73 | ctx.qry.vpath, 0); |
74 | } | 74 | } |
75 | deco = deco->next; | 75 | deco = deco->next; |
76 | } | 76 | } |
77 | } | 77 | } |
78 | 78 | ||
79 | void print_commit(struct commit *commit) | 79 | void print_commit(struct commit *commit) |
80 | { | 80 | { |
81 | struct commitinfo *info; | 81 | struct commitinfo *info; |
82 | char *tmp; | 82 | char *tmp; |
83 | int cols = 2; | 83 | int cols = 2; |
84 | 84 | ||
85 | info = cgit_parse_commit(commit); | 85 | info = cgit_parse_commit(commit); |
86 | htmlf("<tr%s><td>", | 86 | htmlf("<tr%s><td>", |
87 | ctx.qry.showmsg ? " class='logheader'" : ""); | 87 | ctx.qry.showmsg ? " class='logheader'" : ""); |
88 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 88 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
89 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | 89 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
90 | html_link_open(tmp, NULL, NULL); | 90 | html_link_open(tmp, NULL, NULL); |
91 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 91 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
92 | html_link_close(); | 92 | html_link_close(); |
93 | htmlf("</td><td%s>", | 93 | htmlf("</td><td%s>", |
94 | ctx.qry.showmsg ? " class='logsubject'" : ""); | 94 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
95 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 95 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
96 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); | 96 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
97 | show_commit_decorations(commit); | 97 | show_commit_decorations(commit); |
98 | html("</td><td>"); | 98 | html("</td><td>"); |
99 | html_txt(info->author); | 99 | html_txt(info->author); |
100 | if (ctx.repo->enable_log_filecount) { | 100 | if (ctx.repo->enable_log_filecount) { |
101 | files = 0; | 101 | files = 0; |
102 | add_lines = 0; | 102 | add_lines = 0; |
103 | rem_lines = 0; | 103 | rem_lines = 0; |
104 | cgit_diff_commit(commit, inspect_files); | 104 | cgit_diff_commit(commit, inspect_files); |
105 | html("</td><td>"); | 105 | html("</td><td>"); |
106 | htmlf("%d", files); | 106 | htmlf("%d", files); |
107 | if (ctx.repo->enable_log_linecount) { | 107 | if (ctx.repo->enable_log_linecount) { |
108 | html("</td><td>"); | 108 | html("</td><td>"); |
109 | htmlf("-%d/+%d", rem_lines, add_lines); | 109 | htmlf("-%d/+%d", rem_lines, add_lines); |
110 | } | 110 | } |
111 | } | 111 | } |
112 | html("</td></tr>\n"); | 112 | html("</td></tr>\n"); |
113 | if (ctx.qry.showmsg) { | 113 | if (ctx.qry.showmsg) { |
114 | struct strbuf notes = STRBUF_INIT; | 114 | struct strbuf notes = STRBUF_INIT; |
115 | get_commit_notes(commit, ¬es, PAGE_ENCODING, 0); | 115 | format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); |
116 | 116 | ||
117 | if (ctx.repo->enable_log_filecount) { | 117 | if (ctx.repo->enable_log_filecount) { |
118 | cols++; | 118 | cols++; |
119 | if (ctx.repo->enable_log_linecount) | 119 | if (ctx.repo->enable_log_linecount) |
120 | cols++; | 120 | cols++; |
121 | } | 121 | } |
122 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", | 122 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
123 | cols); | 123 | cols); |
124 | html_txt(info->msg); | 124 | html_txt(info->msg); |
125 | html("</td></tr>\n"); | 125 | html("</td></tr>\n"); |
126 | if (notes.len != 0) { | 126 | if (notes.len != 0) { |
127 | html("<tr class='nohover'>"); | 127 | html("<tr class='nohover'>"); |
128 | html("<td class='lognotes-label'>Notes:</td>"); | 128 | html("<td class='lognotes-label'>Notes:</td>"); |
129 | htmlf("<td colspan='%d' class='lognotes'>", | 129 | htmlf("<td colspan='%d' class='lognotes'>", |
130 | cols); | 130 | cols); |
131 | html_txt(notes.buf); | 131 | html_txt(notes.buf); |
132 | html("</td></tr>\n"); | 132 | html("</td></tr>\n"); |
133 | } | 133 | } |
134 | strbuf_release(¬es); | 134 | strbuf_release(¬es); |
135 | } | 135 | } |
136 | cgit_free_commitinfo(info); | 136 | cgit_free_commitinfo(info); |
137 | } | 137 | } |
138 | 138 | ||
139 | static const char *disambiguate_ref(const char *ref) | 139 | static const char *disambiguate_ref(const char *ref) |
140 | { | 140 | { |
141 | unsigned char sha1[20]; | 141 | unsigned char sha1[20]; |
142 | const char *longref; | 142 | const char *longref; |
143 | 143 | ||
144 | longref = fmt("refs/heads/%s", ref); | 144 | longref = fmt("refs/heads/%s", ref); |
145 | if (get_sha1(longref, sha1) == 0) | 145 | if (get_sha1(longref, sha1) == 0) |
146 | return longref; | 146 | return longref; |
147 | 147 | ||
148 | return ref; | 148 | return ref; |
149 | } | 149 | } |
150 | 150 | ||
151 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, | 151 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
152 | char *path, int pager) | 152 | char *path, int pager) |
153 | { | 153 | { |
154 | struct rev_info rev; | 154 | struct rev_info rev; |
155 | struct commit *commit; | 155 | struct commit *commit; |
156 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; | 156 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
157 | int argc = 2; | 157 | int argc = 2; |
158 | int i, columns = 3; | 158 | int i, columns = 3; |
159 | 159 | ||
160 | if (!tip) | 160 | if (!tip) |
161 | tip = ctx.qry.head; | 161 | tip = ctx.qry.head; |
162 | 162 | ||
163 | argv[1] = disambiguate_ref(tip); | 163 | argv[1] = disambiguate_ref(tip); |
164 | 164 | ||
165 | if (grep && pattern) { | 165 | if (grep && pattern) { |
166 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || | 166 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
167 | !strcmp(grep, "committer")) | 167 | !strcmp(grep, "committer")) |
168 | argv[argc++] = fmt("--%s=%s", grep, pattern); | 168 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
169 | if (!strcmp(grep, "range")) | 169 | if (!strcmp(grep, "range")) |
170 | argv[1] = pattern; | 170 | argv[1] = pattern; |
171 | } | 171 | } |
172 | 172 | ||
173 | if (path) { | 173 | if (path) { |
174 | argv[argc++] = "--"; | 174 | argv[argc++] = "--"; |
175 | argv[argc++] = path; | 175 | argv[argc++] = path; |
176 | } | 176 | } |
177 | init_revisions(&rev, NULL); | 177 | init_revisions(&rev, NULL); |
178 | rev.abbrev = DEFAULT_ABBREV; | 178 | rev.abbrev = DEFAULT_ABBREV; |
179 | rev.commit_format = CMIT_FMT_DEFAULT; | 179 | rev.commit_format = CMIT_FMT_DEFAULT; |