view mercurial/mpatch.h @ 42703:073cfff9aaef

unshelve: delete shelvedstate after a successful unshelve --continue

`unshelve --continue` was preventing the deletion of `shelvedstate` on
a partial `unshelve`. Ideally, `shelvedstate` should be deleted after
a successful `unshelve`. Now, the behavior of `unshelve --continue`
will be as follows in interactive mode:

1] The user tried to `unshelve` changes interactively but, ran into
 conflicts.
2] They resolved the conflicts and triggered `unshelve --continue`
 but, unshelved changes partially.
3] Now, on trying to do `unshelve --continue` again will abort as
 the last `unshelve` was successful and we are deleting the
 `shelvedstate`.
4] If they want to unshelve the remaining shelved change, they
 need to trigger `unshelve` without `--continue`.

Differential Revision: https://phab.mercurial-scm.org/D6694

#ifndef _HG_MPATCH_H_
#define _HG_MPATCH_H_

#define MPATCH_ERR_NO_MEM -3
#define MPATCH_ERR_CANNOT_BE_DECODED -2
#define MPATCH_ERR_INVALID_PATCH -1

struct mpatch_frag {
	int start, end, len;
	const char *data;
};

struct mpatch_flist {
	struct mpatch_frag *base, *head, *tail;
};

int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist **res);
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,
                 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);

#endif