all repos — cgit @ 9003cc172a4cbc6678f3d8003ae1ad3a55f62fed

a hyperfast web frontend for git written in c

Allow for creating raw diffs with cgit_print_diff()

This adds a parameter to cgit_print_diff() to create raw diffs, using
the same format as `git diff <commit>`.

Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de>
Lukas Fleischer cgit@cryptocrack.de
Wed, 14 Aug 2013 10:50:32 +0200
commit

9003cc172a4cbc6678f3d8003ae1ad3a55f62fed

parent

747b035dda97ae359ed00d84744acfa8cc009fb2

4 files changed, 12 insertions(+), 4 deletions(-)

jump to
M cmd.ccmd.c

@@ -57,7 +57,7 @@ }

static void diff_fn(struct cgit_context *ctx) { - cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path, 1); + cgit_print_diff(ctx->qry.sha1, ctx->qry.sha2, ctx->qry.path, 1, 0); } static void info_fn(struct cgit_context *ctx)
M ui-commit.cui-commit.c

@@ -137,7 +137,7 @@ if (parents)

tmp = sha1_to_hex(commit->parents->item->object.sha1); else tmp = NULL; - cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0); + cgit_print_diff(ctx.qry.sha1, tmp, prefix, 0, 0); } strbuf_release(&notes); cgit_free_commitinfo(info);
M ui-diff.cui-diff.c

@@ -358,7 +358,7 @@ html("</div>");

} void cgit_print_diff(const char *new_rev, const char *old_rev, - const char *prefix, int show_ctrls) + const char *prefix, int show_ctrls, int raw) { enum object_type type; unsigned long size;

@@ -396,6 +396,14 @@ if (!commit2 || parse_commit(commit2)) {

cgit_print_error("Bad commit: %s", sha1_to_hex(old_rev_sha1)); return; } + } + + if (raw) { + ctx.page.mimetype = "text/plain"; + cgit_print_http_headers(&ctx); + cgit_diff_tree(old_rev_sha1, new_rev_sha1, filepair_cb_raw, + prefix, 0); + return; } use_ssdiff = ctx.qry.has_ssdiff ? ctx.qry.ssdiff : ctx.cfg.ssdiff;
M ui-diff.hui-diff.h

@@ -4,7 +4,7 @@

extern void cgit_print_diff_ctrls(); extern void cgit_print_diff(const char *new_hex, const char *old_hex, - const char *prefix, int show_ctrls); + const char *prefix, int show_ctrls, int raw); extern struct diff_filespec *cgit_get_current_old_file(void); extern struct diff_filespec *cgit_get_current_new_file(void);