annotate Makefile @ 1340:db9d85618d3d

wrapper: delay marker creation in push Before this patch we were creating obsolescence markers when pulling the changesets from subversion. The counterpart stripping logic (when obsolescence is not available) was done after pushing everything. This patch moves the marker creation to the end of the push, to: 1) Make the code more readable (the marker creation and the stripping should be in the same place) 2) Fix a behavior issue with inhibit(evolve) (see below) With inhibit + hgsubversion enabled. When pushing to subversion we were creating markers as expected but inhibiting the marker on the commit that was the parent of the working copy making it therefore visible. By delaying the marker creation to after the update we avoid this issue.
author Laurent Charignon <lcharignon@fb.com>
date Wed, 08 Jul 2015 13:30:16 -0700
parents 055f9254d790
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
683
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
1 # Makefile for testing hgsubversion
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
2
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
3 PYTHON=python
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
4
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
5 .PHONY: all check check-demandimport check-subvertpy check-swig
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
6
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
7 all:
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
8 @echo "Use the following commands to build and install hgsubversion:"
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
9 @echo
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
10 @echo "$$ cd $(PWD)"
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
11 @echo "$$ $(PYTHON) ./setup.py install"
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
12 @echo
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
13 @exit 1
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
14
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
15 check: check-demandimport check-subvertpy check-swig
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
16
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
17 check-demandimport:
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
18 # verify that hgsubversion loads properly without bindings, but fails
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
19 # when actually used
879
055f9254d790 Makefile: set HGRCPATH to protects us from broken environments
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 683
diff changeset
20 ! LC_ALL=C HGSUBVERSION_BINDINGS=none HGRCPATH=/dev/null \
683
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
21 hg --config extensions.hgsubversion=./hgsubversion \
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
22 version 2>&1 \
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
23 | egrep '(^abort:|failed to import extension)'
879
055f9254d790 Makefile: set HGRCPATH to protects us from broken environments
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents: 683
diff changeset
24 LC_ALL=C HGSUBVERSION_BINDINGS=none HGRCPATH=/dev/null \
683
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
25 hg --config extensions.hgsubversion=./hgsubversion \
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
26 version --svn 2>&1 \
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
27 | egrep '(^abort:|failed to import extension)'
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
28
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
29 check-subvertpy:
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
30 $(PYTHON) tests/run.py --all --bindings=subvertpy
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
31
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
32 check-swig:
4589d48c9e1b tests: add a Makefile for easily running the tests.
Dan Villiom Podlaski Christiansen <danchr@gmail.com>
parents:
diff changeset
33 $(PYTHON) tests/run.py --all --bindings=swig