Mercurial > hg
annotate tests/test-impexp-branch.t @ 35547:b6dbc860570d
log: don't expand aliases in revset built from command options
Only -rREV should be rewritten with user aliases.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Thu, 04 Jan 2018 12:00:18 +0900 |
parents | 4d40fd0283d8 |
children | 4bc983568016 |
rev | line source |
---|---|
16475
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
1 $ echo '[extensions]' >> $HGRCPATH |
20115
db6b958c4f35
tests: use strip extension instead of mq where it makes sense
Martin Geisler <martin@geisler.net>
parents:
16913
diff
changeset
|
2 $ echo 'strip =' >> $HGRCPATH |
16475
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
3 |
12119
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
4 $ cat >findbranch.py <<EOF |
33960
4d40fd0283d8
tests: update test-impexp-branch to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
32940
diff
changeset
|
5 > from __future__ import absolute_import |
4d40fd0283d8
tests: update test-impexp-branch to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
32940
diff
changeset
|
6 > import re |
4d40fd0283d8
tests: update test-impexp-branch to pass our import checker
Augie Fackler <raf@durin42.com>
parents:
32940
diff
changeset
|
7 > import sys |
12119
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
8 > |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
9 > head_re = re.compile('^#(?:(?:\\s+([A-Za-z][A-Za-z0-9_]*)(?:\\s.*)?)|(?:\\s*))$') |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
10 > |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
11 > for line in sys.stdin: |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
12 > hmatch = head_re.match(line) |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
13 > if not hmatch: |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
14 > sys.exit(1) |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
15 > if hmatch.group(1) == 'Branch': |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
16 > sys.exit(0) |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
17 > sys.exit(1) |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
18 > EOF |
14126
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
19 |
12119
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
20 $ hg init a |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
21 $ cd a |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
22 $ echo "Rev 1" >rev |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
23 $ hg add rev |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
24 $ hg commit -m "No branch." |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
25 $ hg branch abranch |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
26 marked working directory as branch abranch |
15615 | 27 (branches are permanent and global, did you want a bookmark?) |
12119
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
28 $ echo "Rev 2" >rev |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
29 $ hg commit -m "With branch." |
14126
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
30 |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
31 $ hg export 0 > ../r0.patch |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
32 $ hg export 1 > ../r1.patch |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
33 $ cd .. |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
34 |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
22485
diff
changeset
|
35 $ if $PYTHON findbranch.py < r0.patch; then |
12119
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
36 > echo "Export of default branch revision has Branch header" 1>&2 |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
37 > exit 1 |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
38 > fi |
14126
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
39 |
32940
75be14993fda
cleanup: use $PYTHON to run python in many more tests
Augie Fackler <augie@google.com>
parents:
22485
diff
changeset
|
40 $ if $PYTHON findbranch.py < r1.patch; then |
12119
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
41 > : # Do nothing |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
42 > else |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
43 > echo "Export of branch revision is missing Branch header" 1>&2 |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
44 > exit 1 |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
45 > fi |
4442
871ff96a86cc
Add a test for the Branch header being in hg export.
Eric Hopper <hopper@omnifarious.org>
parents:
diff
changeset
|
46 |
12119
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
47 Make sure import still works with branch information in patches. |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
48 |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
49 $ hg init b |
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
50 $ cd b |
14126
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
51 $ hg import ../r0.patch |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
52 applying ../r0.patch |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
53 $ hg import ../r1.patch |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
54 applying ../r1.patch |
12119
46ab8c5dd99a
tests: unify test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
4444
diff
changeset
|
55 $ cd .. |
14126
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
56 |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
57 $ hg init c |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
58 $ cd c |
22485
efedda4aed49
import: let --exact 'work' with --no-commit (issue4376)
Matt Mackall <mpm@selenic.com>
parents:
20115
diff
changeset
|
59 $ hg import --exact --no-commit ../r0.patch |
efedda4aed49
import: let --exact 'work' with --no-commit (issue4376)
Matt Mackall <mpm@selenic.com>
parents:
20115
diff
changeset
|
60 applying ../r0.patch |
efedda4aed49
import: let --exact 'work' with --no-commit (issue4376)
Matt Mackall <mpm@selenic.com>
parents:
20115
diff
changeset
|
61 warning: can't check exact import with --no-commit |
efedda4aed49
import: let --exact 'work' with --no-commit (issue4376)
Matt Mackall <mpm@selenic.com>
parents:
20115
diff
changeset
|
62 $ hg st |
efedda4aed49
import: let --exact 'work' with --no-commit (issue4376)
Matt Mackall <mpm@selenic.com>
parents:
20115
diff
changeset
|
63 A rev |
efedda4aed49
import: let --exact 'work' with --no-commit (issue4376)
Matt Mackall <mpm@selenic.com>
parents:
20115
diff
changeset
|
64 $ hg revert -a |
efedda4aed49
import: let --exact 'work' with --no-commit (issue4376)
Matt Mackall <mpm@selenic.com>
parents:
20115
diff
changeset
|
65 forgetting rev |
efedda4aed49
import: let --exact 'work' with --no-commit (issue4376)
Matt Mackall <mpm@selenic.com>
parents:
20115
diff
changeset
|
66 $ rm rev |
14126
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
67 $ hg import --exact ../r0.patch |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
68 applying ../r0.patch |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
69 $ hg import --exact ../r1.patch |
fbbe9239574a
tests: export patches only once in test-impexp-branch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
12119
diff
changeset
|
70 applying ../r1.patch |
16475
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
71 |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
72 Test --exact and patch header separators (issue3356) |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
73 |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
74 $ hg strip --no-backup . |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
75 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
76 >>> import re |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
77 >>> p = file('../r1.patch', 'rb').read() |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
78 >>> p = re.sub(r'Parent\s+', 'Parent ', p) |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
79 >>> file('../r1-ws.patch', 'wb').write(p) |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
80 $ hg import --exact ../r1-ws.patch |
1f75c1decdeb
patch: be more tolerant with "Parent" header (issue3356)
Patrick Mezard <patrick@mezard.eu>
parents:
15615
diff
changeset
|
81 applying ../r1-ws.patch |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16475
diff
changeset
|
82 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
16475
diff
changeset
|
83 $ cd .. |