rewriteutil: adapt "cannot %s while merging" to work with "change branch of" `rewriteutil.precheck()` creates error messages by inserting a given verb into a sentence. The `hg branch -r` command passes in "change branch of" as the verb. That doesn't work well with "cannot %s while merging" (making it "cannot change branch of while merging"). Let's insert a "changeset" there to make it work better. Building sentences like this seems obviously bad for i18n, but fixing that is out of scope for this series, IMO. Differential Revision: https://phab.mercurial-scm.org/D10530

     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