Mercurial > hgsubversion
annotate Makefile @ 1234:d3c79072bc6a
editor: correctly import symlink copy+modify with non-empty prefix
We alwasy fail editing for symlinks, since we strip the leading 'link '
subversion includes when storing in mercurial, and then let svn
attempt to apply deltas against the stripped version. This
unsurprisingly fails, and we write the resulting empty-string to the
Filestore for the current revision, and add the symlink in question to
the missing list to handle stupidly later.
Unfortunately, this would break down because editing adds files to the
store using their absolute path whereas missing files are added
relative to our subdir. the absolut path file appears to win, which
results in us getting a symlink whose target is the empty string.
This fixes the problem by adding missing files to the fileStore using
their absolute path.
author | David Schleimer <dschleimer@fb.com> |
---|---|
date | Mon, 07 Apr 2014 18:28:35 -0700 |
parents | 055f9254d790 |
children |
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 |