filemerge: make the 'local' path match the format that 'base' and 'other' use If we pass a separate '$output' arg to the merge tool, we produce four files: local, base, other, and output. In this situation, 'output' will be the original filename, 'base' and 'other' are temporary files, and previously 'local' would be the backup file (so if 'output' was foo.txt, 'local' would be foo.txt.orig). This change makes it so that 'local' follows the same pattern as 'base' and 'other' - it will be a temporary file either in the `experimental.mergetempdirprefix`-controlled directory with a name like foo~local.txt, or in the normal system-wide temp dir with a name like foo~local.RaNd0m.txt. For the cases where the merge tool does not use an '$output' arg, 'local' is still the destination filename, and 'base' and 'other' are unchanged. The hope is that this is much easier for people to reason about; rather than having a tool like Meld pop up with three panes, one of them with the filename "foo.txt.orig", one with the filename "foo.txt", and one with "foo~other.StuFf2.txt", we can (when the merge temp dir stuff is enabled) make it show up as "foo~local.txt", "foo.txt" and "foo~other.txt", respectively. This also opens the door to future customization, such as getting the operation-provided labels and a hash prefix into the filenames (so we see something like "foo~dest.abc123", "foo.txt", and "foo~src.d4e5f6"). Differential Revision: https://phab.mercurial-scm.org/D2889

     1

#ifndef _HG_MPATCH_H_

     2

#define _HG_MPATCH_H_

     3

     4

#define MPATCH_ERR_NO_MEM -3

     5

#define MPATCH_ERR_CANNOT_BE_DECODED -2

     6

#define MPATCH_ERR_INVALID_PATCH -1

     7

     8

struct mpatch_frag {

     9

	int start, end, len;

    10

	const char *data;

    11

};

    12

    13

struct mpatch_flist {

    14

	struct mpatch_frag *base, *head, *tail;

    15

};

    16

    17

int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist **res);

    18

ssize_t mpatch_calcsize(ssize_t len, struct mpatch_flist *l);

    19

void mpatch_lfree(struct mpatch_flist *a);

    20

int mpatch_apply(char *buf, const char *orig, ssize_t len,

    21

                 struct mpatch_flist *l);

    22

struct mpatch_flist *

    23

mpatch_fold(void *bins, struct mpatch_flist *(*get_next_item)(void *, ssize_t),

    24

            ssize_t start, ssize_t end);

    25

    26

#endif