Changeset 782 for git/branches/dmik/xdiff/xdiffi.c

Timestamp:

Jun 23, 2014, 9:45:51 PM (11 years ago)

Author:

dmik

Message:

git: Merge version 2.0.0 from vendor to dmik branch.

Location:

git/branches/dmik

Files:

• . (modified) (1 prop)
• xdiff/xdiffi.c (modified) (6 diffs)

git/branches/dmik/xdiff/xdiffi.c ¶

@@ -329 +329 @@
         diffdata_t dd1, dd2;
 
-        if (xpp->flags & XDF_PATIENCE_DIFF)
+        if (XDF_DIFF_ALG(xpp->flags) == XDF_PATIENCE_DIFF)
                 return xdl_do_patience_diff(mf1, mf2, xpp, xe);
 
-        if (xpp->flags & XDF_HISTOGRAM_DIFF)
+        if (XDF_DIFF_ALG(xpp->flags) == XDF_HISTOGRAM_DIFF)
                 return xdl_do_histogram_diff(mf1, mf2, xpp, xe);
 
@@ -395 +395 @@
         xch->chg1 = chg1;
         xch->chg2 = chg2;
+        xch->ignore = 0;
 
         return xch;
@@ -491 +492 @@
                 /*
                  * Try to move back the possibly merged group of changes, to match
-                 * the recorded postion in the other file.
+                 * the recorded position in the other file.
                  */
                 while (ixref < ix) {
@@ -539 +540 @@
 }
 
+static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
+                              xdemitconf_t const *xecfg)
+{
+        xdchange_t *xch, *xche;
+
+        for (xch = xscr; xch; xch = xche->next) {
+                xche = xdl_get_hunk(&xch, xecfg);
+                if (!xch)
+                        break;
+                if (xecfg->hunk_func(xch->i1, xche->i1 + xche->chg1 - xch->i1,
+                                     xch->i2, xche->i2 + xche->chg2 - xch->i2,
+                                     ecb->priv) < 0)
+                        return -1;
+        }
+        return 0;
+}
+
+static void xdl_mark_ignorable(xdchange_t *xscr, xdfenv_t *xe, long flags)
+{
+        xdchange_t *xch;
+
+        for (xch = xscr; xch; xch = xch->next) {
+                int ignore = 1;
+                xrecord_t **rec;
+                long i;
+
+                rec = &xe->xdf1.recs[xch->i1];
+                for (i = 0; i < xch->chg1 && ignore; i++)
+                        ignore = xdl_blankline(rec[i]->ptr, rec[i]->size, flags);
+
+                rec = &xe->xdf2.recs[xch->i2];
+                for (i = 0; i < xch->chg2 && ignore; i++)
+                        ignore = xdl_blankline(rec[i]->ptr, rec[i]->size, flags);
+
+                xch->ignore = ignore;
+        }
+}
 
 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
@@ -544 +582 @@
         xdchange_t *xscr;
         xdfenv_t xe;
-        emit_func_t ef = xecfg->emit_func ?
-                (emit_func_t)xecfg->emit_func : xdl_emit_diff;
+        emit_func_t ef = xecfg->hunk_func ? xdl_call_hunk_func : xdl_emit_diff;
 
         if (xdl_do_diff(mf1, mf2, xpp, &xe) < 0) {
@@ -559 +596 @@
         }
         if (xscr) {
+                if (xpp->flags & XDF_IGNORE_BLANK_LINES)
+                        xdl_mark_ignorable(xscr, &xe, xpp->flags);
+
                 if (ef(&xe, xscr, ecb, xecfg) < 0) {