Blame

Date:
Message:
merge new diff implementation from the git.gameoftrees.org diff.git repository This new diff implementation was started by Neels Hofmeyr during the u2k20 hackathon and now replaces diffreg.c code lifted from the OpenBSD base system. The integration of this code into Got was done by me. Got now uses the patience diff algorithm by default. The diff.git repository will remain the primary repository for the diff code, which already compiles and runs on other operating systems such as Linux. Any fixes and improvements for files inherited from the diff.git repository should be written against that repository and synced to got.git afterwards.
Actions:
History | Blob | Raw File
 1 f42b1b34 2018-03-12 stsp .PATH:${.CURDIR}/../lib

 2 5c860e29 2018-03-12 stsp 

 3 53ccebc2 2019-07-30 stsp .include "../got-version.mk"

 4 53ccebc2 2019-07-30 stsp 

 5 5c860e29 2018-03-12 stsp PROG=		got

 6 4c9641fd 2019-08-21 stsp SRCS=		got.c blame.c commit_graph.c delta.c diff.c \

 7 6bef87be 2018-09-11 stsp 		diffreg.c error.c fileindex.c object.c object_cache.c \

 8 25a58941 2019-01-08 stsp 		object_idset.c object_parse.c opentemp.c path.c pack.c \

 9 25a58941 2019-01-08 stsp 		privsep.c reference.c repository.c sha1.c worktree.c \

10 96cbb597 2019-10-09 stsp 		inflate.c buf.c rcsutil.c diff3.c lockfile.c \

11 50b0790e 2020-09-11 stsp 		deflate.c object_create.c delta_cache.c fetch.c \

12 fe621944 2020-11-10 stsp 		gotconfig.c diff_main.c diff_atomize_text.c \

13 fe621944 2020-11-10 stsp 		diff_myers.c diff_output.c diff_output_plain.c \

14 fe621944 2020-11-10 stsp 		diff_output_unidiff.c diff_output_edscript.c \

15 fe621944 2020-11-10 stsp 		diff_patience.c

16 fe621944 2020-11-10 stsp 

17 0f43fed9 2020-09-14 stsp MAN =		${PROG}.1 got-worktree.5 git-repository.5 got.conf.5

18 5c860e29 2018-03-12 stsp 

19 53ccebc2 2019-07-30 stsp CPPFLAGS = -I${.CURDIR}/../include -I${.CURDIR}/../lib

20 37c06ea4 2019-07-15 stsp 

21 37c06ea4 2019-07-15 stsp .if defined(PROFILE)

22 37c06ea4 2019-07-15 stsp LDADD = -lutil_p -lz_p -lc_p

23 37c06ea4 2019-07-15 stsp .else

24 f42b1b34 2018-03-12 stsp LDADD = -lutil -lz

25 37c06ea4 2019-07-15 stsp .endif

26 f42b1b34 2018-03-12 stsp DPADD = ${LIBZ} ${LIBUTIL}

27 5c860e29 2018-03-12 stsp 

28 53ccebc2 2019-07-30 stsp .if ${GOT_RELEASE} != "Yes"

29 f42b1b34 2018-03-12 stsp NOMAN = Yes

30 53ccebc2 2019-07-30 stsp .endif

31 f42b1b34 2018-03-12 stsp 

32 53ccebc2 2019-07-30 stsp realinstall:

33 53ccebc2 2019-07-30 stsp 	${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} \

34 53ccebc2 2019-07-30 stsp 	-m ${BINMODE} ${PROG} ${BINDIR}/${PROG}

35 53ccebc2 2019-07-30 stsp 

36 53ccebc2 2019-07-30 stsp dist:

37 53ccebc2 2019-07-30 stsp 	mkdir ../got-${GOT_VERSION}/got

38 53ccebc2 2019-07-30 stsp 	cp ${SRCS} ${MAN} ../got-${GOT_VERSION}/got

39 53ccebc2 2019-07-30 stsp 

40 5c860e29 2018-03-12 stsp .include <bsd.prog.mk>