git-svn: fix tests to work with older svn

diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 01e6765e3dd584c582211061427c9218fc683ae4..1b899f32c4b7c3f00c5310a161d0d9afd459f002 100644 (file)
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -29,16 +29,34 @@
 
 
 
+long xdl_bogosqrt(long n) {
+       long i;
+
+       /*
+        * Classical integer square root approximation using shifts.
+        */
+       for (i = 1; n > 0; n >>= 2)
+               i <<= 1;
+
+       return i;
+}
+
+
 int xdl_emit_diffrec(char const *rec, long size, char const *pre, long psize,
                     xdemitcb_t *ecb) {
-       mmbuffer_t mb[2];
+       int i = 2;
+       mmbuffer_t mb[3];
 
        mb[0].ptr = (char *) pre;
        mb[0].size = psize;
        mb[1].ptr = (char *) rec;
        mb[1].size = size;
-
-       if (ecb->outf(ecb->priv, mb, 2) < 0) {
+       if (size > 0 && rec[size - 1] != '\n') {
+               mb[2].ptr = (char *) "\n\\ No newline at end of file\n";
+               mb[2].size = strlen(mb[2].ptr);
+               i++;
+       }
+       if (ecb->outf(ecb->priv, mb, i) < 0) {
 
                return -1;
        }
@@ -168,12 +186,57 @@ long xdl_guess_lines(mmfile_t *mf) {
        return nl + 1;
 }
 
+int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
+{
+       int i1, i2;
+
+       if (flags & XDF_IGNORE_WHITESPACE) {
+               for (i1 = i2 = 0; i1 < s1 && i2 < s2; ) {
+                       if (isspace(l1[i1]))
+                               while (isspace(l1[i1]) && i1 < s1)
+                                       i1++;
+                       if (isspace(l2[i2]))
+                               while (isspace(l2[i2]) && i2 < s2)
+                                       i2++;
+                       if (i1 < s1 && i2 < s2 && l1[i1++] != l2[i2++])
+                               return 0;
+               }
+               return (i1 >= s1 && i2 >= s2);
+       } else if (flags & XDF_IGNORE_WHITESPACE_CHANGE) {
+               for (i1 = i2 = 0; i1 < s1 && i2 < s2; ) {
+                       if (isspace(l1[i1])) {
+                               if (!isspace(l2[i2]))
+                                       return 0;
+                               while (isspace(l1[i1]) && i1 < s1)
+                                       i1++;
+                               while (isspace(l2[i2]) && i2 < s2)
+                                       i2++;
+                       } else if (l1[i1++] != l2[i2++])
+                               return 0;
+               }
+               return (i1 >= s1 && i2 >= s2);
+       } else
+               return s1 == s2 && !memcmp(l1, l2, s1);
 
-unsigned long xdl_hash_record(char const **data, char const *top) {
+       return 0;
+}
+
+unsigned long xdl_hash_record(char const **data, char const *top, long flags) {
        unsigned long ha = 5381;
        char const *ptr = *data;
 
        for (; ptr < top && *ptr != '\n'; ptr++) {
+               if (isspace(*ptr) && (flags & XDF_WHITESPACE_FLAGS)) {
+                       while (ptr + 1 < top && isspace(ptr[1])
+                                       && ptr[1] != '\n')
+                               ptr++;
+                       if (flags & XDF_IGNORE_WHITESPACE_CHANGE
+                                       && ptr[1] != '\n') {
+                               ha += (ha << 5);
+                               ha ^= (unsigned long) ' ';
+                       }
+                       continue;
+               }
                ha += (ha << 5);
                ha ^= (unsigned long) *ptr;
        }
@@ -227,7 +290,8 @@ long xdl_atol(char const *str, char const **next) {
 }
 
 
-int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2, xdemitcb_t *ecb) {
+int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2,
+                     const char *func, long funclen, xdemitcb_t *ecb) {
        int nb = 0;
        mmbuffer_t mb;
        char buf[128];
@@ -235,25 +299,37 @@ int xdl_emit_hunk_hdr(long s1, long c1, long s2, long c2, xdemitcb_t *ecb) {
        memcpy(buf, "@@ -", 4);
        nb += 4;
 
-       nb += xdl_num_out(buf + nb, c1 ? s1: 0);
+       nb += xdl_num_out(buf + nb, c1 ? s1: s1 - 1);
 
-       memcpy(buf + nb, ",", 1);
-       nb += 1;
+       if (c1 != 1) {
+               memcpy(buf + nb, ",", 1);
+               nb += 1;
 
-       nb += xdl_num_out(buf + nb, c1);
+               nb += xdl_num_out(buf + nb, c1);
+       }
 
        memcpy(buf + nb, " +", 2);
        nb += 2;
 
-       nb += xdl_num_out(buf + nb, c2 ? s2: 0);
+       nb += xdl_num_out(buf + nb, c2 ? s2: s2 - 1);
 
-       memcpy(buf + nb, ",", 1);
-       nb += 1;
+       if (c2 != 1) {
+               memcpy(buf + nb, ",", 1);
+               nb += 1;
 
-       nb += xdl_num_out(buf + nb, c2);
+               nb += xdl_num_out(buf + nb, c2);
+       }
 
-       memcpy(buf + nb, " @@\n", 4);
-       nb += 4;
+       memcpy(buf + nb, " @@", 3);
+       nb += 3;
+       if (func && funclen) {
+               buf[nb++] = ' ';
+               if (funclen > sizeof(buf) - nb - 1)
+                       funclen = sizeof(buf) - nb - 1;
+               memcpy(buf + nb, func, funclen);
+               nb += funclen;
+       }
+       buf[nb++] = '\n';
 
        mb.ptr = buf;
        mb.size = nb;