##// END OF EJS Templates
copies: add test that makes both the merging csets dirty and fails...
copies: add test that makes both the merging csets dirty and fails This patch is a part of series which is about the case when both the merging csets are not descendant of merge base. The existing code assumes if c1 is dirty there shouldn't be any partial copies from c2 i.e both2['incomplete'] and same for c2, if c2 is dirty both1['incomplete'] should be empty, but this is not the right assumption. Now as we know we can have both c1 and c2 dirty at the same time, it is possible that c1 is dirty and both2['incomplete'] has some value. Or if c2 is dirty and both1['incomplete'] has some value. Added test shows that because of this assumption it could fail. Differential Revision: https://phab.mercurial-scm.org/D5962

File last commit:

r38192:36d55f90 default
r42097:fc4b7a46 default
Show More
fuzzutil.h
47 lines | 1.2 KiB | text/x-c | CLexer
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 #ifndef CONTRIB_FUZZ_FUZZUTIL_H
#define CONTRIB_FUZZ_FUZZUTIL_H
#include <iostream>
#include <memory>
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 #include <stdint.h>
/* Try and use std::optional, but failing that assume we'll have a
* workable https://abseil.io/ install on the include path to get
* their backport of std::optional. */
#ifdef __has_include
#if __has_include(<optional>) && __cplusplus >= 201703L
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 #include <optional>
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 #define CONTRIB_FUZZ_HAVE_STD_OPTIONAL
#endif
#endif
#ifdef CONTRIB_FUZZ_HAVE_STD_OPTIONAL
namespace contrib
{
using std::nullopt;
using std::optional;
} /* namespace contrib */
#else
#include "third_party/absl/types/optional.h"
namespace contrib
{
using absl::nullopt;
using absl::optional;
} /* namespace contrib */
#endif
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191
/* set DEBUG to 1 for a few debugging prints, or 2 for a lot */
#define DEBUG 0
#define LOG(level) \
if (level <= DEBUG) \
std::cout
struct two_inputs {
std::unique_ptr<char[]> right;
size_t right_size;
std::unique_ptr<char[]> left;
size_t left_size;
};
/* Split a non-zero-length input into two inputs. */
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 contrib::optional<two_inputs> SplitInputs(const uint8_t *Data, size_t Size);
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191
#endif /* CONTRIB_FUZZ_FUZZUTIL_H */