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 | 66 |
1 files changed, 15 insertions, 51 deletions
diff --git a/ui-commit.c b/ui-commit.c index 3618800..f1a22d3 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -16,3 +16,3 @@ void print_filepair(struct diff_filepair *pair) | |||
16 | char *class; | 16 | char *class; |
17 | 17 | ||
18 | switch (pair->status) { | 18 | switch (pair->status) { |
@@ -54,4 +54,4 @@ void print_filepair(struct diff_filepair *pair) | |||
54 | 54 | ||
55 | if (pair->one->mode != pair->two->mode && | 55 | if (pair->one->mode != pair->two->mode && |
56 | !is_null_sha1(pair->one->sha1) && | 56 | !is_null_sha1(pair->one->sha1) && |
57 | !is_null_sha1(pair->two->sha1)) { | 57 | !is_null_sha1(pair->two->sha1)) { |
@@ -62,13 +62,13 @@ void print_filepair(struct diff_filepair *pair) | |||
62 | htmlf("</td><td class='%s'>", class); | 62 | htmlf("</td><td class='%s'>", class); |
63 | query = fmt("id=%s&id2=%s", sha1_to_hex(pair->one->sha1), | 63 | query = fmt("id=%s&id2=%s", sha1_to_hex(pair->one->sha1), |
64 | sha1_to_hex(pair->two->sha1)); | 64 | sha1_to_hex(pair->two->sha1)); |
65 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), | 65 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), |
66 | NULL, NULL); | 66 | NULL, NULL); |
67 | if (pair->status == DIFF_STATUS_COPIED || | 67 | if (pair->status == DIFF_STATUS_COPIED || |
68 | pair->status == DIFF_STATUS_RENAMED) { | 68 | pair->status == DIFF_STATUS_RENAMED) { |
69 | html_txt(pair->two->path); | 69 | html_txt(pair->two->path); |
70 | htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ? | 70 | htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ? |
71 | "copied" : "renamed"); | 71 | "copied" : "renamed"); |
72 | query = fmt("id=%s", sha1_to_hex(pair->one->sha1)); | 72 | query = fmt("id=%s", sha1_to_hex(pair->one->sha1)); |
73 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), | 73 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), |
74 | NULL, NULL); | 74 | NULL, NULL); |
@@ -83,40 +83,5 @@ void print_filepair(struct diff_filepair *pair) | |||
83 | //TODO: diffstat graph | 83 | //TODO: diffstat graph |
84 | |||
85 | html("</td></tr>\n"); | ||
86 | files++; | ||
87 | } | ||
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 | 84 | ||
120 | diffcore_std(&opt); | 85 | html("</td></tr>\n"); |
121 | diff_flush(&opt); | 86 | files++; |
122 | } | 87 | } |
@@ -168,3 +133,3 @@ void cgit_print_commit(const char *hex) | |||
168 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); | 133 | html_attr(cgit_pageurl(cgit_query_repo, "commit", query)); |
169 | htmlf("'>%s</a></td></tr>\n", | 134 | htmlf("'>%s</a></td></tr>\n", |
170 | sha1_to_hex(p->item->object.sha1)); | 135 | sha1_to_hex(p->item->object.sha1)); |
@@ -174,3 +139,3 @@ void cgit_print_commit(const char *hex) | |||
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))); |
@@ -178,3 +143,2 @@ void cgit_print_commit(const char *hex) | |||
178 | } | 143 | } |
179 | |||
180 | html("</table>\n"); | 144 | html("</table>\n"); |
@@ -188,3 +152,3 @@ void cgit_print_commit(const char *hex) | |||
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'>" |