Commit c9d2b2638181862042c8d712cf7bf4977fea15e2
2020-11-11T11:09:51
make gotweb compile with the new diff implementation
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
diff --git a/gotweb/Makefile b/gotweb/Makefile
index 86cf8bc..4863764 100644
--- a/gotweb/Makefile
+++ b/gotweb/Makefile
@@ -11,7 +11,10 @@ SRCS = gotweb.c parse.y blame.c commit_graph.c delta.c diff.c \
object_idset.c object_parse.c opentemp.c path.c pack.c \
privsep.c reference.c repository.c sha1.c worktree.c \
inflate.c buf.c rcsutil.c diff3.c lockfile.c \
- deflate.c object_create.c delta_cache.c gotconfig.c
+ deflate.c object_create.c delta_cache.c gotconfig.c \
+ diff_main.c diff_atomize_text.c diff_myers.c diff_output.c \
+ diff_output_plain.c diff_output_unidiff.c \
+ diff_output_edscript.c diff_patience.c
MAN = ${PROG}.conf.5 ${PROG}.8
CPPFLAGS += -I${.CURDIR}/../include -I${.CURDIR}/../lib -I${.CURDIR} \
diff --git a/gotweb/gotweb.c b/gotweb/gotweb.c
index 1c534e6..6bf2683 100644
--- a/gotweb/gotweb.c
+++ b/gotweb/gotweb.c
@@ -2869,15 +2869,15 @@ gw_output_diff(struct gw_trans *gw_trans, struct gw_header *header)
goto done;
switch (obj_type) {
case GOT_OBJ_TYPE_BLOB:
- error = got_diff_objects_as_blobs(id1, id2, NULL, NULL, 3, 0,
- gw_trans->repo, f);
+ error = got_diff_objects_as_blobs(NULL, NULL, id1, id2,
+ NULL, NULL, 3, 0, gw_trans->repo, f);
break;
case GOT_OBJ_TYPE_TREE:
- error = got_diff_objects_as_trees(id1, id2, "", "", 3, 0,
- gw_trans->repo, f);
+ error = got_diff_objects_as_trees(NULL, NULL, id1, id2,
+ "", "", 3, 0, gw_trans->repo, f);
break;
case GOT_OBJ_TYPE_COMMIT:
- error = got_diff_objects_as_commits(id1, id2, 3, 0,
+ error = got_diff_objects_as_commits(NULL, NULL, id1, id2, 3, 0,
gw_trans->repo, f);
break;
default: