##// END OF EJS Templates
merge: check created file dirs for path conflicts only once (issue5716)...
merge: check created file dirs for path conflicts only once (issue5716) In large repositories, updates involving the creation of many files check the same directories repeatedly in the wctx manifest. Move these checks out to a separate loop to avoid repeated checks hitting the manifest. Differential Revision: https://phab.mercurial-scm.org/D1226

File last commit:

r34801:76135583 default
r35182:a92b9f8e 4.4.2 stable
Show More
mpatch.h
26 lines | 717 B | text/x-c | CLexer
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 #ifndef _HG_MPATCH_H_
#define _HG_MPATCH_H_
Maciej Fijalkowski
mpatch: remove dependency on Python.h in mpatch.c...
r29694 #define MPATCH_ERR_NO_MEM -3
#define MPATCH_ERR_CANNOT_BE_DECODED -2
#define MPATCH_ERR_INVALID_PATCH -1
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 struct mpatch_frag {
int start, end, len;
const char *data;
};
struct mpatch_flist {
struct mpatch_frag *base, *head, *tail;
};
Augie Fackler
mpatch: reformat function prototypes with clang-format...
r34801 int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist **res);
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693 ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l);
void mpatch_lfree(struct mpatch_flist *a);
int mpatch_apply(char *buf, const char *orig, ssize_t len,
Augie Fackler
mpatch: reformat function prototypes with clang-format...
r34801 struct mpatch_flist *l);
struct mpatch_flist *
mpatch_fold(void *bins, struct mpatch_flist *(*get_next_item)(void *, ssize_t),
ssize_t start, ssize_t end);
Maciej Fijalkowski
mpatch: split mpatch into two files
r29693
#endif