##// END OF EJS Templates
copies: handle a case when both merging csets are not descendant of merge base...
copies: handle a case when both merging csets are not descendant of merge base This patch fix the behaviour of fullcopytracing algorithm in the case when both the merging csets are not the descendant of merge base. Although it seems to be the rare case when both the csets are not descendant of merge base. But it can be seen in most of cases of content-divergence in evolve extension, where merge base is the common predecessor. Previous patch added a test where this algorithm can fail to continue because of an assumption that only one of the two csets can be dirty. This patch fix that error. For refrence I suggest you to look into the previous discussion held on a patch sent by Pulkit: https://phab.mercurial-scm.org/D3896 Differential Revision: https://phab.mercurial-scm.org/D5963

File last commit:

r38234:a1c0873a default
r42098:7694b685 default
Show More
fuzzutil.cc
27 lines | 922 B | text/x-c | CppLexer
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 #include "fuzzutil.h"
Yuya Nishihara
fuzz: fix use of undeclared function memcpy()
r38234 #include <cstring>
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 #include <utility>
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 {
if (!Size) {
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 return contrib::nullopt;
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 }
// figure out a random point in [0, Size] to split our input.
size_t left_size = (Data[0] / 255.0) * (Size - 1);
// Copy inputs to new allocations so if bdiff over-reads
// AddressSanitizer can detect it.
std::unique_ptr<char[]> left(new char[left_size]);
Yuya Nishihara
fuzz: fix use of undeclared function memcpy()
r38234 std::memcpy(left.get(), Data + 1, left_size);
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 // right starts at the next byte after left ends
size_t right_size = Size - (left_size + 1);
std::unique_ptr<char[]> right(new char[right_size]);
Yuya Nishihara
fuzz: fix use of undeclared function memcpy()
r38234 std::memcpy(right.get(), Data + 1 + left_size, right_size);
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 LOG(2) << "inputs are " << left_size << " and " << right_size
<< " bytes" << std::endl;
two_inputs result = {std::move(right), right_size, std::move(left),
left_size};
return result;
}