-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 | |||
@@ -1,128 +1,129 @@ | |||
1 | /* ui-commit.c: generate commit view | 1 | /* ui-commit.c: generate commit view |
2 | * | 2 | * |
3 | * Copyright (C) 2006 Lars Hjemli | 3 | * Copyright (C) 2006 Lars Hjemli |
4 | * | 4 | * |
5 | * Licensed under GNU General Public License v2 | 5 | * Licensed under GNU General Public License v2 |
6 | * (see COPYING for full license text) | 6 | * (see COPYING for full license text) |
7 | */ | 7 | */ |
8 | 8 | ||
9 | #include "cgit.h" | 9 | #include "cgit.h" |
10 | 10 | ||
11 | int files = 0; | 11 | int files = 0; |
12 | 12 | ||
13 | void print_filepair(struct diff_filepair *pair) | 13 | void print_filepair(struct diff_filepair *pair) |
14 | { | 14 | { |
15 | char *query; | 15 | char *query; |
16 | char *class; | 16 | char *class; |
17 | 17 | ||
18 | switch (pair->status) { | 18 | switch (pair->status) { |
19 | case DIFF_STATUS_ADDED: | 19 | case DIFF_STATUS_ADDED: |
20 | class = "add"; | 20 | class = "add"; |
21 | break; | 21 | break; |
22 | case DIFF_STATUS_COPIED: | 22 | case DIFF_STATUS_COPIED: |
23 | class = "cpy"; | 23 | class = "cpy"; |
24 | break; | 24 | break; |
25 | case DIFF_STATUS_DELETED: | 25 | case DIFF_STATUS_DELETED: |
26 | class = "del"; | 26 | class = "del"; |
27 | break; | 27 | break; |
28 | case DIFF_STATUS_MODIFIED: | 28 | case DIFF_STATUS_MODIFIED: |
29 | class = "upd"; | 29 | class = "upd"; |
30 | break; | 30 | break; |
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]); |
97 | } | 98 | } |
98 | } | 99 | } |
99 | 100 | ||
100 | void cgit_diffstat(struct commit *commit) | 101 | void cgit_diffstat(struct commit *commit) |
101 | { | 102 | { |
102 | struct diff_options opt; | 103 | struct diff_options opt; |
103 | int ret; | 104 | int ret; |
104 | 105 | ||
105 | diff_setup(&opt); | 106 | diff_setup(&opt); |
106 | opt.output_format = DIFF_FORMAT_CALLBACK; | 107 | opt.output_format = DIFF_FORMAT_CALLBACK; |
107 | opt.detect_rename = 1; | 108 | opt.detect_rename = 1; |
108 | opt.recursive = 1; | 109 | opt.recursive = 1; |
109 | opt.format_callback = diff_format_cb; | 110 | opt.format_callback = diff_format_cb; |
110 | diff_setup_done(&opt); | 111 | diff_setup_done(&opt); |
111 | 112 | ||
112 | if (commit->parents) | 113 | if (commit->parents) |
113 | ret = diff_tree_sha1(commit->parents->item->object.sha1, | 114 | ret = diff_tree_sha1(commit->parents->item->object.sha1, |
114 | commit->object.sha1, | 115 | commit->object.sha1, |
115 | "", &opt); | 116 | "", &opt); |
116 | else | 117 | else |
117 | ret = diff_root_tree_sha1(commit->object.sha1, "", &opt); | 118 | ret = diff_root_tree_sha1(commit->object.sha1, "", &opt); |
118 | 119 | ||
119 | diffcore_std(&opt); | 120 | diffcore_std(&opt); |
120 | diff_flush(&opt); | 121 | diff_flush(&opt); |
121 | } | 122 | } |
122 | 123 | ||
123 | void cgit_print_commit(const char *hex) | 124 | void cgit_print_commit(const char *hex) |
124 | { | 125 | { |
125 | struct commit *commit; | 126 | struct commit *commit; |
126 | struct commitinfo *info; | 127 | struct commitinfo *info; |
127 | struct commit_list *p; | 128 | struct commit_list *p; |
128 | unsigned char sha1[20]; | 129 | unsigned char sha1[20]; |