Mercurial > evolve
view Makefile @ 4499:90f94231db5d
evolve: compat patch for recordfilter change in mercurial
This patch fix the broken things because of upstream changes in
recordfilter() which is being used to select the hunks interactively.
It fixes the test-uncommit-interactive.t by adding the compat layer.
But for test-split.t I had to fix the tests manually. To make it more
clear: splitting broke at evolve side because after that upstream change
now interactive mode doesn't prompt "examine change to foo" if foo is
mentioned explicitly using cli; and directly jumps to hunks selection
prompt (well, only if there is any changes at hunks level)
And the main issue is when file which is explicitly mentioned has no changes
at hunk level (for e.g copy, rename, mode change, empty new file), because in
that case you don't have any control on selection of that file and it would
be included automatically in first cycle of interactive selection.
And this "no changes at hunks level" was the reason for test-split.t breakage
as now it didn't prompt for those files which are passed on cli.
To fix this I have included some content in those files to make sure that
tests still demonstrate the same behaviour as they were doing before breakage.
Also, I replaced some "n" with "s" as it make more sense to skip all the
changes to that file in one go instead of hitting "n" multiple times
(if there were multiple hunks)
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Wed, 10 Apr 2019 23:19:29 +0530 |
parents | b53343c8d692 |
children | 7cdbe18838bc |
line wrap: on
line source
VERSION=$(shell python setup.py --version) PYTHON=python all: help deb-prepare: python setup.py sdist --dist-dir .. mv -f ../hg-evolve-$(VERSION).tar.gz ../mercurial-evolve_$(VERSION).orig.tar.gz tar xf ../mercurial-evolve_$(VERSION).orig.tar.gz rm -rf ../mercurial-evolve_$(VERSION).orig mv hg-evolve-$(VERSION) ../mercurial-evolve_$(VERSION).orig cp -r debian/ ../mercurial-evolve_$(VERSION).orig/ @cd ../mercurial-evolve_$(VERSION).orig && echo 'debian build directory ready at' `pwd` install-home: $(PYTHON) setup.py install --home="$(HOME)" --prefix="" --force # test targets TESTFLAGS ?= $(shell echo $$HGTESTFLAGS) HGTESTS=$(HGROOT)/tests help: @echo 'Commonly used make targets:' @echo ' deb-prepare - prepare the build of a debian package' @echo ' tests - run all tests in the automatic test suite' @echo ' all-version-tests - run all tests against many hg versions' @echo ' tests-%s - run all tests in the specified hg version' all: help _check_hgroot: ifeq ($(HGROOT),) $(error HGROOT is not set to the root of the hg source tree) endif tests: _check_hgroot cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS) # /!\ run outside of the compatibility branch output test will likely fails test-%: _check_hgroot cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS) $@ tests-%: _check_hgroot hg -R $(HGROOT) checkout $$(echo $@ | sed s/tests-//) && \ (cd $(HGROOT) ; $(MAKE) clean ) && \ cd tests && $(PYTHON) $(HGTESTS)/run-tests.py $(TESTFLAGS) # build a script to extract declared version all-version-tests: tests-@ .PHONY: tests all-version-tests