-rw-r--r-- | ui-commit.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui-commit.c b/ui-commit.c index b49b2e9..73fa104 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -31,66 +31,67 @@ void print_filepair(struct diff_filepair *pair) | |||
31 | case DIFF_STATUS_RENAMED: | 31 | case DIFF_STATUS_RENAMED: |
32 | class = "mov"; | 32 | class = "mov"; |
33 | break; | 33 | break; |
34 | case DIFF_STATUS_TYPE_CHANGED: | 34 | case DIFF_STATUS_TYPE_CHANGED: |
35 | class = "typ"; | 35 | class = "typ"; |
36 | break; | 36 | break; |
37 | case DIFF_STATUS_UNKNOWN: | 37 | case DIFF_STATUS_UNKNOWN: |
38 | class = "unk"; | 38 | class = "unk"; |
39 | break; | 39 | break; |
40 | case DIFF_STATUS_UNMERGED: | 40 | case DIFF_STATUS_UNMERGED: |
41 | class = "stg"; | 41 | class = "stg"; |
42 | break; | 42 | break; |
43 | default: | 43 | default: |
44 | die("bug: unhandled diff status %c", pair->status); | 44 | die("bug: unhandled diff status %c", pair->status); |
45 | } | 45 | } |
46 | 46 | ||
47 | html("<tr>"); | 47 | html("<tr>"); |
48 | htmlf("<td class='mode'>"); | 48 | htmlf("<td class='mode'>"); |
49 | if (is_null_sha1(pair->two->sha1)) { | 49 | if (is_null_sha1(pair->two->sha1)) { |
50 | html_filemode(pair->one->mode); | 50 | html_filemode(pair->one->mode); |
51 | } else { | 51 | } else { |
52 | html_filemode(pair->two->mode); | 52 | html_filemode(pair->two->mode); |
53 | } | 53 | } |
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)) { |
58 | html("<span class='modechange'>["); | 58 | html("<span class='modechange'>["); |
59 | html_filemode(pair->one->mode); | 59 | html_filemode(pair->one->mode); |
60 | html("]</span>"); | 60 | html("]</span>"); |
61 | } | 61 | } |
62 | htmlf("</td><td class='%s'>", class); | 62 | htmlf("</td><td class='%s'>", class); |
63 | query = fmt("id=%s", sha1_to_hex(pair->two->sha1)); | 63 | query = fmt("id=%s&id2=%s", sha1_to_hex(pair->one->sha1), |
64 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), | 64 | sha1_to_hex(pair->two->sha1)); |
65 | html_link_open(cgit_pageurl(cgit_query_repo, "diff", query), | ||
65 | NULL, NULL); | 66 | NULL, NULL); |
66 | if (pair->status == DIFF_STATUS_COPIED || | 67 | if (pair->status == DIFF_STATUS_COPIED || |
67 | pair->status == DIFF_STATUS_RENAMED) { | 68 | pair->status == DIFF_STATUS_RENAMED) { |
68 | html_txt(pair->two->path); | 69 | html_txt(pair->two->path); |
69 | htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ? | 70 | htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ? |
70 | "copied" : "renamed"); | 71 | "copied" : "renamed"); |
71 | query = fmt("id=%s", sha1_to_hex(pair->one->sha1)); | 72 | query = fmt("id=%s", sha1_to_hex(pair->one->sha1)); |
72 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), | 73 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), |
73 | NULL, NULL); | 74 | NULL, NULL); |
74 | html_txt(pair->one->path); | 75 | html_txt(pair->one->path); |
75 | html("</a>)"); | 76 | html("</a>)"); |
76 | } else { | 77 | } else { |
77 | html_txt(pair->two->path); | 78 | html_txt(pair->two->path); |
78 | html("</a>"); | 79 | html("</a>"); |
79 | } | 80 | } |
80 | html("<td>"); | 81 | html("<td>"); |
81 | 82 | ||
82 | //TODO: diffstat graph | 83 | //TODO: diffstat graph |
83 | 84 | ||
84 | html("</td></tr>\n"); | 85 | html("</td></tr>\n"); |
85 | files++; | 86 | files++; |
86 | } | 87 | } |
87 | 88 | ||
88 | void diff_format_cb(struct diff_queue_struct *q, | 89 | void diff_format_cb(struct diff_queue_struct *q, |
89 | struct diff_options *options, void *data) | 90 | struct diff_options *options, void *data) |
90 | { | 91 | { |
91 | int i; | 92 | int i; |
92 | 93 | ||
93 | for (i = 0; i < q->nr; i++) { | 94 | for (i = 0; i < q->nr; i++) { |
94 | if (q->queue[i]->status == 'U') | 95 | if (q->queue[i]->status == 'U') |
95 | continue; | 96 | continue; |
96 | print_filepair(q->queue[i]); | 97 | print_filepair(q->queue[i]); |