view mercurial/bitmanipulation.h @ 50393:f95ab2c53303

outgoing: fix common-heads computation from `missingroots` argument

When initializing a `outgoing` object, the `common set` can be defined explicitly (with the `commonheads` argument`) or implicitly (with the missingroots arguments).

It turns out the logic to compute `commonheads` from `missingroots` is buggy, as it does not consider the parents of enough changesets. Previously, it only considered parents of "missingroots` items, while it need to consider all parents of missing. Here is an example:

  F
  |\
  C E
  | |
  B D
  |/
  A

If we use [E] as missing-roots, the missing set is [E, F], and the common-heads
are [C, D]. However you cannot only consider the parent of [E] to find them, as
[C] is not a parent of [E].

This already fix the bundle generated in one test, and it would prevent many
other to misbehave with future change from this series.

#ifndef HG_BITMANIPULATION_H
#define HG_BITMANIPULATION_H

#include <string.h>

#include "compat.h"

/* Reads a 64 bit integer from big-endian bytes. Assumes that the data is long
 enough */
static inline uint64_t getbe64(const char *c)
{
	const unsigned char *d = (const unsigned char *)c;

	return ((((uint64_t)d[0]) << 56) | (((uint64_t)d[1]) << 48) |
	        (((uint64_t)d[2]) << 40) | (((uint64_t)d[3]) << 32) |
	        (((uint64_t)d[4]) << 24) | (((uint64_t)d[5]) << 16) |
	        (((uint64_t)d[6]) << 8) | (d[7]));
}

static inline uint32_t getbe32(const char *c)
{
	const unsigned char *d = (const unsigned char *)c;

	return ((((uint32_t)d[0]) << 24) | (((uint32_t)d[1]) << 16) |
	        (((uint32_t)d[2]) << 8) | (d[3]));
}

static inline int16_t getbeint16(const char *c)
{
	const unsigned char *d = (const unsigned char *)c;

	return ((d[0] << 8) | (d[1]));
}

static inline uint16_t getbeuint16(const char *c)
{
	const unsigned char *d = (const unsigned char *)c;

	return ((d[0] << 8) | (d[1]));
}

/* Writes a 64 bit integer to bytes in a big-endian format.
 Assumes that the buffer is long enough */
static inline void putbe64(uint64_t x, char *c)
{
	c[0] = (x >> 56) & 0xff;
	c[1] = (x >> 48) & 0xff;
	c[2] = (x >> 40) & 0xff;
	c[3] = (x >> 32) & 0xff;
	c[4] = (x >> 24) & 0xff;
	c[5] = (x >> 16) & 0xff;
	c[6] = (x >> 8) & 0xff;
	c[7] = (x)&0xff;
}

static inline void putbe32(uint32_t x, char *c)
{
	c[0] = (x >> 24) & 0xff;
	c[1] = (x >> 16) & 0xff;
	c[2] = (x >> 8) & 0xff;
	c[3] = (x)&0xff;
}

static inline double getbefloat64(const char *c)
{
	const unsigned char *d = (const unsigned char *)c;
	double ret;
	int i;
	uint64_t t = 0;
	for (i = 0; i < 8; i++) {
		t = (t << 8) + d[i];
	}
	memcpy(&ret, &t, sizeof(t));
	return ret;
}

#endif