Mercurial > hg
annotate tests/test-debugextensions.t @ 33678:855a1856466d
tests: demonstrate crash when trying to rebase merge without its parents
As the test case shows, when "hg rebase -d G -r 'B + D + F'" is run on
the following graph, we crash with traceback. It's reasonable to fail
because we can not easily produce a correct rebased F. The problem is
what diff to apply to either the rebased B or the rebased D. We could
potentially produce the result by e.g. applying the (F-D) diff to the
rebased B and then applying the reverse (E-D) diff on top, but that
could result in merge conflicts in each of those steps, which we don't
have a way of dealing with. So for now, let's just add a test case to
demonstrate that we crash (i.e. the AssertionError is clearly
incorrect since the user can run into it).
F
/|
C E
| |
B D G
\|/
A
Differential Revision: https://phab.mercurial-scm.org/D212
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Fri, 14 Jul 2017 14:30:55 -0700 |
parents | a543d17dce03 |
children | 19ec5da944d5 |
rev | line source |
---|---|
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
1 $ hg debugextensions |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
2 |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
3 $ debugpath=`pwd`/extwithoutinfos.py |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
4 |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
5 $ cat > extwithoutinfos.py <<EOF |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
6 > EOF |
29891
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
7 $ cat > extwithinfos.py <<EOF |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
8 > testedwith = '3.0 3.1 3.2.1' |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
9 > buglink = 'https://example.org/bts' |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
10 > EOF |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
11 |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
12 $ cat >> $HGRCPATH <<EOF |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
13 > [extensions] |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
14 > histedit= |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
15 > patchbomb= |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
16 > rebase= |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
17 > mq= |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
18 > ext1 = $debugpath |
29891
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
19 > ext2 = `pwd`/extwithinfos.py |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
20 > EOF |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
21 |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
22 $ hg debugextensions |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
23 ext1 (untested!) |
29891
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
24 ext2 (3.2.1!) |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
25 histedit |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
26 mq |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
27 patchbomb |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
28 rebase |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
29 |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
30 $ hg debugextensions -v |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
31 ext1 |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
32 location: */extwithoutinfos.py* (glob) |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
33 bundled: no |
29891
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
34 ext2 |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
35 location: */extwithinfos.py* (glob) |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
36 bundled: no |
29891
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
37 tested with: 3.0 3.1 3.2.1 |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
38 bug reporting: https://example.org/bts |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
39 histedit |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
40 location: */hgext/histedit.py* (glob) |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
41 bundled: yes |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
42 mq |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
43 location: */hgext/mq.py* (glob) |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
44 bundled: yes |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
45 patchbomb |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
46 location: */hgext/patchbomb.py* (glob) |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
47 bundled: yes |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
48 rebase |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
49 location: */hgext/rebase.py* (glob) |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
50 bundled: yes |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
51 |
26430
1f8208a7277e
test-debugextensions: sanitize JSON output for Windows
Matt Harbison <matt_harbison@yahoo.com>
parents:
26351
diff
changeset
|
52 $ hg debugextensions -Tjson | sed 's|\\\\|/|g' |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
53 [ |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
54 { |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
55 "buglink": "", |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
56 "bundled": false, |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
57 "name": "ext1", |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
58 "source": "*/extwithoutinfos.py*", (glob) |
29703
3ef9aa7ad1fc
debugextension: change "testedwith" to a list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
28615
diff
changeset
|
59 "testedwith": [] |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
60 }, |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
61 { |
29891
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
62 "buglink": "https://example.org/bts", |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
63 "bundled": false, |
29891
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
64 "name": "ext2", |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
65 "source": "*/extwithinfos.py*", (glob) |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
66 "testedwith": ["3.0", "3.1", "3.2.1"] |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
67 }, |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
68 { |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
69 "buglink": "", |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
70 "bundled": true, |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
71 "name": "histedit", |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
72 "source": "*/hgext/histedit.py*", (glob) |
29893
4c28ddda5d48
debugextensions: hide "ships-with-hg-core" magic string (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
29892
diff
changeset
|
73 "testedwith": [] |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
74 }, |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
75 { |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
76 "buglink": "", |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
77 "bundled": true, |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
78 "name": "mq", |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
79 "source": "*/hgext/mq.py*", (glob) |
29893
4c28ddda5d48
debugextensions: hide "ships-with-hg-core" magic string (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
29892
diff
changeset
|
80 "testedwith": [] |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
81 }, |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
82 { |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
83 "buglink": "", |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
84 "bundled": true, |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
85 "name": "patchbomb", |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
86 "source": "*/hgext/patchbomb.py*", (glob) |
29893
4c28ddda5d48
debugextensions: hide "ships-with-hg-core" magic string (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
29892
diff
changeset
|
87 "testedwith": [] |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
88 }, |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
89 { |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
90 "buglink": "", |
29892
b64eaf947632
debugextensions: show ships-with-hg-core state as a separate field
Yuya Nishihara <yuya@tcha.org>
parents:
29891
diff
changeset
|
91 "bundled": true, |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
92 "name": "rebase", |
28615
a6573503342d
test-debugextensions: passes with byte-compilation disabled (issue5147)
Kevin Bullock <kbullock@ringworld.org>
parents:
26430
diff
changeset
|
93 "source": "*/hgext/rebase.py*", (glob) |
29893
4c28ddda5d48
debugextensions: hide "ships-with-hg-core" magic string (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
29892
diff
changeset
|
94 "testedwith": [] |
26351
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
95 } |
8c7d8d5e1e0f
mercurial: add debugextensions command (issue4676)
liscju <piotr.listkiewicz@gmail.com>
parents:
diff
changeset
|
96 ] |
29703
3ef9aa7ad1fc
debugextension: change "testedwith" to a list (BC)
Yuya Nishihara <yuya@tcha.org>
parents:
28615
diff
changeset
|
97 |
29891
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
98 $ hg debugextensions -T '{ifcontains("3.1", testedwith, "{name}\n")}' |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
99 ext2 |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
100 $ hg debugextensions \ |
ca6940515485
test-debugextensions: add dummy extension to make ifcontains() test more solid
Yuya Nishihara <yuya@tcha.org>
parents:
29703
diff
changeset
|
101 > -T '{ifcontains("3.2", testedwith, "no substring match: {name}\n")}' |