Mercurial Mercurial > pub > hg > evolve / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile
author Sean Farley <sean.michael.farley@gmail.com>
Fri, 25 Apr 2014 19:58:33 -0500
branchstable
changeset 923 a94ce5400e1b
parent 542 ca5bb72d14ae
child 1524 bfbd99b50f8f
permissions -rw-r--r--
evolve: protect call to rebase within a wlock (#42, #35, #16) Without a wlock, repo.commit would blow away the dirstate's parents on OSes that have no 'os.symlink' support in python, leading evolve to produce a merge instead of a rebase. If a user ran the rebase command instead of evolve, then things would work because rebase is wrapped in a giant wlock. Unfortunately, we can't use the same idea of wrapping the evolve command in one giant wlock because that's too early in the process. If the lock did wrap the entire evolve command, then the working directory would save its current parents which, since rebase hasn't been called yet, would be just p1. Therefore, we need to obtain the lock *after* the dirstate's parents are changed but *before* the call to rebase. This way ensures that when a conflict happens the working directory correctly shows both parent changeset.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
0
bbeef801409c minimalistic state concept.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     1
 
PYTHON=python
bbeef801409c minimalistic state concept.
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents:
diff changeset 
     2
 
HG=`which hg`
542
ca5bb72d14ae pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset 
     3
 
VERSION=$(shell python setup.py --version)
ca5bb72d14ae pkg: abstract version in makefile
Pierre-Yves David <pierre-yves.david@logilab.fr>
parents: 531
diff changeset 
     4
 







0






bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     5














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     6


help:












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     7


	@echo 'Commonly used make targets:'












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     8


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




     9


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    10


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    11














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    12


all: help












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    13














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    14


tests:












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    15


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    16














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    17


test-%:












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    18


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    19














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    20


tests-%:












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    21


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    22


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    23


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    24


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    25














bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    26


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    27


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












bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    28









531






b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
0

diff
changeset




    29


deb-prepare:












b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
0

diff
changeset




    30


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







542






ca5bb72d14ae
pkg: abstract version in makefile



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    31


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












ca5bb72d14ae
pkg: abstract version in makefile



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    32


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












ca5bb72d14ae
pkg: abstract version in makefile



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    33


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












ca5bb72d14ae
pkg: abstract version in makefile



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    34


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












ca5bb72d14ae
pkg: abstract version in makefile



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    35


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












ca5bb72d14ae
pkg: abstract version in makefile



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
531

diff
changeset




    36


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







531






b18b00036355
pkg/debian: Debian packaging



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 
0

diff
changeset




    37









0






bbeef801409c
minimalistic state concept.



Pierre-Yves David <pierre-yves.david@logilab.fr>


parents: 

diff
changeset




    38


.PHONY: tests all-version-tests














evolve