##// END OF EJS Templates
shelve: no longer strip internal commit when using internal phase...
shelve: no longer strip internal commit when using internal phase When the internal phase is used, the internal commits we create during shelve will be automatically hidden, and we don't need to strip them. Avoiding strips gives much better performances and is less traumatic for caches. Test changes are all related to revision numbers increasing more quickly since we avoid stripping. At the end of `test-shelve.t` we now need manually strip the shelve-commit in addition to the x.shelve file deletion. This emulates a preexisting shelve after a repository upgrade. Note: The hidden internal commits confuses rebase a bit as shown by a new test added. This will happen when the user have shelve commits on top of a changeset to be rebased. We'll fix this in the next commit. As we still use a backup bundle, rebase can just strip the internal changesets and be fine.

File last commit:

r34801:76135583 default
r39780:52dfa1eb 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