( )⚙ D2684 xdiff: remove unused structure, functions, and constants

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2684

xdiff: remove unused structure, functions, and constants
ClosedPublic

Authored by quark on Mar 4 2018, 7:50 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGb5bb0f99064d: xdiff: remove unused structure, functions, and constants
Summary

bdiffparam_t is unused. xdl_fall_back_diff is no longer used after
D2573. XDL_MMB_READONLY, XDL_MMF_ATOMIC are unused. XDL_BDOP* are
unused since there is no xdiff binary diff algorithm. anchors feature is
not used. It's also relatively new in git.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

quark created this revision.Mar 4 2018, 7:50 PM
quark abandoned this revision.Mar 4 2018, 8:09 PM
quark edited the summary of this revision. (Show Details)Mar 6 2018, 9:52 PM
quark retitled this revision from xdiff: remove unused structure and functions to xdiff: remove unused structure, functions, and constants.
quark added a child revision: D2705: xdiff: remove xemit related logic.
quark updated this revision to Diff 6682.
indygreg accepted this revision.Mar 6 2018, 10:07 PM
This revision is now accepted and ready to land.Mar 6 2018, 10:07 PM
Closed by commit rHGb5bb0f99064d: xdiff: remove unused structure, functions, and constants (authored by quark). · Explain WhyMar 6 2018, 10:11 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6642

mercurial/thirdparty/xdiff/xdiff.h

long ctxlen; long ctxlen;
long interhunkctxlen; long interhunkctxlen;
unsigned long flags; unsigned long flags;
find_func_t find_func; find_func_t find_func;
void *find_func_priv; void *find_func_priv;
xdl_emit_hunk_consume_func_t hunk_func; xdl_emit_hunk_consume_func_t hunk_func;
} xdemitconf_t; } xdemitconf_t;
typedef struct s_bdiffparam {
long bsize;
} bdiffparam_t;
#define xdl_malloc(x) malloc(x) #define xdl_malloc(x) malloc(x)
#define xdl_free(ptr) free(ptr) #define xdl_free(ptr) free(ptr)
#define xdl_realloc(ptr,x) realloc(ptr,x) #define xdl_realloc(ptr,x) realloc(ptr,x)
void *xdl_mmfile_first(mmfile_t *mmf, long *size); void *xdl_mmfile_first(mmfile_t *mmf, long *size);
long xdl_mmfile_size(mmfile_t *mmf); long xdl_mmfile_size(mmfile_t *mmf);

mercurial/thirdparty/xdiff/xutils.c

mb.ptr = buf; mb.ptr = buf;
mb.size = nb; mb.size = nb;
if (ecb->outf(ecb->priv, &mb, 1) < 0) if (ecb->outf(ecb->priv, &mb, 1) < 0)
return -1; return -1;
return 0; return 0;
} }
int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp,
int line1, int count1, int line2, int count2)
{
/*
* This probably does not work outside Git, since
* we have a very simple mmfile structure.
*
* Note: ideally, we would reuse the prepared environment, but
* the libxdiff interface does not (yet) allow for diffing only
* ranges of lines instead of the whole files.
*/
mmfile_t subfile1, subfile2;
xdfenv_t env;
subfile1.ptr = (char *)diff_env->xdf1.recs[line1 - 1]->ptr;
subfile1.size = diff_env->xdf1.recs[line1 + count1 - 2]->ptr +
diff_env->xdf1.recs[line1 + count1 - 2]->size - subfile1.ptr;
subfile2.ptr = (char *)diff_env->xdf2.recs[line2 - 1]->ptr;
subfile2.size = diff_env->xdf2.recs[line2 + count2 - 2]->ptr +
diff_env->xdf2.recs[line2 + count2 - 2]->size - subfile2.ptr;
if (xdl_do_diff(&subfile1, &subfile2, xpp, &env) < 0)
return -1;
memcpy(diff_env->xdf1.rchg + line1 - 1, env.xdf1.rchg, count1);
memcpy(diff_env->xdf2.rchg + line2 - 1, env.xdf2.rchg, count2);
xdl_free_env(&env);
return 0;
}