aboutsummaryrefslogtreecommitdiffstats
path: root/ui-patch.c
diff options
context:
space:
mode:
authorLukas Fleischer <cgit@cryptocrack.de>2013-08-20 18:56:14 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2013-08-20 19:55:42 +0200
commit750f6462c9e1e20e87d2bce5ca2e7fd10e0d1ba6 (patch)
treea3b0e425d5f13e35b2a97d7fdb609bb8ada8ede7 /ui-patch.c
parent455b5987780f53ef55ebf6edd4543976763152da (diff)
downloadcgit-750f6462c9e1e20e87d2bce5ca2e7fd10e0d1ba6.tar.gz
cgit-750f6462c9e1e20e87d2bce5ca2e7fd10e0d1ba6.tar.bz2
cgit-750f6462c9e1e20e87d2bce5ca2e7fd10e0d1ba6.zip
Allow for creating patch series
This allows for specifying a revision range using the id2 parameter of /patch/. The output that is produced is similar to $ git format-patch --stdout id2..id Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Diffstat (limited to 'ui-patch.c')
-rw-r--r--ui-patch.c23
1 files changed, 18 insertions, 5 deletions
diff --git a/ui-patch.c b/ui-patch.c
index 72c9749..bb39294 100644
--- a/ui-patch.c
+++ b/ui-patch.c
@@ -11,7 +11,7 @@
#include "html.h"
#include "ui-shared.h"
-void cgit_print_patch(char *hex, const char *prefix)
+void cgit_print_patch(char *hex, const char *old_rev, const char *prefix)
{
struct rev_info rev;
struct commit *commit;
@@ -33,16 +33,29 @@ void cgit_print_patch(char *hex, const char *prefix)
return;
}
- if (commit->parents && commit->parents->item) {
+ if (old_rev) {
+ if (get_sha1(old_rev, old_sha1)) {
+ cgit_print_error("Bad object id: %s", old_rev);
+ return;
+ }
+ if (!lookup_commit_reference(old_sha1)) {
+ cgit_print_error("Bad commit reference: %s", old_rev);
+ return;
+ }
+ } else if (commit->parents && commit->parents->item) {
hashcpy(old_sha1, commit->parents->item->object.sha1);
- sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1),
- sha1_to_hex(sha1));
} else {
hashclr(old_sha1);
+ }
+
+ if (is_null_sha1(old_sha1)) {
memcpy(rev_range, sha1_to_hex(sha1), 41);
+ } else {
+ sprintf(rev_range, "%s..%s", sha1_to_hex(old_sha1),
+ sha1_to_hex(sha1));
}
- patchname = fmt("%s.patch", sha1_to_hex(sha1));
+ patchname = fmt("%s.patch", rev_range);
ctx.page.mimetype = "text/plain";
ctx.page.filename = patchname;
cgit_print_http_headers(&ctx);