##// END OF EJS Templates
phabricator: preserve the phase when amending in the Differential fields...
phabricator: preserve the phase when amending in the Differential fields I have no idea if it's better to change scmutil.cleanupnodes() so that it has the option to either apply a specific phase (e.g. for various --secret switches) or carry over the phase of the old node. The benefit would be that the caller doesn't have to remember to do this. The con is maybe inefficiency? I wrote this up as issue5918. I'm leaving that open since Yuya flagged it as an API bug. Since most other callers already do this, it's the simplest fix. (It's not obvious that `split`, `fix` and `rebase` are doing this, but there is test coverage for `fix` and `rebase`, and experimenting with `split` shows it does the right thing.)

File last commit:

r38191:fa0ddd5e default
r38355:bb7e3c6e @44 default
Show More
xdiff.cc
58 lines | 1.3 KiB | text/x-c | CppLexer
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 /*
* xdiff.cc - fuzzer harness for thirdparty/xdiff
*
* Copyright 2018, Google Inc.
*
* This software may be used and distributed according to the terms of
* the GNU General Public License, incorporated herein by reference.
*/
#include "thirdparty/xdiff/xdiff.h"
#include <inttypes.h>
#include <stdlib.h>
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 #include "fuzzutil.h"
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 extern "C" {
int hunk_consumer(long a1, long a2, long b1, long b2, void *priv)
{
// TODO: probably also test returning -1 from this when things break?
return 0;
}
int LLVMFuzzerTestOneInput(const uint8_t *Data, size_t Size)
{
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 auto maybe_inputs = SplitInputs(Data, Size);
if (!maybe_inputs) {
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 return 0;
}
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 auto inputs = std::move(maybe_inputs.value());
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 mmfile_t a, b;
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 a.ptr = inputs.left.get();
a.size = inputs.left_size;
b.ptr = inputs.right.get();
b.size = inputs.right_size;
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 xpparam_t xpp = {
XDF_INDENT_HEURISTIC, /* flags */
};
xdemitconf_t xecfg = {
XDL_EMIT_BDIFFHUNK, /* flags */
hunk_consumer, /* hunk_consume_func */
};
xdemitcb_t ecb = {
NULL, /* priv */
};
xdl_diff(&a, &b, &xpp, &xecfg, &ecb);
return 0; // Non-zero return values are reserved for future use.
}
#ifdef HG_FUZZER_INCLUDE_MAIN
int main(int argc, char **argv)
{
const char data[] = "asdf";
return LLVMFuzzerTestOneInput((const uint8_t *)data, 4);
}
#endif
} // extern "C"