evolve: fix the 'grab' alias to work on Windows For some reason, the variable wasn't substituted on Windows in this case. From the test suite: $ hg grab 8 '' is not recognized as an internal or external command,\r (esc) operable program or batch file.\r (esc) This change seems hacky, but there isn't a readily available example of setting up a shell alias like this from a python module to know if there is a better way, and it seems like this is maybe just a convenience for tests, since there is no documentation for the aliases. The local copy of run-tests.py appears to predate the Windows support in the Mercurial repository's version, and fails each test with: The system cannot find the path specified. However, with this change and blacklisting test-simple4server.t, the tests can (mostly) be run on Windows like so: $ ../../hg/tests/run-tests.py --with-hg=../../hg/hg --blacklist windows Skipped test-simple4server.t: blacklisted Warned test-obsolete.t: no result code from test Warned test-tutorial.t: no result code from test Warned test-evolve.t: no result code from test Warned test-userguide.t: no result code from test Warned test-sharing.t: no result code from test Warned test-drop.t: no result code from test Failed test-prune.t: output changed # Ran 41 tests, 1 skipped, 6 warned, 1 failed.

     1

PYTHON=python

     2

HG=`which hg`

     3

VERSION=$(shell python setup.py --version)

     4

     5

     6

help:

     7

	@echo 'Commonly used make targets:'

     8

	@echo '  tests              - run all tests in the automatic test suite'

     9

	@echo '  all-version-tests - run all tests against many hg versions'

    10

	@echo '  tests-%s           - run all tests in the specified hg version'

    11

    12

all: help

    13

    14

tests:

    15

	cd tests && $(PYTHON) run-tests.py --with-hg=$(HG) $(TESTFLAGS)

    16

    17

test-%:

    18

	cd tests && $(PYTHON) run-tests.py --with-hg=$(HG) $(TESTFLAGS) $@

    19

    20

tests-%:

    21

	@echo "Path to crew repo is $(CREW) - set this with CREW= if needed."

    22

	hg -R $(CREW) checkout $$(echo $@ | sed s/tests-//) && \

    23

	(cd $(CREW) ; $(MAKE) clean ) && \

    24

	cd tests && $(PYTHON) $(CREW)/tests/run-tests.py $(TESTFLAGS)

    25

    26

all-version-tests: tests-1.3.1 tests-1.4.3 tests-1.5.4 \

    27

                   tests-1.6.4 tests-1.7.5 tests-1.8 tests-tip

    28

    29

deb-prepare:

    30

	python setup.py sdist --dist-dir ..

    31

	mv -f ../hg-evolve-$(VERSION).tar.gz ../mercurial-evolve_$(VERSION).orig.tar.gz

    32

	tar xf ../mercurial-evolve_$(VERSION).orig.tar.gz

    33

	rm -rf ../mercurial-evolve_$(VERSION).orig

    34

	mv hg-evolve-$(VERSION) ../mercurial-evolve_$(VERSION).orig

    35

	cp -r debian/ ../mercurial-evolve_$(VERSION).orig/

    36

	@cd ../mercurial-evolve_$(VERSION).orig && echo 'debian build directory ready at' `pwd`

    37

    38

.PHONY: tests all-version-tests