This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2575

xdiff: add a bdiff hunk mode
ClosedPublic

Authored by ryanmce on Mar 2 2018, 7:25 PM.

Details

Reviewers
indygreg
durin42
Group Reviewers
hg-reviewers
Commits
rHGb3c9c483cac9: xdiff: add a bdiff hunk mode
rHG3c56c4d26527: xdiff: add a bdiff hunk mode
Summary

xdiff generated hunks for the differences (ex. questionmarks in the
@@ -?,? +?,? @@ part from diff --git output). However, bdiff generates
matched hunks instead.

This patch adds a XDL_EMIT_BDIFFHUNK flag used by the output function
xdl_call_hunk_func. Once set, xdiff will generate bdiff-like hunks
instead. That makes it easier to use xdiff as a drop-in replacement of bdiff.

Note that since bdiff('', '') returns [(0, 0, 0, 0)], the shortcut path
if (xscr) is removed. I have checked functions called with xscr argument
(xdl_mark_ignorable, xdl_call_hunk_func, xdl_emit_diff,
xdl_free_script) work just fine with xscr = NULL.

Test Plan

Will be tested in a later patch.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

ryanmce created this revision.Mar 2 2018, 7:25 PM
quark edited the summary of this revision. (Show Details)Mar 3 2018, 3:07 PM
quark added a child revision: D2601: xdiff: reduce indent heuristic overhead.
quark updated this revision to Diff 6457.
quark updated this revision to Diff 6474.Mar 3 2018, 3:30 PM
quark edited the test plan for this revision. (Show Details)Mar 3 2018, 3:39 PM
indygreg accepted this revision.Mar 3 2018, 3:57 PM
This revision is now accepted and ready to land.Mar 3 2018, 3:57 PM
durin42 accepted this revision.Mar 3 2018, 6:12 PM
Closed by commit rHG3c56c4d26527: xdiff: add a bdiff hunk mode (authored by quark). · Explain WhyMar 3 2018, 6:40 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6514

mercurial/thirdparty/xdiff/xdiff.h

#define XDF_IGNORE_BLANK_LINES (1 << 7) #define XDF_IGNORE_BLANK_LINES (1 << 7)
#define XDF_INDENT_HEURISTIC (1 << 23) #define XDF_INDENT_HEURISTIC (1 << 23)
/* xdemitconf_t.flags */ /* xdemitconf_t.flags */
#define XDL_EMIT_FUNCNAMES (1 << 0) #define XDL_EMIT_FUNCNAMES (1 << 0)
#define XDL_EMIT_FUNCCONTEXT (1 << 2) #define XDL_EMIT_FUNCCONTEXT (1 << 2)
/* emit bdiff-style "matched" (a1, a2, b1, b2) hunks instead of "different"
* (a1, a2 - a1, b1, b2 - b1) hunks */
#define XDL_EMIT_BDIFFHUNK (1 << 4)
#define XDL_MMB_READONLY (1 << 0) #define XDL_MMB_READONLY (1 << 0)
#define XDL_MMF_ATOMIC (1 << 0) #define XDL_MMF_ATOMIC (1 << 0)
#define XDL_BDOP_INS 1 #define XDL_BDOP_INS 1
#define XDL_BDOP_CPY 2 #define XDL_BDOP_CPY 2
#define XDL_BDOP_INSB 3 #define XDL_BDOP_INSB 3

mercurial/thirdparty/xdiff/xdiffi.c

xdl_free(xch); xdl_free(xch);
} }
} }
static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb, static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
xdemitconf_t const *xecfg) xdemitconf_t const *xecfg)
{ {
xdchange_t *xch, *xche; xdchange_t *xch, *xche;
if ((xecfg->flags & XDL_EMIT_BDIFFHUNK) != 0) {
long i1 = 0, i2 = 0, n1 = xe->xdf1.nrec, n2 = xe->xdf2.nrec;
for (xch = xscr; xch; xch = xche->next) { for (xch = xscr; xch; xch = xche->next) {
xche = xdl_get_hunk(&xch, xecfg); xche = xdl_get_hunk(&xch, xecfg);
if (!xch) if (!xch)
break; break;
if (xecfg->hunk_func(xch->i1, xche->i1 + xche->chg1 - xch->i1, if (xch->i1 > i1 || xch->i2 > i2) {
if (xecfg->hunk_func(i1, xch->i1, i2, xch->i2, ecb->priv) < 0)
return -1;
}
i1 = xche->i1 + xche->chg1;
i2 = xche->i2 + xche->chg2;
}
if (xecfg->hunk_func(i1, n1, i2, n2, ecb->priv) < 0)
return -1;
} else {
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, xch->i2, xche->i2 + xche->chg2 - xch->i2,
ecb->priv) < 0) ecb->priv) < 0)
return -1; return -1;
} }
}
return 0; return 0;
} }
static void xdl_mark_ignorable(xdchange_t *xscr, xdfenv_t *xe, long flags) static void xdl_mark_ignorable(xdchange_t *xscr, xdfenv_t *xe, long flags)
{ {
xdchange_t *xch; xdchange_t *xch;
for (xch = xscr; xch; xch = xch->next) { for (xch = xscr; xch; xch = xch->next) {
} }
if (xdl_change_compact(&xe.xdf1, &xe.xdf2, xpp->flags) < 0 || if (xdl_change_compact(&xe.xdf1, &xe.xdf2, xpp->flags) < 0 ||
xdl_change_compact(&xe.xdf2, &xe.xdf1, xpp->flags) < 0 || xdl_change_compact(&xe.xdf2, &xe.xdf1, xpp->flags) < 0 ||
xdl_build_script(&xe, &xscr) < 0) { xdl_build_script(&xe, &xscr) < 0) {
xdl_free_env(&xe); xdl_free_env(&xe);
return -1; return -1;
} }
if (xscr) {
if (xpp->flags & XDF_IGNORE_BLANK_LINES) if (xpp->flags & XDF_IGNORE_BLANK_LINES)
xdl_mark_ignorable(xscr, &xe, xpp->flags); xdl_mark_ignorable(xscr, &xe, xpp->flags);
if (ef(&xe, xscr, ecb, xecfg) < 0) { if (ef(&xe, xscr, ecb, xecfg) < 0) {
xdl_free_script(xscr); xdl_free_script(xscr);
xdl_free_env(&xe); xdl_free_env(&xe);
return -1; return -1;
} }
xdl_free_script(xscr); xdl_free_script(xscr);
}
xdl_free_env(&xe); xdl_free_env(&xe);
return 0; return 0;
} }