зеркало из https://github.com/microsoft/git.git
xdiff: drop XDL_EMIT_COMMON
There are no more callers that use this mode, and none
likely to be added (as our xdl_merge() eliminates the common
use of it for generating 3-way merge bases).
This is effectively a revert of a9ed376
(xdiff: generate
"anti-diffs" aka what is common to two files, 2006-06-28),
though of course trying to revert that ancient commit
directly produces many textual conflicts.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
b779b3a199
Коммит
907681e940
|
@ -42,7 +42,6 @@ extern "C" {
|
|||
#define XDF_IGNORE_BLANK_LINES (1 << 7)
|
||||
|
||||
#define XDL_EMIT_FUNCNAMES (1 << 0)
|
||||
#define XDL_EMIT_COMMON (1 << 1)
|
||||
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
|
||||
|
||||
#define XDL_MMB_READONLY (1 << 0)
|
||||
|
|
|
@ -120,21 +120,6 @@ static long def_ff(const char *rec, long len, char *buf, long sz, void *priv)
|
|||
return -1;
|
||||
}
|
||||
|
||||
static int xdl_emit_common(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
|
||||
xdemitconf_t const *xecfg) {
|
||||
xdfile_t *xdf = &xe->xdf2;
|
||||
const char *rchg = xdf->rchg;
|
||||
long ix;
|
||||
|
||||
for (ix = 0; ix < xdf->nrec; ix++) {
|
||||
if (rchg[ix])
|
||||
continue;
|
||||
if (xdl_emit_record(xdf, ix, "", ecb))
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
struct func_line {
|
||||
long len;
|
||||
char buf[80];
|
||||
|
@ -170,9 +155,6 @@ int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
|
|||
long funclineprev = -1;
|
||||
struct func_line func_line = { 0 };
|
||||
|
||||
if (xecfg->flags & XDL_EMIT_COMMON)
|
||||
return xdl_emit_common(xe, xscr, ecb, xecfg);
|
||||
|
||||
for (xch = xscr; xch; xch = xche->next) {
|
||||
xche = xdl_get_hunk(&xch, xecfg);
|
||||
if (!xch)
|
||||
|
|
Загрузка…
Ссылка в новой задаче