count-delta: no need for this anymore.

This is a companion patch to e29e1147e485654d90a0ea0fd5fb7151bb194265
which made diffcore similarity estimator independent from the packfile
deltifier.  There is no reason for us to be counting the xdelta anymore.

Signed-off-by: Junio C Hamano <junkio@cox.net>

diff --git a/Makefile b/Makefile
index b6d8804d4b0cac60d1dd4943c5b9a791f26e006f..ab2890d6388ac62a017f5a774670798b0383cc7f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -190,7 +190,7 @@ PYMODULES = \
 LIB_FILE=libgit.a
 
 LIB_H = \
-       blob.h cache.h commit.h count-delta.h csum-file.h delta.h \
+       blob.h cache.h commit.h csum-file.h delta.h \
        diff.h object.h pack.h pkt-line.h quote.h refs.h \
        run-command.h strbuf.h tag.h tree.h git-compat-util.h revision.h
 
@@ -200,7 +200,7 @@ DIFF_OBJS = \
        diffcore-delta.o
 
 LIB_OBJS = \
-       blob.o commit.o connect.o count-delta.o csum-file.o \
+       blob.o commit.o connect.o csum-file.o \
        date.o diff-delta.o entry.o exec_cmd.o ident.o index.o \
        object.o pack-check.o patch-delta.o path.o pkt-line.o \
        quote.o read-cache.o refs.o run-command.o \

diff --git a/count-delta.c b/count-delta.c
deleted file mode 100644 (file)
index 058a2aa..0000000
--- a/count-delta.c
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2005 Junio C Hamano
- * The delta-parsing part is almost straight copy of patch-delta.c
- * which is (C) 2005 Nicolas Pitre <nico@cam.org>.
- */
-#include <stdlib.h>
-#include <string.h>
-#include <limits.h>
-#include "delta.h"
-#include "count-delta.h"
-
-/*
- * NOTE.  We do not _interpret_ delta fully.  As an approximation, we
- * just count the number of bytes that are copied from the source, and
- * the number of literal data bytes that are inserted.
- *
- * Number of bytes that are _not_ copied from the source is deletion,
- * and number of inserted literal bytes are addition, so sum of them
- * is the extent of damage.
- */
-int count_delta(void *delta_buf, unsigned long delta_size,
-               unsigned long *src_copied, unsigned long *literal_added)
-{
-       unsigned long copied_from_source, added_literal;
-       const unsigned char *data, *top;
-       unsigned char cmd;
-       unsigned long src_size, dst_size, out;
-
-       if (delta_size < DELTA_SIZE_MIN)
-               return -1;
-
-       data = delta_buf;
-       top = delta_buf + delta_size;
-
-       src_size = get_delta_hdr_size(&data);
-       dst_size = get_delta_hdr_size(&data);
-
-       added_literal = copied_from_source = out = 0;
-       while (data < top) {
-               cmd = *data++;
-               if (cmd & 0x80) {
-                       unsigned long cp_off = 0, cp_size = 0;
-                       if (cmd & 0x01) cp_off = *data++;
-                       if (cmd & 0x02) cp_off |= (*data++ << 8);
-                       if (cmd & 0x04) cp_off |= (*data++ << 16);
-                       if (cmd & 0x08) cp_off |= (*data++ << 24);
-                       if (cmd & 0x10) cp_size = *data++;
-                       if (cmd & 0x20) cp_size |= (*data++ << 8);
-                       if (cmd & 0x40) cp_size |= (*data++ << 16);
-                       if (cp_size == 0) cp_size = 0x10000;
-
-                       copied_from_source += cp_size;
-                       out += cp_size;
-               } else {
-                       /* write literal into dst */
-                       added_literal += cmd;
-                       out += cmd;
-                       data += cmd;
-               }
-       }
-
-       /* sanity check */
-       if (data != top || out != dst_size)
-               return -1;
-
-       /* delete size is what was _not_ copied from source.
-        * edit size is that and literal additions.
-        */
-       *src_copied = copied_from_source;
-       *literal_added = added_literal;
-       return 0;
-}

diff --git a/count-delta.h b/count-delta.h
deleted file mode 100644 (file)
index 7359629..0000000
--- a/count-delta.h
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright (C) 2005 Junio C Hamano
- */
-#ifndef COUNT_DELTA_H
-#define COUNT_DELTA_H
-
-int count_delta(void *, unsigned long,
-               unsigned long *src_copied, unsigned long *literal_added);
-
-#endif