##// END OF EJS Templates
scmutil: make cleanupnodes optionally also fix the phase...
scmutil: make cleanupnodes optionally also fix the phase We have had multiple bugs where the phase wasn't correctly carried forward to a rewritten changeset (for example: phabricator, split, evolve, fix). Handling the phase update in cleanupnodes() makes it less likely to happen again, especially once we have made it fix the phase by default (perhaps in the next release cycle). This patch also updates all applicable callers so we get some testing of it. Note that rebase and histedit can't be fixed yet because they call cleanupnodes() only at the end and the phase may have been changed by the user when the rebase/histedit was interrupted (due to merge conflicts). I think we should make them write one commit at a time (as it already does), along with associated obsmarkers, bookmark moves, etc. When that's done, we can switch them over to cleanupnodes(). Differential Revision: https://phab.mercurial-scm.org/D3818

File last commit:

r36782:3cf40112 default
r38442:32fba6fe default
Show More
xdiff.h
91 lines | 2.3 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(XDIFF_H)
#define XDIFF_H
#ifdef __cplusplus
extern "C" {
#endif /* #ifdef __cplusplus */
Jun Wu
xdiff: remove patience and histogram diff algorithms...
r36690 #include <stddef.h> /* size_t */
Jun Wu
xdiff: move stdint.h to xdiff.h...
r36954 #if !defined(_MSC_VER) || _MSC_VER >= 1600
#include <stdint.h>
#else
/* prior to Visual Studio 2010 */
typedef long long int64_t;
typedef unsigned long long uint64_t;
#endif
Jun Wu
xdiff: vendor xdiff library from git...
r36689 /* xpparm_t.flags */
#define XDF_NEED_MINIMAL (1 << 0)
#define XDF_INDENT_HEURISTIC (1 << 23)
Jun Wu
xdiff: add a bdiff hunk mode...
r36691 /* 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)
Jun Wu
xdiff: vendor xdiff library from git...
r36689
typedef struct s_mmfile {
char *ptr;
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 int64_t size;
Jun Wu
xdiff: vendor xdiff library from git...
r36689 } mmfile_t;
typedef struct s_mmbuffer {
char *ptr;
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 int64_t size;
Jun Wu
xdiff: vendor xdiff library from git...
r36689 } mmbuffer_t;
typedef struct s_xpparam {
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 uint64_t flags;
Jun Wu
xdiff: vendor xdiff library from git...
r36689 } xpparam_t;
typedef struct s_xdemitcb {
void *priv;
} xdemitcb_t;
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 typedef int (*xdl_emit_hunk_consume_func_t)(int64_t start_a, int64_t count_a,
int64_t start_b, int64_t count_b,
Jun Wu
xdiff: vendor xdiff library from git...
r36689 void *cb_data);
typedef struct s_xdemitconf {
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 uint64_t flags;
Jun Wu
xdiff: vendor xdiff library from git...
r36689 xdl_emit_hunk_consume_func_t hunk_func;
} xdemitconf_t;
#define xdl_malloc(x) malloc(x)
#define xdl_free(ptr) free(ptr)
#define xdl_realloc(ptr,x) realloc(ptr,x)
Jun Wu
xdiff: replace {unsigned ,}long with {u,}int64_t...
r36840 void *xdl_mmfile_first(mmfile_t *mmf, int64_t *size);
int64_t xdl_mmfile_size(mmfile_t *mmf);
Jun Wu
xdiff: vendor xdiff library from git...
r36689
int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
xdemitconf_t const *xecfg, xdemitcb_t *ecb);
#ifdef __cplusplus
}
#endif /* #ifdef __cplusplus */
#endif /* #if !defined(XDIFF_H) */