##// END OF EJS Templates
commit: get info from mergestate whether a file was merged or not...
commit: get info from mergestate whether a file was merged or not While commiting a merge, the commit code does not know whether a file was merged during `hg merge` or not. This leads the commit code to look for filelog ancestor to choose parents of new filelog created on merge commit. This leads to wrong results in some cases as demonstrated by previous patch. From this patch, we start storing information about merged files in mergestate in stateextras and then use that on commit to detect whether we need to set two parents or not. Differential Revision: https://phab.mercurial-scm.org/D10149

File last commit:

r36781:90f8fe72 default
r47567:5a0b930c default
Show More
xdiffi.h
58 lines | 1.6 KiB | text/x-c | CLexer
Jun Wu
xdiff: vendor xdiff library from git...
r36689 /*
* 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, see
* <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
*/
#if !defined(XDIFFI_H)
#define XDIFFI_H
typedef struct s_diffdata {
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 int64_t nrec;
uint64_t const *ha;
int64_t *rindex;
Jun Wu
xdiff: vendor xdiff library from git...
r36689 char *rchg;
} diffdata_t;
typedef struct s_xdalgoenv {
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 int64_t mxcost;
int64_t snake_cnt;
int64_t heur_min;
Jun Wu
xdiff: vendor xdiff library from git...
r36689 } xdalgoenv_t;
typedef struct s_xdchange {
struct s_xdchange *next;
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 int64_t i1, i2;
int64_t chg1, chg2;
Jun Wu
xdiff: vendor xdiff library from git...
r36689 int ignore;
} xdchange_t;
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 int xdl_recs_cmp(diffdata_t *dd1, int64_t off1, int64_t lim1,
diffdata_t *dd2, int64_t off2, int64_t lim2,
int64_t *kvdf, int64_t *kvdb, int need_min, xdalgoenv_t *xenv);
Jun Wu
xdiff: vendor xdiff library from git...
r36689 int xdl_do_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
xdfenv_t *xe);
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 int xdl_change_compact(xdfile_t *xdf, xdfile_t *xdfo, int64_t flags);
Jun Wu
xdiff: vendor xdiff library from git...
r36689 int xdl_build_script(xdfenv_t *xe, xdchange_t **xscr);
void xdl_free_script(xdchange_t *xscr);
#endif /* #if !defined(XDIFFI_H) */