author | Lars Hjemli <hjemli@gmail.com> | 2007-10-01 09:46:38 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2007-10-01 09:46:38 (UTC) |
commit | 1a6025b7a515a23ab4c83f4a5da468e00e4f0a38 (patch) (unidiff) | |
tree | 897fb29bf0d48a6c472221d6a2a32188dfcf8df9 /ui-diff.c | |
parent | f527a57c8a55f5fd315e1bc1cb338f5f4a9b20ae (diff) | |
download | cgit-1a6025b7a515a23ab4c83f4a5da468e00e4f0a38.zip cgit-1a6025b7a515a23ab4c83f4a5da468e00e4f0a38.tar.gz cgit-1a6025b7a515a23ab4c83f4a5da468e00e4f0a38.tar.bz2 |
Add prefix parameter to cgit_print_diff()
This allows a diff to be restricted to the path prefix specified in the url.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | ui-diff.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -86,13 +86,13 @@ static void filepair_cb(struct diff_filepair *pair) | |||
86 | return; | 86 | return; |
87 | } | 87 | } |
88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) | 88 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, print_line)) |
89 | cgit_print_error("Error running diff"); | 89 | cgit_print_error("Error running diff"); |
90 | } | 90 | } |
91 | 91 | ||
92 | void cgit_print_diff(const char *new_rev, const char *old_rev) | 92 | void cgit_print_diff(const char *new_rev, const char *old_rev, const char *prefix) |
93 | { | 93 | { |
94 | unsigned char sha1[20], sha2[20]; | 94 | unsigned char sha1[20], sha2[20]; |
95 | enum object_type type; | 95 | enum object_type type; |
96 | unsigned long size; | 96 | unsigned long size; |
97 | struct commit *commit, *commit2; | 97 | struct commit *commit, *commit2; |
98 | 98 | ||
@@ -130,10 +130,10 @@ void cgit_print_diff(const char *new_rev, const char *old_rev) | |||
130 | commit2 = lookup_commit_reference(sha2); | 130 | commit2 = lookup_commit_reference(sha2); |
131 | if (!commit2 || parse_commit(commit2)) | 131 | if (!commit2 || parse_commit(commit2)) |
132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); | 132 | cgit_print_error(fmt("Bad commit: %s", sha1_to_hex(sha2))); |
133 | } | 133 | } |
134 | html("<table class='diff'>"); | 134 | html("<table class='diff'>"); |
135 | html("<tr><td>"); | 135 | html("<tr><td>"); |
136 | cgit_diff_tree(sha2, sha1, filepair_cb, NULL); | 136 | cgit_diff_tree(sha2, sha1, filepair_cb, prefix); |
137 | html("</td></tr>"); | 137 | html("</td></tr>"); |
138 | html("</table>"); | 138 | html("</table>"); |
139 | } | 139 | } |