##// 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:

r38264:46dcb9f1 default
r38355:bb7e3c6e @44 default
Show More
Makefile
81 lines | 2.6 KiB | text/x-makefile | MakefileLexer
Yuya Nishihara
fuzz: expand variables by make...
r38232 CC = clang
CXX = clang++
Augie Fackler
fuzz: new fuzzer for the mpatch code...
r38264 all: bdiff mpatch xdiff
Yuya Nishihara
fuzz: fix the default make target
r38233
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 fuzzutil.o: fuzzutil.cc fuzzutil.h
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CXX) $(CXXFLAGS) -g -O1 -fsanitize=fuzzer-no-link,address \
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 -std=c++17 \
-I../../mercurial -c -o fuzzutil.o fuzzutil.cc
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 fuzzutil-oss-fuzz.o: fuzzutil.cc fuzzutil.h
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CXX) $(CXXFLAGS) -std=c++17 \
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 -I../../mercurial -c -o fuzzutil-oss-fuzz.o fuzzutil.cc
Augie Fackler
contrib: add some basic scaffolding for some fuzz test targets...
r35688 bdiff.o: ../../mercurial/bdiff.c
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CC) $(CFLAGS) -fsanitize=fuzzer-no-link,address -c -o bdiff.o \
Augie Fackler
contrib: add some basic scaffolding for some fuzz test targets...
r35688 ../../mercurial/bdiff.c
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 bdiff: bdiff.cc bdiff.o fuzzutil.o
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 -std=c++17 \
-I../../mercurial bdiff.cc bdiff.o fuzzutil.o -o bdiff
Augie Fackler
contrib: add some basic scaffolding for some fuzz test targets...
r35688
bdiff-oss-fuzz.o: ../../mercurial/bdiff.c
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CC) $(CFLAGS) -c -o bdiff-oss-fuzz.o ../../mercurial/bdiff.c
Augie Fackler
contrib: add some basic scaffolding for some fuzz test targets...
r35688
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 bdiff_fuzzer: bdiff.cc bdiff-oss-fuzz.o fuzzutil-oss-fuzz.o
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CXX) $(CXXFLAGS) -std=c++17 -I../../mercurial bdiff.cc \
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 bdiff-oss-fuzz.o fuzzutil-oss-fuzz.o -lFuzzingEngine -o \
$$OUT/bdiff_fuzzer
Augie Fackler
contrib: add some basic scaffolding for some fuzz test targets...
r35688
Augie Fackler
fuzz: new fuzzer for the mpatch code...
r38264 mpatch.o: ../../mercurial/mpatch.c
$(CC) -g -O1 -fsanitize=fuzzer-no-link,address -c -o mpatch.o \
../../mercurial/mpatch.c
mpatch: CXXFLAGS += -std=c++17
mpatch: mpatch.cc mpatch.o fuzzutil.o
$(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \
-I../../mercurial mpatch.cc mpatch.o fuzzutil.o -o mpatch
mpatch-oss-fuzz.o: ../../mercurial/mpatch.c
$(CC) $(CFLAGS) -c -o mpatch-oss-fuzz.o ../../mercurial/mpatch.c
mpatch_fuzzer: mpatch.cc mpatch-oss-fuzz.o fuzzutil-oss-fuzz.o
$(CXX) $(CXXFLAGS) -std=c++17 -I../../mercurial mpatch.cc \
mpatch-oss-fuzz.o fuzzutil-oss-fuzz.o -lFuzzingEngine -o \
$$OUT/mpatch_fuzzer
mpatch_corpus.zip:
python mpatch_corpus.py $$OUT/mpatch_fuzzer_seed_corpus.zip
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CC) -g -O1 -fsanitize=fuzzer-no-link,address -c \
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 -o $@ \
$<
Yuya Nishihara
fuzz: compile xdiff.cc with -std=c++17...
r38235 xdiff: CXXFLAGS += -std=c++17
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 xdiff: xdiff.cc xdiffi.o xprepare.o xutils.o fuzzutil.o
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CXX) $(CXXFLAGS) -DHG_FUZZER_INCLUDE_MAIN=1 -g -O1 -fsanitize=fuzzer-no-link,address \
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 -I../../mercurial xdiff.cc \
Augie Fackler
fuzz: extract some common utilities and use modern C++ idioms...
r38191 xdiffi.o xprepare.o xutils.o fuzzutil.o -o xdiff
Augie Fackler
contrib: add some basic scaffolding for some fuzz test targets...
r35688
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 fuzz-x%.o: ../../mercurial/thirdparty/xdiff/x%.c ../../mercurial/thirdparty/xdiff/*.h
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CC) $(CFLAGS) -c \
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 -o $@ \
$<
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 xdiff_fuzzer: xdiff.cc fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o fuzzutil-oss-fuzz.o
Yuya Nishihara
fuzz: expand variables by make...
r38232 $(CXX) $(CXXFLAGS) -std=c++17 -I../../mercurial xdiff.cc \
Augie Fackler
fuzzutil: make it possible to use absl when C++17 isn't supported...
r38192 fuzz-xdiffi.o fuzz-xprepare.o fuzz-xutils.o fuzzutil-oss-fuzz.o \
Augie Fackler
fuzz: add a fuzzer for xdiff...
r36697 -lFuzzingEngine -o $$OUT/xdiff_fuzzer
Augie Fackler
fuzz: add clean target...
r38193 clean:
Yuya Nishihara
fuzz: fix "make clean" to pass even if no binaries built yet
r38236 $(RM) *.o *_fuzzer \
Augie Fackler
fuzz: add clean target...
r38193 bdiff \
Augie Fackler
fuzz: new fuzzer for the mpatch code...
r38264 mpatch \
Augie Fackler
fuzz: add clean target...
r38193 xdiff
Augie Fackler
fuzz: new fuzzer for the mpatch code...
r38264 oss-fuzz: bdiff_fuzzer mpatch_fuzzer mpatch_corpus.zip xdiff_fuzzer
Augie Fackler
contrib: add some basic scaffolding for some fuzz test targets...
r35688
Augie Fackler
fuzz: add clean target...
r38193 .PHONY: all clean oss-fuzz