author | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:26:23 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-05-13 09:30:18 (UTC) |
commit | ae4c1ee11379e353f2a94201181a3a9dab75b646 (patch) (unidiff) | |
tree | dddf3527d3a608c0c1983e462303f6898142116b | |
parent | 1b49de3c2c52e29c78f870826b6334abdadc0295 (diff) | |
download | cgit-ae4c1ee11379e353f2a94201181a3a9dab75b646.zip cgit-ae4c1ee11379e353f2a94201181a3a9dab75b646.tar.gz cgit-ae4c1ee11379e353f2a94201181a3a9dab75b646.tar.bz2 |
Use standard tree-diff function when showing diffstat for single commit
Remove unneeded code from ui-commit.c and replace with call to standard
diff-functions.
Also fix some whitespace issues.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-commit.c | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/ui-commit.c b/ui-commit.c index 3618800..f1a22d3 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -83,47 +83,12 @@ void print_filepair(struct diff_filepair *pair) | |||
83 | //TODO: diffstat graph | 83 | //TODO: diffstat graph |
84 | 84 | ||
85 | html("</td></tr>\n"); | 85 | html("</td></tr>\n"); |
86 | files++; | 86 | files++; |
87 | } | 87 | } |
88 | 88 | ||
89 | void diff_format_cb(struct diff_queue_struct *q, | ||
90 | struct diff_options *options, void *data) | ||
91 | { | ||
92 | int i; | ||
93 | |||
94 | for (i = 0; i < q->nr; i++) { | ||
95 | if (q->queue[i]->status == 'U') | ||
96 | continue; | ||
97 | print_filepair(q->queue[i]); | ||
98 | } | ||
99 | } | ||
100 | |||
101 | void cgit_diffstat(struct commit *commit) | ||
102 | { | ||
103 | struct diff_options opt; | ||
104 | int ret; | ||
105 | |||
106 | diff_setup(&opt); | ||
107 | opt.output_format = DIFF_FORMAT_CALLBACK; | ||
108 | opt.detect_rename = 1; | ||
109 | opt.recursive = 1; | ||
110 | opt.format_callback = diff_format_cb; | ||
111 | diff_setup_done(&opt); | ||
112 | |||
113 | if (commit->parents) | ||
114 | ret = diff_tree_sha1(commit->parents->item->object.sha1, | ||
115 | commit->object.sha1, | ||
116 | "", &opt); | ||
117 | else | ||
118 | ret = diff_root_tree_sha1(commit->object.sha1, "", &opt); | ||
119 | |||
120 | diffcore_std(&opt); | ||
121 | diff_flush(&opt); | ||
122 | } | ||
123 | |||
124 | void cgit_print_commit(const char *hex) | 89 | void cgit_print_commit(const char *hex) |
125 | { | 90 | { |
126 | struct commit *commit; | 91 | struct commit *commit; |
127 | struct commitinfo *info; | 92 | struct commitinfo *info; |
128 | struct commit_list *p; | 93 | struct commit_list *p; |
129 | unsigned char sha1[20]; | 94 | unsigned char sha1[20]; |
@@ -173,22 +138,21 @@ void cgit_print_commit(const char *hex) | |||
173 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); | 138 | htmlf("<tr><th>download</th><td colspan='2' class='sha1'><a href='"); |
174 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); | 139 | filename = fmt("%s-%s.zip", cgit_query_repo, hex); |
175 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", | 140 | html_attr(cgit_pageurl(cgit_query_repo, "snapshot", |
176 | fmt("id=%s&name=%s", hex, filename))); | 141 | fmt("id=%s&name=%s", hex, filename))); |
177 | htmlf("'>%s</a></td></tr>", filename); | 142 | htmlf("'>%s</a></td></tr>", filename); |
178 | } | 143 | } |
179 | |||
180 | html("</table>\n"); | 144 | html("</table>\n"); |
181 | html("<div class='commit-subject'>"); | 145 | html("<div class='commit-subject'>"); |
182 | html_txt(info->subject); | 146 | html_txt(info->subject); |
183 | html("</div>"); | 147 | html("</div>"); |
184 | html("<div class='commit-msg'>"); | 148 | html("<div class='commit-msg'>"); |
185 | html_txt(info->msg); | 149 | html_txt(info->msg); |
186 | html("</div>"); | 150 | html("</div>"); |
187 | html("<table class='diffstat'>"); | 151 | html("<table class='diffstat'>"); |
188 | html("<tr><th colspan='3'>Affected files</tr>\n"); | 152 | html("<tr><th colspan='3'>Affected files</tr>\n"); |
189 | cgit_diffstat(commit); | 153 | cgit_diff_commit(commit, print_filepair); |
190 | htmlf("<tr><td colspan='3' class='summary'>" | 154 | htmlf("<tr><td colspan='3' class='summary'>" |
191 | "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : ""); | 155 | "%d file%s changed</td></tr>\n", files, files > 1 ? "s" : ""); |
192 | html("</table>"); | 156 | html("</table>"); |
193 | cgit_free_commitinfo(info); | 157 | cgit_free_commitinfo(info); |
194 | } | 158 | } |