427dcb4bca
This introduces the diff-core, the layer between the diff-tree family and the external diff interface engine. The calls to the interface diff-tree family uses (diff_change and diff_addremove) have not changed and will not change. The purpose of the diff-core layer is to provide an infrastructure to transform the set of differences sent from the applications, before sending them to the external diff interface. The recently introduced rename detection code has been rewritten to use the diff-core facility. When applications send in separate creates and deletes, matching ones are transformed into a single rename-and-edit diff, and sent out to the external diff interface as such. This patch also enhances the rename detection code further to be able to detect copies. Currently this happens only as long as copy sources appear as part of the modified files, but there already is enough provision for callers to report unmodified files to diff-core, so that they can be also used as copy source candidates. Extending the callers this way will be done in a separate patch. Please see and marvel at how well this works by trying out the newly added t/t4003-diff-rename-1.sh test script. Signed-off-by: Junio C Hamano <junkio@cox.net> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
137 lines
3.5 KiB
Makefile
137 lines
3.5 KiB
Makefile
# -DCOLLISION_CHECK if you believe that SHA1's
|
|
# 1461501637330902918203684832716283019655932542976 hashes do not give you
|
|
# enough guarantees about no collisions between objects ever hapenning.
|
|
#
|
|
# -DNSEC if you want git to care about sub-second file mtimes and ctimes.
|
|
# Note that you need some new glibc (at least >2.2.4) for this, and it will
|
|
# BREAK YOUR LOCAL DIFFS! show-diff and anything using it will likely randomly
|
|
# break unless your underlying filesystem supports those sub-second times
|
|
# (my ext3 doesn't).
|
|
COPTS=-O2
|
|
CFLAGS=-g $(COPTS) -Wall
|
|
|
|
prefix=$(HOME)
|
|
bin=$(prefix)/bin
|
|
# dest=
|
|
|
|
CC=gcc
|
|
AR=ar
|
|
INSTALL=install
|
|
|
|
SCRIPTS=git-apply-patch-script git-merge-one-file-script git-prune-script \
|
|
git-pull-script git-tag-script git-resolve-script git-whatchanged \
|
|
git-deltafy-script
|
|
|
|
PROG= git-update-cache git-diff-files git-init-db git-write-tree \
|
|
git-read-tree git-commit-tree git-cat-file git-fsck-cache \
|
|
git-checkout-cache git-diff-tree git-rev-tree git-ls-files \
|
|
git-check-files git-ls-tree git-merge-base git-merge-cache \
|
|
git-unpack-file git-export git-diff-cache git-convert-cache \
|
|
git-http-pull git-rpush git-rpull git-rev-list git-mktag \
|
|
git-diff-helper git-tar-tree git-local-pull git-write-blob \
|
|
git-get-tar-commit-id git-mkdelta
|
|
|
|
all: $(PROG)
|
|
|
|
install: $(PROG) $(SCRIPTS)
|
|
$(INSTALL) $(PROG) $(SCRIPTS) $(dest)$(bin)
|
|
|
|
LIB_OBJS=read-cache.o sha1_file.o usage.o object.o commit.o tree.o blob.o \
|
|
tag.o delta.o date.o index.o diff-delta.o patch-delta.o
|
|
LIB_FILE=libgit.a
|
|
LIB_H=cache.h object.h blob.h tree.h commit.h tag.h delta.h
|
|
|
|
LIB_H += strbuf.h
|
|
LIB_OBJS += strbuf.o
|
|
|
|
LIB_H += diff.h
|
|
LIB_OBJS += diff.o diffcore-rename.o
|
|
|
|
LIB_OBJS += gitenv.o
|
|
|
|
LIBS = $(LIB_FILE)
|
|
LIBS += -lz
|
|
|
|
ifdef MOZILLA_SHA1
|
|
SHA1_HEADER="mozilla-sha1/sha1.h"
|
|
LIB_OBJS += mozilla-sha1/sha1.o
|
|
else
|
|
ifdef PPC_SHA1
|
|
SHA1_HEADER="ppc/sha1.h"
|
|
LIB_OBJS += ppc/sha1.o ppc/sha1ppc.o
|
|
else
|
|
SHA1_HEADER=<openssl/sha.h>
|
|
LIBS += -lcrypto
|
|
endif
|
|
endif
|
|
|
|
CFLAGS += '-DSHA1_HEADER=$(SHA1_HEADER)'
|
|
|
|
$(LIB_FILE): $(LIB_OBJS)
|
|
$(AR) rcs $@ $(LIB_OBJS)
|
|
|
|
test-date: test-date.c date.o
|
|
$(CC) $(CFLAGS) -o $@ test-date.c date.o
|
|
|
|
test-delta: test-delta.c diff-delta.o patch-delta.o
|
|
$(CC) $(CFLAGS) -o $@ $^
|
|
|
|
git-%: %.c $(LIB_FILE)
|
|
$(CC) $(CFLAGS) -o $@ $(filter %.c,$^) $(LIBS)
|
|
|
|
git-update-cache: update-cache.c
|
|
git-diff-files: diff-files.c
|
|
git-init-db: init-db.c
|
|
git-write-tree: write-tree.c
|
|
git-read-tree: read-tree.c
|
|
git-commit-tree: commit-tree.c
|
|
git-cat-file: cat-file.c
|
|
git-fsck-cache: fsck-cache.c
|
|
git-checkout-cache: checkout-cache.c
|
|
git-diff-tree: diff-tree.c
|
|
git-rev-tree: rev-tree.c
|
|
git-ls-files: ls-files.c
|
|
git-check-files: check-files.c
|
|
git-ls-tree: ls-tree.c
|
|
git-merge-base: merge-base.c
|
|
git-merge-cache: merge-cache.c
|
|
git-unpack-file: unpack-file.c
|
|
git-export: export.c
|
|
git-diff-cache: diff-cache.c
|
|
git-convert-cache: convert-cache.c
|
|
git-http-pull: http-pull.c pull.c
|
|
git-local-pull: local-pull.c pull.c
|
|
git-rpush: rsh.c
|
|
git-rpull: rsh.c pull.c
|
|
git-rev-list: rev-list.c
|
|
git-mktag: mktag.c
|
|
git-diff-helper: diff-helper.c
|
|
git-tar-tree: tar-tree.c
|
|
git-write-blob: write-blob.c
|
|
git-mkdelta: mkdelta.c
|
|
|
|
git-http-pull: LIBS += -lcurl
|
|
|
|
# Library objects..
|
|
blob.o: $(LIB_H)
|
|
tree.o: $(LIB_H)
|
|
commit.o: $(LIB_H)
|
|
tag.o: $(LIB_H)
|
|
object.o: $(LIB_H)
|
|
read-cache.o: $(LIB_H)
|
|
sha1_file.o: $(LIB_H)
|
|
usage.o: $(LIB_H)
|
|
strbuf.o: $(LIB_H)
|
|
gitenv.o: $(LIB_H)
|
|
diff.o: $(LIB_H)
|
|
diffcore-rename.o : $(LIB_H)
|
|
|
|
test: all
|
|
make -C t/ all
|
|
|
|
clean:
|
|
rm -f *.o mozilla-sha1/*.o ppc/*.o $(PROG) $(LIB_FILE)
|
|
|
|
backup: clean
|
|
cd .. ; tar czvf dircache.tar.gz dir-cache
|