author | Lars Hjemli <hjemli@gmail.com> | 2006-12-17 22:30:55 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2006-12-17 22:30:55 (UTC) |
commit | fb6e5869dcc81b775d5ac79dd3afac7220c366dd (patch) (unidiff) | |
tree | 6e68d9dfe43d3ca5c6fc5b9be6546ea70779f0f1 | |
parent | 6cb326c83b3c0b35d472305294afee3105b3088d (diff) | |
download | cgit-fb6e5869dcc81b775d5ac79dd3afac7220c366dd.zip cgit-fb6e5869dcc81b775d5ac79dd3afac7220c366dd.tar.gz cgit-fb6e5869dcc81b775d5ac79dd3afac7220c366dd.tar.bz2 |
Don't show new and old filemode for added/removed files
It gives us no extra info whatsoever to show "----------" for either new
or old mode, it's just noise (especially since we now show the "old"
filemode for deleted files)
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-commit.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ui-commit.c b/ui-commit.c index c5ee8e7..b49b2e9 100644 --- a/ui-commit.c +++ b/ui-commit.c | |||
@@ -25,50 +25,57 @@ void print_filepair(struct diff_filepair *pair) | |||
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 | html_filemode(pair->two->mode); | 49 | if (is_null_sha1(pair->two->sha1)) { |
50 | if (pair->one->mode != pair->two->mode) { | 50 | html_filemode(pair->one->mode); |
51 | } else { | ||
52 | html_filemode(pair->two->mode); | ||
53 | } | ||
54 | |||
55 | if (pair->one->mode != pair->two->mode && | ||
56 | !is_null_sha1(pair->one->sha1) && | ||
57 | !is_null_sha1(pair->two->sha1)) { | ||
51 | html("<span class='modechange'>["); | 58 | html("<span class='modechange'>["); |
52 | html_filemode(pair->one->mode); | 59 | html_filemode(pair->one->mode); |
53 | html("]</span>"); | 60 | html("]</span>"); |
54 | } | 61 | } |
55 | htmlf("</td><td class='%s'>", class); | 62 | htmlf("</td><td class='%s'>", class); |
56 | query = fmt("id=%s", sha1_to_hex(pair->two->sha1)); | 63 | query = fmt("id=%s", sha1_to_hex(pair->two->sha1)); |
57 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), | 64 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), |
58 | NULL, NULL); | 65 | NULL, NULL); |
59 | if (pair->status == DIFF_STATUS_COPIED || | 66 | if (pair->status == DIFF_STATUS_COPIED || |
60 | pair->status == DIFF_STATUS_RENAMED) { | 67 | pair->status == DIFF_STATUS_RENAMED) { |
61 | html_txt(pair->two->path); | 68 | html_txt(pair->two->path); |
62 | htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ? | 69 | htmlf("</a> (%s from ", pair->status == DIFF_STATUS_COPIED ? |
63 | "copied" : "renamed"); | 70 | "copied" : "renamed"); |
64 | query = fmt("id=%s", sha1_to_hex(pair->one->sha1)); | 71 | query = fmt("id=%s", sha1_to_hex(pair->one->sha1)); |
65 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), | 72 | html_link_open(cgit_pageurl(cgit_query_repo, "view", query), |
66 | NULL, NULL); | 73 | NULL, NULL); |
67 | html_txt(pair->one->path); | 74 | html_txt(pair->one->path); |
68 | html("</a>)"); | 75 | html("</a>)"); |
69 | } else { | 76 | } else { |
70 | html_txt(pair->two->path); | 77 | html_txt(pair->two->path); |
71 | html("</a>"); | 78 | html("</a>"); |
72 | } | 79 | } |
73 | html("<td>"); | 80 | html("<td>"); |
74 | 81 | ||