mirror of
https://github.com/git/git.git
synced 2024-11-06 09:13:01 +01:00
857b933e04
This new function implements the functionality of RCS merge, but in-memory. It returns < 0 on error, otherwise the number of conflicts. Finding the conflicting lines can be a very expensive task. You can control the eagerness of this algorithm: - a level value of 0 means that all overlapping changes are treated as conflicts, - a value of 1 means that if the overlapping changes are identical, it is not treated as a conflict. - If you set level to 2, overlapping changes will be analyzed, so that almost identical changes will not result in huge conflicts. Rather, only the conflicting lines will be shown inside conflict markers. With each increasing level, the algorithm gets slower, but more accurate. Note that the code for level 2 depends on the simple definition of mmfile_t specific to git, and therefore it will be harder to port that to LibXDiff. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
60 lines
1.8 KiB
C
60 lines
1.8 KiB
C
/*
|
|
* LibXDiff by Davide Libenzi ( File Differential Library )
|
|
* Copyright (C) 2003 Davide Libenzi
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* Davide Libenzi <davidel@xmailserver.org>
|
|
*
|
|
*/
|
|
|
|
#if !defined(XDIFFI_H)
|
|
#define XDIFFI_H
|
|
|
|
|
|
typedef struct s_diffdata {
|
|
long nrec;
|
|
unsigned long const *ha;
|
|
long *rindex;
|
|
char *rchg;
|
|
} diffdata_t;
|
|
|
|
typedef struct s_xdalgoenv {
|
|
long mxcost;
|
|
long snake_cnt;
|
|
long heur_min;
|
|
} xdalgoenv_t;
|
|
|
|
typedef struct s_xdchange {
|
|
struct s_xdchange *next;
|
|
long i1, i2;
|
|
long chg1, chg2;
|
|
} xdchange_t;
|
|
|
|
|
|
|
|
int xdl_recs_cmp(diffdata_t *dd1, long off1, long lim1,
|
|
diffdata_t *dd2, long off2, long lim2,
|
|
long *kvdf, long *kvdb, int need_min, xdalgoenv_t *xenv);
|
|
int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
|
|
xdfenv_t *xe);
|
|
int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, long flags);
|
|
int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr);
|
|
void xdl_free_script(xdchange_t *xscr);
|
|
int xdl_emit_diff(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
|
|
xdemitconf_t const *xecfg);
|
|
|
|
#endif /* #if !defined(XDIFFI_H) */
|
|
|