##// END OF EJS Templates
graft: reuse --user and --date values in `hg graft --continue` (BC)...
graft: reuse --user and --date values in `hg graft --continue` (BC) Reading the user and date information from graftstate during `hg graft --continue` will help us in preserving the user and date arguments passed when `hg graft` was called. This patch reads that information and reuses that while running `hg graft --continue`. So after this patch, --user and --date values are preserved even if conflicts occur and user don't need to pass them again. The test changes demonstrate the fix. This is a backward incompatible change but I think of this more as a bug fix. Also thinking about removing the line from `hg help graft` which says --continue does not reapply other flags but need to check what are the other flags which needs to be preserved. Differential Revision: https://phab.mercurial-scm.org/D3659

File last commit:

r34801:76135583 default
r38171:decdb587 default
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