xdiff / xemit.con commit Cumulative update of merge-recursive in C (3af244c)
   1/*
   2 *  LibXDiff by Davide Libenzi ( File Differential Library )
   3 *  Copyright (C) 2003  Davide Libenzi
   4 *
   5 *  This library is free software; you can redistribute it and/or
   6 *  modify it under the terms of the GNU Lesser General Public
   7 *  License as published by the Free Software Foundation; either
   8 *  version 2.1 of the License, or (at your option) any later version.
   9 *
  10 *  This library is distributed in the hope that it will be useful,
  11 *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  13 *  Lesser General Public License for more details.
  14 *
  15 *  You should have received a copy of the GNU Lesser General Public
  16 *  License along with this library; if not, write to the Free Software
  17 *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  18 *
  19 *  Davide Libenzi <davidel@xmailserver.org>
  20 *
  21 */
  22
  23#include "xinclude.h"
  24
  25
  26
  27
  28static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec);
  29static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb);
  30static xdchange_t *xdl_get_hunk(xdchange_t *xscr, xdemitconf_t const *xecfg);
  31
  32
  33
  34
  35static long xdl_get_rec(xdfile_t *xdf, long ri, char const **rec) {
  36
  37        *rec = xdf->recs[ri]->ptr;
  38
  39        return xdf->recs[ri]->size;
  40}
  41
  42
  43static int xdl_emit_record(xdfile_t *xdf, long ri, char const *pre, xdemitcb_t *ecb) {
  44        long size, psize = strlen(pre);
  45        char const *rec;
  46
  47        size = xdl_get_rec(xdf, ri, &rec);
  48        if (xdl_emit_diffrec(rec, size, pre, psize, ecb) < 0) {
  49
  50                return -1;
  51        }
  52
  53        return 0;
  54}
  55
  56
  57/*
  58 * Starting at the passed change atom, find the latest change atom to be included
  59 * inside the differential hunk according to the specified configuration.
  60 */
  61static xdchange_t *xdl_get_hunk(xdchange_t *xscr, xdemitconf_t const *xecfg) {
  62        xdchange_t *xch, *xchp;
  63
  64        for (xchp = xscr, xch = xscr->next; xch; xchp = xch, xch = xch->next)
  65                if (xch->i1 - (xchp->i1 + xchp->chg1) > 2 * xecfg->ctxlen)
  66                        break;
  67
  68        return xchp;
  69}
  70
  71
  72static void xdl_find_func(xdfile_t *xf, long i, char *buf, long sz, long *ll) {
  73
  74        /*
  75         * Be quite stupid about this for now.  Find a line in the old file
  76         * before the start of the hunk (and context) which starts with a
  77         * plausible character.
  78         */
  79
  80        const char *rec;
  81        long len;
  82
  83        *ll = 0;
  84        while (i-- > 0) {
  85                len = xdl_get_rec(xf, i, &rec);
  86                if (len > 0 &&
  87                    (isalpha((unsigned char)*rec) || /* identifier? */
  88                     *rec == '_' ||     /* also identifier? */
  89                     *rec == '(' ||     /* lisp defun? */
  90                     *rec == '#')) {    /* #define? */
  91                        if (len > sz)
  92                                len = sz;
  93                        if (len && rec[len - 1] == '\n')
  94                                len--;
  95                        memcpy(buf, rec, len);
  96                        *ll = len;
  97                        return;
  98                }
  99        }
 100}
 101
 102
 103int xdl_emit_common(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 104                    xdemitconf_t const *xecfg) {
 105        xdfile_t *xdf = &xe->xdf1;
 106        const char *rchg = xdf->rchg;
 107        long ix;
 108
 109        for (ix = 0; ix < xdf->nrec; ix++) {
 110                if (rchg[ix])
 111                        continue;
 112                if (xdl_emit_record(xdf, ix, "", ecb))
 113                        return -1;
 114        }
 115        return 0;
 116}
 117
 118int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
 119                  xdemitconf_t const *xecfg) {
 120        long s1, s2, e1, e2, lctx;
 121        xdchange_t *xch, *xche;
 122        char funcbuf[40];
 123        long funclen = 0;
 124
 125        if (xecfg->flags & XDL_EMIT_COMMON)
 126                return xdl_emit_common(xe, xscr, ecb, xecfg);
 127
 128        for (xch = xche = xscr; xch; xch = xche->next) {
 129                xche = xdl_get_hunk(xch, xecfg);
 130
 131                s1 = XDL_MAX(xch->i1 - xecfg->ctxlen, 0);
 132                s2 = XDL_MAX(xch->i2 - xecfg->ctxlen, 0);
 133
 134                lctx = xecfg->ctxlen;
 135                lctx = XDL_MIN(lctx, xe->xdf1.nrec - (xche->i1 + xche->chg1));
 136                lctx = XDL_MIN(lctx, xe->xdf2.nrec - (xche->i2 + xche->chg2));
 137
 138                e1 = xche->i1 + xche->chg1 + lctx;
 139                e2 = xche->i2 + xche->chg2 + lctx;
 140
 141                /*
 142                 * Emit current hunk header.
 143                 */
 144
 145                if (xecfg->flags & XDL_EMIT_FUNCNAMES) {
 146                        xdl_find_func(&xe->xdf1, s1, funcbuf,
 147                                      sizeof(funcbuf), &funclen);
 148                }
 149                if (xdl_emit_hunk_hdr(s1 + 1, e1 - s1, s2 + 1, e2 - s2,
 150                                      funcbuf, funclen, ecb) < 0)
 151                        return -1;
 152
 153                /*
 154                 * Emit pre-context.
 155                 */
 156                for (; s1 < xch->i1; s1++)
 157                        if (xdl_emit_record(&xe->xdf1, s1, " ", ecb) < 0)
 158                                return -1;
 159
 160                for (s1 = xch->i1, s2 = xch->i2;; xch = xch->next) {
 161                        /*
 162                         * Merge previous with current change atom.
 163                         */
 164                        for (; s1 < xch->i1 && s2 < xch->i2; s1++, s2++)
 165                                if (xdl_emit_record(&xe->xdf1, s1, " ", ecb) < 0)
 166                                        return -1;
 167
 168                        /*
 169                         * Removes lines from the first file.
 170                         */
 171                        for (s1 = xch->i1; s1 < xch->i1 + xch->chg1; s1++)
 172                                if (xdl_emit_record(&xe->xdf1, s1, "-", ecb) < 0)
 173                                        return -1;
 174
 175                        /*
 176                         * Adds lines from the second file.
 177                         */
 178                        for (s2 = xch->i2; s2 < xch->i2 + xch->chg2; s2++)
 179                                if (xdl_emit_record(&xe->xdf2, s2, "+", ecb) < 0)
 180                                        return -1;
 181
 182                        if (xch == xche)
 183                                break;
 184                        s1 = xch->i1 + xch->chg1;
 185                        s2 = xch->i2 + xch->chg2;
 186                }
 187
 188                /*
 189                 * Emit post-context.
 190                 */
 191                for (s1 = xche->i1 + xche->chg1; s1 < e1; s1++)
 192                        if (xdl_emit_record(&xe->xdf1, s1, " ", ecb) < 0)
 193                                return -1;
 194        }
 195
 196        return 0;
 197}
 198