Mercurial > hgsubversion
annotate Makefile @ 1028:c4b25a903ad3
layouts: consistently return None for default branch
This makes the single and standard layouts consistent in what they
return for the default branch. Previously, single had returned
'default' now they both return None.
In addition, this fixes a now-exposed bug in stupid's convert_revision
logic. Specifically, when a file is replaced by another file within
the same branch, we treated that as replacing the entire branch. this
bug was previously hidden because meta.split_branch_path and
meta.localname were inconsistent in what they returned for the single
layout. meta.split-branch_path is used to maintain the set of known
branches, where meta.localname is used to determine the branch for the
path being replaced. This resulted in erroneously hitting the
condition that skipped paths outside branches we know about when
considering replace operations from svn.
author | David Schleimer <dschleimer@fb.com> |
---|---|
date | Wed, 05 Jun 2013 11:00:06 -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 |