merge: use constants for actions We finish up establishing named constants in this file with actions. I remember scratching my head trying to figure out what this code was doing as part of addressing a recent security issue with subrepos. Having the named constants in place definitely makes things easier to read. I'm not convinced the new constants have the best names (I'm not an expert in this code). But they can be changed easily enough. Also, since these constants are internal only, we might want to change their values to something more human readable to facilitate debugging. Or maybe we could employ an enum type some day... Differential Revision: https://phab.mercurial-scm.org/D2701

     1

#ifndef _HG_BDIFF_H_

     2

#define _HG_BDIFF_H_

     3

     4

#include "compat.h"

     5

     6

struct bdiff_line {

     7

	int hash, n, e;

     8

	ssize_t len;

     9

	const char *l;

    10

};

    11

    12

struct bdiff_hunk;

    13

struct bdiff_hunk {

    14

	int a1, a2, b1, b2;

    15

	struct bdiff_hunk *next;

    16

};

    17

    18

int bdiff_splitlines(const char *a, ssize_t len, struct bdiff_line **lr);

    19

int bdiff_diff(struct bdiff_line *a, int an, struct bdiff_line *b, int bn,

    20

               struct bdiff_hunk *base);

    21

void bdiff_freehunks(struct bdiff_hunk *l);

    22

    23

#endif