|
|
|
@@ -72,17 +72,17 @@ static void filepair_cb(struct diff_filepair *pair) |
72 | } |
72 | } |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
73 | if (cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
74 | &new_size, &binary, print_line)) |
74 | &new_size, &binary, print_line)) |
75 | html("Error running diff"); |
75 | html("Error running diff"); |
76 | if (binary) |
76 | if (binary) |
77 | html("Binary files differ\n"); |
77 | html("Binary files differ\n"); |
78 | } |
78 | } |
79 | |
79 | |
80 | void cgit_print_patch(char *hex) |
80 | void cgit_print_patch(char *hex, const char *prefix) |
81 | { |
81 | { |
82 | struct commit *commit; |
82 | struct commit *commit; |
83 | struct commitinfo *info; |
83 | struct commitinfo *info; |
84 | unsigned char sha1[20], old_sha1[20]; |
84 | unsigned char sha1[20], old_sha1[20]; |
85 | char *patchname; |
85 | char *patchname; |
86 | |
86 | |
87 | if (!hex) |
87 | if (!hex) |
88 | hex = ctx.qry.head; |
88 | hex = ctx.qry.head; |
@@ -117,13 +117,15 @@ void cgit_print_patch(char *hex) |
117 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); |
117 | cgit_print_date(info->author_date, "%a, %d %b %Y %H:%M:%S %z%n", ctx.cfg.local_time); |
118 | htmlf("Subject: %s\n\n", info->subject); |
118 | htmlf("Subject: %s\n\n", info->subject); |
119 | if (info->msg && *info->msg) { |
119 | if (info->msg && *info->msg) { |
120 | htmlf("%s", info->msg); |
120 | htmlf("%s", info->msg); |
121 | if (info->msg[strlen(info->msg) - 1] != '\n') |
121 | if (info->msg[strlen(info->msg) - 1] != '\n') |
122 | html("\n"); |
122 | html("\n"); |
123 | } |
123 | } |
124 | html("---\n"); |
124 | html("---\n"); |
125 | cgit_diff_tree(old_sha1, sha1, filepair_cb, NULL); |
125 | if (prefix) |
| |
126 | htmlf("(limited to '%s')\n\n", prefix); |
| |
127 | cgit_diff_tree(old_sha1, sha1, filepair_cb, prefix); |
126 | html("--\n"); |
128 | html("--\n"); |
127 | htmlf("cgit %s\n", CGIT_VERSION); |
129 | htmlf("cgit %s\n", CGIT_VERSION); |
128 | cgit_free_commitinfo(info); |
130 | cgit_free_commitinfo(info); |
129 | } |
131 | } |
|