Augie Fackler <augie@google.com> [Wed, 06 Jun 2018 13:31:24 -0400] rev 38239
merge with stable
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 26 May 2018 03:01:14 +0530] rev 38238
graft: reuse the --log value passed initially in `hg graft --continue` (BC)
We now stores the value of --log flag passed initially in the graftstate and
reuse that value when doing `hg graft --continue` which is a nice behavior.
The test updates demonstrate the fix.
Since we now preserve the value by default, drop the mention of `--log` flag
from the hint which we see after conflicts.
Differential Revision: https://phab.mercurial-scm.org/D3662
Pulkit Goyal <7895pulkit@gmail.com> [Sat, 26 May 2018 02:57:36 +0530] rev 38237
graft: add test showing --continue not preserving --log passed earlier
This patch shows that when we do `hg graft --continue`, the value of --log flag
passed when initial graft was run was not used.
Next patch will fix this and tests will help us in realising that.
Differential Revision: https://phab.mercurial-scm.org/D3661
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Jun 2018 13:40:58 +0900] rev 38236
test-fuzz-targets: look for clang-6.0 binary as well
Debian sid is still shipped with clang 4.0 by default. This allows me to
run the test without replacing the system clang to clang-6.0.
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Jun 2018 13:23:12 +0900] rev 38235
test-fuzz-targets: rebuild executable silently
This makes sure the build is not broken.
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Jun 2018 13:21:13 +0900] rev 38234
fuzz: fix "make clean" to pass even if no binaries built yet
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Jun 2018 13:18:13 +0900] rev 38233
fuzz: compile xdiff.cc with -std=c++17
Otherwise the build would fail as follows:
In file included from xdiff.cc:13:
./fuzzutil.h:23:10: fatal error: 'third_party/absl/types/optional.h' file not
found
#include "third_party/absl/types/optional.h"
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Jun 2018 13:12:32 +0900] rev 38232
fuzz: fix use of undeclared function memcpy()
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Jun 2018 13:11:49 +0900] rev 38231
fuzz: fix the default make target
Yuya Nishihara <yuya@tcha.org> [Sun, 03 Jun 2018 13:11:22 +0900] rev 38230
fuzz: expand variables by make
Otherwise it wouldn't work unless CC and CXX were exported from the
environment.