annotate tests/test-transplant.t @ 42483:a4a468b00d44

rust-filepatterns: silence warning of non_upper_case_globals
author Yuya Nishihara <yuya@tcha.org>
date Sat, 15 Jun 2019 10:35:53 +0900
parents 251332dbf33d
children 12243f15d53e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
1 $ cat <<EOF >> $HGRCPATH
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
2 > [extensions]
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
3 > transplant=
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
4 > EOF
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
5
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
6 $ hg init t
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
7 $ cd t
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
8 $ hg transplant
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
9 abort: no source URL, branch revision, or revision list provided
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
10 [255]
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
11 $ hg transplant --continue --all
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
12 abort: --continue is incompatible with --branch, --all and --merge
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
13 [255]
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
14 $ hg transplant --all tip
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
15 abort: --all requires a branch revision
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
16 [255]
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
17 $ hg transplant --all --branch default tip
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
18 abort: --all is incompatible with a revision list
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
19 [255]
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
20 $ echo r1 > r1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
21 $ hg ci -Amr1 -d'0 0'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
22 adding r1
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
23 $ hg co -q null
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
24 $ hg transplant tip
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
25 abort: no revision checked out
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
26 [255]
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
27 $ hg up -q
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
28 $ echo r2 > r2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
29 $ hg ci -Amr2 -d'1 0'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
30 adding r2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
31 $ hg up 0
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
32 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
33
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
34 $ echo b1 > b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
35 $ hg ci -Amb1 -d '0 0'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
36 adding b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
37 created new head
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
38 $ hg merge 1
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
39 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
40 (branch merge, don't forget to commit)
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
41 $ hg transplant 1
41371
608c15f76f50 transplant: use bailifchanged() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents: 39707
diff changeset
42 abort: outstanding uncommitted merge
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
43 [255]
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
44 $ hg up -qC tip
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
45 $ echo b0 > b1
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
46 $ hg transplant 1
41371
608c15f76f50 transplant: use bailifchanged() instead of reimplementing it
Martin von Zweigbergk <martinvonz@google.com>
parents: 39707
diff changeset
47 abort: uncommitted changes
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
48 [255]
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
49 $ hg up -qC tip
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
50 $ echo b2 > b2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
51 $ hg ci -Amb2 -d '1 0'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
52 adding b2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
53 $ echo b3 > b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
54 $ hg ci -Amb3 -d '2 0'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
55 adding b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
56
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
57 $ hg log --template '{rev} {parents} {desc}\n'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
58 4 b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
59 3 b2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
60 2 0:17ab29e464c6 b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
61 1 r2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
62 0 r1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
63
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
64 $ hg clone . ../rebase
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
65 updating to branch default
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
66 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
67 $ hg init ../emptydest
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
68 $ cd ../emptydest
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
69 $ hg transplant --source=../t > /dev/null
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
70 $ cd ../rebase
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
71
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
72 $ hg up -C 1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
73 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
74
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
75 rebase b onto r1
21411
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
76 (this also tests that editor is not invoked if '--edit' is not specified)
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
77
21411
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
78 $ HGEDITOR=cat hg transplant -a -b tip
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
79 applying 37a1297eb21b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
80 37a1297eb21b transplanted to e234d668f844
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
81 applying 722f4667af76
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
82 722f4667af76 transplanted to 539f377d78df
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
83 applying a53251cdf717
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
84 a53251cdf717 transplanted to ffd6818a3975
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
85 $ hg log --template '{rev} {parents} {desc}\n'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
86 7 b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
87 6 b2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
88 5 1:d11e3596cc1a b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
89 4 b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
90 3 b2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
91 2 0:17ab29e464c6 b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
92 1 r2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
93 0 r1
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
94
31452
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
95 test format of transplant_source
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
96
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
97 $ hg log -r7 --debug | grep transplant_source
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
98 extra: transplant_source=\xa52Q\xcd\xf7\x17g\x9d\x19\x07\xb2\x89\xf9\x91SK\xe0\\\x99z
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
99 $ hg log -r7 -T '{extras}\n'
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
100 branch=defaulttransplant_source=\xa52Q\xcd\xf7\x17g\x9d\x19\x07\xb2\x89\xf9\x91SK\xe0\\\x99z
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
101 $ hg log -r7 -T '{join(extras, " ")}\n'
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
102 branch=default transplant_source=\xa52Q\xcd\xf7\x17g\x9d\x19\x07\xb2\x89\xf9\x91SK\xe0\\\x99z
52dabcc49968 templatekw: make join() escape values of extras (BC) (issue5504)
Yuya Nishihara <yuya@tcha.org>
parents: 30786
diff changeset
103
12811
0e284735e65b test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents: 12399
diff changeset
104 test transplanted revset
0e284735e65b test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents: 12399
diff changeset
105
0e284735e65b test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents: 12399
diff changeset
106 $ hg log -r 'transplanted()' --template '{rev} {parents} {desc}\n'
0e284735e65b test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents: 12399
diff changeset
107 5 1:d11e3596cc1a b1
0e284735e65b test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents: 12399
diff changeset
108 6 b2
0e284735e65b test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents: 12399
diff changeset
109 7 b3
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
110 $ hg log -r 'transplanted(head())' --template '{rev} {parents} {desc}\n'
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
111 7 b3
30786
e2a6f383d314 tests: use "hg help revisions.<predicate>" instead of grepping
Martin von Zweigbergk <martinvonz@google.com>
parents: 28549
diff changeset
112 $ hg help revisions.transplanted
14211
b00ab6890fe9 transplant: fix revset doc
Idan Kamara <idankk86@gmail.com>
parents: 14012
diff changeset
113 "transplanted([set])"
b00ab6890fe9 transplant: fix revset doc
Idan Kamara <idankk86@gmail.com>
parents: 14012
diff changeset
114 Transplanted changesets in set, or all transplanted changesets.
30786
e2a6f383d314 tests: use "hg help revisions.<predicate>" instead of grepping
Martin von Zweigbergk <martinvonz@google.com>
parents: 28549
diff changeset
115
12811
0e284735e65b test-transplant: test transplanted() revset
Patrick Mezard <pmezard@gmail.com>
parents: 12399
diff changeset
116
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 20269
diff changeset
117 test transplanted keyword
13689
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
118
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
119 $ hg log --template '{rev} {transplanted}\n'
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
120 7 a53251cdf717679d1907b289f991534be05c997a
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
121 6 722f4667af767100cb15b6a79324bf8abbfe1ef4
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
122 5 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
123 4
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
124 3
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
125 2
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
126 1
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
127 0
65399579da68 transplant: add "transplanted" keyword
Patrick Mezard <pmezard@gmail.com>
parents: 13579
diff changeset
128
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
129 test destination() revset predicate with a transplant of a transplant; new
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
130 clone so subsequent rollback isn't affected
21411
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
131 (this also tests that editor is invoked if '--edit' is specified)
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
132
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
133 $ hg clone -q . ../destination
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
134 $ cd ../destination
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
135 $ hg up -Cq 0
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
136 $ hg branch -q b4
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
137 $ hg ci -qm "b4"
21411
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
138 $ hg status --rev "7^1" --rev 7
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
139 A b3
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
140 $ cat > $TESTTMP/checkeditform.sh <<EOF
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
141 > env | grep HGEDITFORM
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
142 > true
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
143 > EOF
23092
501dc6b1ca78 tests: introduce "checkeditform-n-cat.sh" script to invoke "cat" in it safely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
144 $ cat > $TESTTMP/checkeditform-n-cat.sh <<EOF
501dc6b1ca78 tests: introduce "checkeditform-n-cat.sh" script to invoke "cat" in it safely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
145 > env | grep HGEDITFORM
501dc6b1ca78 tests: introduce "checkeditform-n-cat.sh" script to invoke "cat" in it safely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
146 > cat \$*
501dc6b1ca78 tests: introduce "checkeditform-n-cat.sh" script to invoke "cat" in it safely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
147 > EOF
501dc6b1ca78 tests: introduce "checkeditform-n-cat.sh" script to invoke "cat" in it safely
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22947
diff changeset
148 $ HGEDITOR="sh $TESTTMP/checkeditform-n-cat.sh" hg transplant --edit 7
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
149 applying ffd6818a3975
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
150 HGEDITFORM=transplant.normal
21411
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
151 b3
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
152
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
153
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
154 HG: Enter commit message. Lines beginning with 'HG:' are removed.
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
155 HG: Leave message empty to abort commit.
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
156 HG: --
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
157 HG: user: test
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
158 HG: branch 'b4'
afff78be4361 transplant: use "getcommiteditor()" instead of explicit editor choice
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 21024
diff changeset
159 HG: added b3
17186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
160 ffd6818a3975 transplanted to 502236fa76bb
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
161
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
162
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
163 $ hg log -r 'destination()'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
164 changeset: 5:e234d668f844
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
165 parent: 1:d11e3596cc1a
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
166 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
167 date: Thu Jan 01 00:00:00 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
168 summary: b1
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
169
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
170 changeset: 6:539f377d78df
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
171 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
172 date: Thu Jan 01 00:00:01 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
173 summary: b2
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
174
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
175 changeset: 7:ffd6818a3975
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
176 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
177 date: Thu Jan 01 00:00:02 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
178 summary: b3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
179
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
180 changeset: 9:502236fa76bb
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
181 branch: b4
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
182 tag: tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
183 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
184 date: Thu Jan 01 00:00:02 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
185 summary: b3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
186
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
187 $ hg log -r 'destination(a53251cdf717)'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
188 changeset: 7:ffd6818a3975
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
189 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
190 date: Thu Jan 01 00:00:02 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
191 summary: b3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
192
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
193 changeset: 9:502236fa76bb
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
194 branch: b4
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
195 tag: tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
196 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
197 date: Thu Jan 01 00:00:02 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
198 summary: b3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
199
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
200
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
201 test subset parameter in reverse order
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
202 $ hg log -r 'reverse(all()) and destination(a53251cdf717)'
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
203 changeset: 9:502236fa76bb
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
204 branch: b4
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
205 tag: tip
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
206 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
207 date: Thu Jan 01 00:00:02 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
208 summary: b3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
209
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
210 changeset: 7:ffd6818a3975
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
211 user: test
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
212 date: Thu Jan 01 00:00:02 1970 +0000
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
213 summary: b3
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
214
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
215
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
216 back to the original dir
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
217 $ cd ../rebase
a3da6f298592 revset: add destination() predicate
Matt Harbison <matt_harbison@yahoo.com>
parents: 16972
diff changeset
218
15204
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
219 rollback the transplant
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
220 $ hg rollback
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
221 repository tip rolled back to revision 4 (undo transplant)
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
222 working directory now based on revision 1
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
223 $ hg tip -q
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
224 4:a53251cdf717
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
225 $ hg parents -q
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
226 1:d11e3596cc1a
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
227 $ hg status
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
228 ? b1
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
229 ? b2
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
230 ? b3
3ce9b1a7538b transplant: wrap a transaction around the whole command
Greg Ward <greg@gerg.ca>
parents: 14223
diff changeset
231
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
232 $ hg clone ../t ../prune
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
233 updating to branch default
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
234 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
235 $ cd ../prune
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
236
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
237 $ hg up -C 1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
238 1 files updated, 0 files merged, 3 files removed, 0 files unresolved
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
239
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
240 rebase b onto r1, skipping b2
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
241
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
242 $ hg transplant -a -b tip -p 3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
243 applying 37a1297eb21b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
244 37a1297eb21b transplanted to e234d668f844
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
245 applying a53251cdf717
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
246 a53251cdf717 transplanted to 7275fda4d04f
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
247 $ hg log --template '{rev} {parents} {desc}\n'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
248 6 b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
249 5 1:d11e3596cc1a b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
250 4 b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
251 3 b2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
252 2 0:17ab29e464c6 b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
253 1 r2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
254 0 r1
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
255
16627
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
256 test same-parent transplant with --log
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
257
16627
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
258 $ hg clone -r 1 ../t ../sameparent
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
259 adding changesets
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
260 adding manifests
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
261 adding file changes
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
262 added 2 changesets with 2 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34251
diff changeset
263 new changesets 17ab29e464c6:d11e3596cc1a
16627
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
264 updating to branch default
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
265 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
266 $ cd ../sameparent
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
267 $ hg transplant --log -s ../prune 5
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
268 searching for changes
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
269 applying e234d668f844
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
270 e234d668f844 transplanted to e07aea8ecf9c
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
271 $ hg log --template '{rev} {parents} {desc}\n'
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
272 2 b1
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
273 (transplanted from e234d668f844e1b1a765f01db83a32c0c7bfa170)
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
274 1 r2
38c45a99be0b transplant: manually transplant pullable changesets with --log
Levi Bard <levi@unity3d.com>
parents: 16507
diff changeset
275 0 r1
23452
86c0d8c1484f transplant: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 23092
diff changeset
276 remote transplant, and also test that transplant doesn't break with
86c0d8c1484f transplant: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 23092
diff changeset
277 format-breaking diffopts
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
278
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
279 $ hg clone -r 1 ../t ../remote
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
280 adding changesets
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
281 adding manifests
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
282 adding file changes
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
283 added 2 changesets with 2 changes to 2 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34251
diff changeset
284 new changesets 17ab29e464c6:d11e3596cc1a
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
285 updating to branch default
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
286 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
287 $ cd ../remote
23452
86c0d8c1484f transplant: don't honor whitespace and format-changing diffopts
Siddharth Agarwal <sid0@fb.com>
parents: 23092
diff changeset
288 $ hg --config diff.noprefix=True transplant --log -s ../t 2 4
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
289 searching for changes
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
290 applying 37a1297eb21b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
291 37a1297eb21b transplanted to c19cf0ccb069
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
292 applying a53251cdf717
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
293 a53251cdf717 transplanted to f7fe5bf98525
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
294 $ hg log --template '{rev} {parents} {desc}\n'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
295 3 b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
296 (transplanted from a53251cdf717679d1907b289f991534be05c997a)
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
297 2 b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
298 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
299 1 r2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
300 0 r1
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
301
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
302 skip previous transplants
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
303
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
304 $ hg transplant -s ../t -a -b 4
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
305 searching for changes
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
306 applying 722f4667af76
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
307 722f4667af76 transplanted to 47156cd86c0b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
308 $ hg log --template '{rev} {parents} {desc}\n'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
309 4 b2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
310 3 b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
311 (transplanted from a53251cdf717679d1907b289f991534be05c997a)
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
312 2 b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
313 (transplanted from 37a1297eb21b3ef5c5d2ffac22121a0988ed9f21)
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
314 1 r2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
315 0 r1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
316
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
317 skip local changes transplanted to the source
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
318
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
319 $ echo b4 > b4
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
320 $ hg ci -Amb4 -d '3 0'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
321 adding b4
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
322 $ hg clone ../t ../pullback
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
323 updating to branch default
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
324 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
325 $ cd ../pullback
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
326 $ hg transplant -s ../remote -a -b tip
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
327 searching for changes
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
328 applying 4333daefcb15
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
329 4333daefcb15 transplanted to 5f42c04e07cc
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
330
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
331
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
332 remote transplant with pull
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
333
28549
e01bd7385f4f tests: reorder hg serve commands
Jun Wu <quark@fb.com>
parents: 28029
diff changeset
334 $ hg serve -R ../t -p $HGPORT -d --pid-file=../t.pid
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
335 $ cat ../t.pid >> $DAEMON_PIDS
3714
198173f3957c Add transplant extension
Brendan Cully <brendan@kublai.com>
parents:
diff changeset
336
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
337 $ hg clone -r 0 ../t ../rp
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
338 adding changesets
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
339 adding manifests
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
340 adding file changes
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
341 added 1 changesets with 1 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34251
diff changeset
342 new changesets 17ab29e464c6
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
343 updating to branch default
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
344 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
345 $ cd ../rp
25678
0c201666fdc6 transplant: update test to use hash for remote transplant
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23781
diff changeset
346 $ hg transplant -s http://localhost:$HGPORT/ 37a1297eb21b a53251cdf717
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
347 searching for changes
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
348 searching for changes
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
349 adding changesets
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
350 adding manifests
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
351 adding file changes
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
352 added 1 changesets with 1 changes to 1 files
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
353 applying a53251cdf717
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
354 a53251cdf717 transplanted to 8d9279348abb
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
355 $ hg log --template '{rev} {parents} {desc}\n'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
356 2 b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
357 1 b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
358 0 r1
3724
ea523d6f5f1a transplant: fix --continue; add --continue test
Brendan Cully <brendan@kublai.com>
parents: 3714
diff changeset
359
18138
8ab0640c3090 bundlerepo: don't return the peer without bundlerepo from getremotechanges
Mads Kiilerich <madski@unity3d.com>
parents: 17539
diff changeset
360 remote transplant without pull
25679
540cd0ddac49 transplant: only pull the transplanted revision (issue4692)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 25678
diff changeset
361 (It was using "2" and "4" (as the previous transplant used to) which referenced
25678
0c201666fdc6 transplant: update test to use hash for remote transplant
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23781
diff changeset
362 revision different from one run to another)
18138
8ab0640c3090 bundlerepo: don't return the peer without bundlerepo from getremotechanges
Mads Kiilerich <madski@unity3d.com>
parents: 17539
diff changeset
363
8ab0640c3090 bundlerepo: don't return the peer without bundlerepo from getremotechanges
Mads Kiilerich <madski@unity3d.com>
parents: 17539
diff changeset
364 $ hg pull -q http://localhost:$HGPORT/
25678
0c201666fdc6 transplant: update test to use hash for remote transplant
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23781
diff changeset
365 $ hg transplant -s http://localhost:$HGPORT/ 8d9279348abb 722f4667af76
18138
8ab0640c3090 bundlerepo: don't return the peer without bundlerepo from getremotechanges
Mads Kiilerich <madski@unity3d.com>
parents: 17539
diff changeset
366 skipping already applied revision 2:8d9279348abb
8ab0640c3090 bundlerepo: don't return the peer without bundlerepo from getremotechanges
Mads Kiilerich <madski@unity3d.com>
parents: 17539
diff changeset
367 applying 722f4667af76
8ab0640c3090 bundlerepo: don't return the peer without bundlerepo from getremotechanges
Mads Kiilerich <madski@unity3d.com>
parents: 17539
diff changeset
368 722f4667af76 transplanted to 76e321915884
8ab0640c3090 bundlerepo: don't return the peer without bundlerepo from getremotechanges
Mads Kiilerich <madski@unity3d.com>
parents: 17539
diff changeset
369
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
370 transplant --continue
4036
ebf1a05f6479 Make test-transplant test pull case
Brendan Cully <brendan@kublai.com>
parents: 4034
diff changeset
371
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
372 $ hg init ../tc
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
373 $ cd ../tc
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
374 $ cat <<EOF > foo
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
375 > foo
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
376 > bar
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
377 > baz
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
378 > EOF
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
379 $ echo toremove > toremove
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
380 $ echo baz > baz
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
381 $ hg ci -Amfoo
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
382 adding baz
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
383 adding foo
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
384 adding toremove
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
385 $ cat <<EOF > foo
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
386 > foo2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
387 > bar2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
388 > baz2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
389 > EOF
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
390 $ rm toremove
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
391 $ echo added > added
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
392 $ hg ci -Amfoo2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
393 adding added
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
394 removing toremove
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
395 $ echo bar > bar
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
396 $ cat > baz <<EOF
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
397 > before baz
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
398 > baz
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
399 > after baz
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
400 > EOF
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
401 $ hg ci -Ambar
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
402 adding bar
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
403 $ echo bar2 >> bar
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
404 $ hg ci -mbar2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
405 $ hg up 0
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
406 3 files updated, 0 files merged, 2 files removed, 0 files unresolved
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
407 $ echo foobar > foo
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
408 $ hg ci -mfoobar
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
409 created new head
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
410 $ hg transplant 1:3
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
411 applying 46ae92138f3c
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
412 patching file foo
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
413 Hunk #1 FAILED at 0
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
414 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
415 patch failed to apply
27676
1c48f348f2d0 transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents: 27666
diff changeset
416 abort: fix up the working directory and run hg transplant --continue
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
417 [255]
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
418
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
419 transplant -c shouldn't use an old changeset
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
420
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
421 $ hg up -C
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
422 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
32698
1b5c61d38a52 update: show the commit to which we updated in case of multiple heads (BC)
Pulkit Goyal <7895pulkit@gmail.com>
parents: 31452
diff changeset
423 updated to "e8643552fde5: foobar"
28029
72072cfc7e91 update: warn about other topological heads on bare update
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 27678
diff changeset
424 1 other heads for branch "default"
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
425 $ rm added
27677
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
426 $ hg transplant --continue
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
427 abort: no transplant to continue
128ef8828ed5 transplant: only use checkunfinished if not continue
timeless <timeless@mozdev.org>
parents: 27676
diff changeset
428 [255]
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
429 $ hg transplant 1
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
430 applying 46ae92138f3c
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
431 patching file foo
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
432 Hunk #1 FAILED at 0
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
433 1 out of 1 hunks FAILED -- saving rejects to file foo.rej
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
434 patch failed to apply
27676
1c48f348f2d0 transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents: 27666
diff changeset
435 abort: fix up the working directory and run hg transplant --continue
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
436 [255]
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
437 $ cp .hg/transplant/journal .hg/transplant/journal.orig
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
438 $ cat .hg/transplant/journal
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
439 # User test
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
440 # Date 0 0
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
441 # Node ID 46ae92138f3ce0249f6789650403286ead052b6d
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
442 # Parent e8643552fde58f57515e19c4b373a57c96e62af3
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
443 foo2
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
444 $ grep -v 'Date' .hg/transplant/journal.orig > .hg/transplant/journal
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
445 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg transplant --continue -e
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
446 abort: filter corrupted changeset (no user or date)
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
447 [255]
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
448 $ cp .hg/transplant/journal.orig .hg/transplant/journal
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
449 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg transplant --continue -e
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
450 HGEDITFORM=transplant.normal
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
451 46ae92138f3c transplanted as 9159dada197d
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
452 $ hg transplant 1:3
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
453 skipping already applied revision 1:46ae92138f3c
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
454 applying 9d6d6b5a8275
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
455 9d6d6b5a8275 transplanted to 2d17a10c922f
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
456 applying 1dab759070cf
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
457 1dab759070cf transplanted to e06a69927eb0
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
458 $ hg locate
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
459 added
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
460 bar
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
461 baz
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
462 foo
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
463
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
464 test multiple revisions and --continue
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
465
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
466 $ hg up -qC 0
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
467 $ echo bazbaz > baz
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
468 $ hg ci -Am anotherbaz baz
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
469 created new head
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
470 $ hg transplant 1:3
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
471 applying 46ae92138f3c
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
472 46ae92138f3c transplanted to 1024233ea0ba
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
473 applying 9d6d6b5a8275
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
474 patching file baz
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
475 Hunk #1 FAILED at 0
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
476 1 out of 1 hunks FAILED -- saving rejects to file baz.rej
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
477 patch failed to apply
27676
1c48f348f2d0 transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents: 27666
diff changeset
478 abort: fix up the working directory and run hg transplant --continue
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
479 [255]
27678
b97004648028 transplant: specify the right file and path for unfinishedstates
timeless <timeless@mozdev.org>
parents: 27677
diff changeset
480 $ hg transplant 1:3
b97004648028 transplant: specify the right file and path for unfinishedstates
timeless <timeless@mozdev.org>
parents: 27677
diff changeset
481 abort: transplant in progress
b97004648028 transplant: specify the right file and path for unfinishedstates
timeless <timeless@mozdev.org>
parents: 27677
diff changeset
482 (use 'hg transplant --continue' or 'hg update' to abort)
b97004648028 transplant: specify the right file and path for unfinishedstates
timeless <timeless@mozdev.org>
parents: 27677
diff changeset
483 [255]
16507
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
484 $ echo fixed > baz
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
485 $ hg transplant --continue
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
486 9d6d6b5a8275 transplanted as d80c49962290
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
487 applying 1dab759070cf
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
488 1dab759070cf transplanted to aa0ffe6bd5ae
1f020021adfa transplant: do not rollback on patching error (issue3379)
Patrick Mezard <patrick@mezard.eu>
parents: 16400
diff changeset
489
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
490 $ cd ..
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
491
12399
4fee1fd3de9a tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents: 12376
diff changeset
492 Issue1111: Test transplant --merge
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
493
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
494 $ hg init t1111
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
495 $ cd t1111
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
496 $ echo a > a
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
497 $ hg ci -Am adda
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
498 adding a
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
499 $ echo b >> a
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
500 $ hg ci -m appendb
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
501 $ echo c >> a
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
502 $ hg ci -m appendc
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
503 $ hg up -C 0
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
504 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
505 $ echo d >> a
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
506 $ hg ci -m appendd
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
507 created new head
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
508
21024
7731a2281cf0 spelling: fixes from spell checker
Mads Kiilerich <madski@unity3d.com>
parents: 20269
diff changeset
509 transplant
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
510
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
511 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg transplant -m 1 -e
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
512 applying 42dc4432fd35
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
513 HGEDITFORM=transplant.merge
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
514 1:42dc4432fd35 merged at a9f4acbac129
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
515 $ hg update -q -C 2
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
516 $ cat > a <<EOF
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
517 > x
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
518 > y
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
519 > z
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
520 > EOF
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
521 $ hg commit -m replace
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
522 $ hg update -q -C 4
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
523 $ hg transplant -m 5
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
524 applying 600a3cdcb41d
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
525 patching file a
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
526 Hunk #1 FAILED at 0
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
527 1 out of 1 hunks FAILED -- saving rejects to file a.rej
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
528 patch failed to apply
27676
1c48f348f2d0 transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents: 27666
diff changeset
529 abort: fix up the working directory and run hg transplant --continue
22252
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
530 [255]
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
531 $ HGEDITOR="sh $TESTTMP/checkeditform.sh" hg transplant --continue -e
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
532 HGEDITFORM=transplant.merge
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
533 600a3cdcb41d transplanted as a3f88be652e0
de783f2403c4 transplant: change "editform" to distinguish merge commits from others
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 22046
diff changeset
534
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
535 $ cd ..
6639
6334569c8caa localrepo: fix partial merge test (issue 1111)
Patrick Mezard <pmezard@gmail.com>
parents: 5384
diff changeset
536
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
537 test transplant into empty repository
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
538
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
539 $ hg init empty
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
540 $ cd empty
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
541 $ hg transplant -s ../t -b tip -a
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
542 adding changesets
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
543 adding manifests
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
544 adding file changes
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
545 added 4 changesets with 4 changes to 4 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34251
diff changeset
546 new changesets 17ab29e464c6:a53251cdf717
20020
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
547
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
548 test "--merge" causing pull from source repository on local host
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
549
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
550 $ hg --config extensions.mq= -q strip 2
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
551 $ hg transplant -s ../t --merge tip
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
552 searching for changes
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
553 searching for changes
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
554 adding changesets
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
555 adding manifests
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
556 adding file changes
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
557 added 2 changesets with 2 changes to 2 files
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
558 applying a53251cdf717
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
559 4:a53251cdf717 merged at 4831f4dc831a
6fb59247c7d5 transplant: use peer of source repository as "remote" for "repo.pull()"
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 18138
diff changeset
560
20267
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
561 test interactive transplant
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
562
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
563 $ hg --config extensions.strip= -q strip 0
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
564 $ hg -R ../t log -G --template "{rev}:{node|short}"
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
565 @ 4:a53251cdf717
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
566 |
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
567 o 3:722f4667af76
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
568 |
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
569 o 2:37a1297eb21b
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
570 |
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
571 | o 1:d11e3596cc1a
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
572 |/
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
573 o 0:17ab29e464c6
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
574
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
575 $ hg transplant -q --config ui.interactive=true -s ../t <<EOF
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
576 > ?
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
577 > x
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
578 > q
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
579 > EOF
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
580 0:17ab29e464c6
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
581 apply changeset? [ynmpcq?]: ?
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
582 y: yes, transplant this changeset
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
583 n: no, skip this changeset
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
584 m: merge at this changeset
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
585 p: show patch
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
586 c: commit selected changesets
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
587 q: quit and cancel transplant
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
588 ?: ? (show this help)
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
589 apply changeset? [ynmpcq?]: x
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
590 unrecognized response
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
591 apply changeset? [ynmpcq?]: q
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
592 $ hg transplant -q --config ui.interactive=true -s ../t <<EOF
20267
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
593 > p
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
594 > y
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
595 > n
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
596 > n
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
597 > m
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
598 > c
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
599 > EOF
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
600 0:17ab29e464c6
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
601 apply changeset? [ynmpcq?]: p
41784
251332dbf33d diff: make sure we output stat even when --git is not passed (issue4037) (BC)
Pulkit Goyal <pulkit@yandex-team.ru>
parents: 41371
diff changeset
602 diff -r 000000000000 -r 17ab29e464c6 r1
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
603 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
20267
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
604 +++ b/r1 Thu Jan 01 00:00:00 1970 +0000
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
605 @@ -0,0 +1,1 @@
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
606 +r1
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
607 apply changeset? [ynmpcq?]: y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
608 1:d11e3596cc1a
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
609 apply changeset? [ynmpcq?]: n
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
610 2:37a1297eb21b
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
611 apply changeset? [ynmpcq?]: n
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
612 3:722f4667af76
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
613 apply changeset? [ynmpcq?]: m
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
614 4:a53251cdf717
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
615 apply changeset? [ynmpcq?]: c
20267
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
616 $ hg log -G --template "{node|short}"
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
617 @ 88be5dde5260
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
618 |\
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
619 | o 722f4667af76
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
620 | |
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
621 | o 37a1297eb21b
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
622 |/
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
623 o 17ab29e464c6
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
624
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
625 $ hg transplant -q --config ui.interactive=true -s ../t <<EOF
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
626 > x
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
627 > ?
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
628 > y
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
629 > q
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
630 > EOF
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
631 1:d11e3596cc1a
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
632 apply changeset? [ynmpcq?]: x
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
633 unrecognized response
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
634 apply changeset? [ynmpcq?]: ?
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
635 y: yes, transplant this changeset
20269
acb6cceaffd5 transplant: use "ui.extractchoices()" to show the list of available responses
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20268
diff changeset
636 n: no, skip this changeset
20267
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
637 m: merge at this changeset
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
638 p: show patch
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
639 c: commit selected changesets
20269
acb6cceaffd5 transplant: use "ui.extractchoices()" to show the list of available responses
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20268
diff changeset
640 q: quit and cancel transplant
acb6cceaffd5 transplant: use "ui.extractchoices()" to show the list of available responses
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20268
diff changeset
641 ?: ? (show this help)
22589
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
642 apply changeset? [ynmpcq?]: y
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
643 4:a53251cdf717
9ab18a912c44 ui: show prompt choice if input is not a tty but is forced to be interactive
Mads Kiilerich <madski@unity3d.com>
parents: 22252
diff changeset
644 apply changeset? [ynmpcq?]: q
20267
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
645 $ hg heads --template "{node|short}\n"
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
646 88be5dde5260
5a7aeb1e68b3 transplant: add test for interactive transplant
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 20020
diff changeset
647
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
648 $ cd ..
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
649
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
650
16972
5efe9c6a34fe tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16912
diff changeset
651 #if unix-permissions system-sh
5efe9c6a34fe tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16912
diff changeset
652
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
653 test filter
8173
d3fb413667e5 transplant: remove the restriction that the destination be nonempty.
Jacob Lee <artdent@gmail.com>
parents: 8167
diff changeset
654
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
655 $ hg init filter
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
656 $ cd filter
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
657 $ cat <<'EOF' >test-filter
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
658 > #!/bin/sh
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
659 > sed 's/r1/r2/' $1 > $1.new
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
660 > mv $1.new $1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
661 > EOF
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
662 $ chmod +x test-filter
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
663 $ hg transplant -s ../t -b tip -a --filter ./test-filter
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
664 filtering * (glob)
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
665 applying 17ab29e464c6
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
666 17ab29e464c6 transplanted to e9ffc54ea104
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
667 filtering * (glob)
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
668 applying 37a1297eb21b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
669 37a1297eb21b transplanted to 348b36d0b6a5
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
670 filtering * (glob)
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
671 applying 722f4667af76
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
672 722f4667af76 transplanted to 0aa6979afb95
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
673 filtering * (glob)
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
674 applying a53251cdf717
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
675 a53251cdf717 transplanted to 14f8512272b5
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
676 $ hg log --template '{rev} {parents} {desc}\n'
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
677 3 b3
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
678 2 b2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
679 1 b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
680 0 r2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
681 $ cd ..
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
682
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
683
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
684 test filter with failed patch
8173
d3fb413667e5 transplant: remove the restriction that the destination be nonempty.
Jacob Lee <artdent@gmail.com>
parents: 8167
diff changeset
685
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
686 $ cd filter
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
687 $ hg up 0
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
688 0 files updated, 0 files merged, 3 files removed, 0 files unresolved
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
689 $ echo foo > b1
12156
4c94b6d0fb1c tests: remove unneeded -d flags
Martin Geisler <mg@lazybytes.net>
parents: 12070
diff changeset
690 $ hg ci -Am foo
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
691 adding b1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
692 adding test-filter
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
693 created new head
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
694 $ hg transplant 1 --filter ./test-filter
12376
97ffc68f71d3 tests: add glob matching for unified tests
Brodie Rao <brodie@bitheap.org>
parents: 12375
diff changeset
695 filtering * (glob)
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
696 applying 348b36d0b6a5
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
697 file b1 already exists
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
698 1 out of 1 hunks FAILED -- saving rejects to file b1.rej
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
699 patch failed to apply
27676
1c48f348f2d0 transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents: 27666
diff changeset
700 abort: fix up the working directory and run hg transplant --continue
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12156
diff changeset
701 [255]
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
702 $ cd ..
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
703
13579
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
704 test environment passed to filter
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
705
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
706 $ hg init filter-environment
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
707 $ cd filter-environment
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
708 $ cat <<'EOF' >test-filter-environment
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
709 > #!/bin/sh
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
710 > echo "Transplant by $HGUSER" >> $1
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
711 > echo "Transplant from rev $HGREVISION" >> $1
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
712 > EOF
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
713 $ chmod +x test-filter-environment
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
714 $ hg transplant -s ../t --filter ./test-filter-environment 0
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
715 filtering * (glob)
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
716 applying 17ab29e464c6
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
717 17ab29e464c6 transplanted to 5190e68026a0
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
718
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
719 $ hg log --template '{rev} {parents} {desc}\n'
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
720 0 r1
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
721 Transplant by test
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
722 Transplant from rev 17ab29e464c6ca53e329470efe2a9918ac617a6f
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
723 $ cd ..
3cbb3c57a50e transplant: added 'HGREVISION' variable to the environment passed to the 'filter' command
Luke Plant <L.Plant.98@cantab.net>
parents: 12943
diff changeset
724
13789
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
725 test transplant with filter handles invalid changelog
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
726
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
727 $ hg init filter-invalid-log
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
728 $ cd filter-invalid-log
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
729 $ cat <<'EOF' >test-filter-invalid-log
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
730 > #!/bin/sh
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
731 > echo "" > $1
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
732 > EOF
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
733 $ chmod +x test-filter-invalid-log
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
734 $ hg transplant -s ../t --filter ./test-filter-invalid-log 0
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
735 filtering * (glob)
13790
c0ed76b5056d Fix transplant error message to correspond with test
Brendan Cully <brendan@kublai.com>
parents: 13789
diff changeset
736 abort: filter corrupted changeset (no user or date)
13789
7e5031180c0f transplant: fix crash if filter script munges log file
Luke Plant <L.Plant.98@cantab.net>
parents: 13689
diff changeset
737 [255]
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16627
diff changeset
738 $ cd ..
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
739
16972
5efe9c6a34fe tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16912
diff changeset
740 #endif
5efe9c6a34fe tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16912
diff changeset
741
5efe9c6a34fe tests: add some missing #if's / hghave requirements
Mads Kiilerich <mads@kiilerich.com>
parents: 16912
diff changeset
742
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
743 test with a win32ext like setup (differing EOLs)
8811
8b35b08724eb Make mq, record and transplant honor patch.eol
Patrick Mezard <pmezard@gmail.com>
parents: 8518
diff changeset
744
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
745 $ hg init twin1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
746 $ cd twin1
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
747 $ echo a > a
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
748 $ echo b > b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
749 $ echo b >> b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
750 $ hg ci -Am t
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
751 adding a
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
752 adding b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
753 $ echo a > b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
754 $ echo b >> b
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
755 $ hg ci -m changeb
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
756 $ cd ..
9995
eba6c8687fd2 transplant: fix small bug when a patch fails while using --filter
Sune Foldager <cryo@cyanite.org>
parents: 8811
diff changeset
757
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
758 $ hg init twin2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
759 $ cd twin2
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
760 $ echo '[patch]' >> .hg/hgrc
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
761 $ echo 'eol = crlf' >> .hg/hgrc
39707
5abc47d4ca6b tests: quote PYTHON usage
Matt Harbison <matt_harbison@yahoo.com>
parents: 38371
diff changeset
762 $ "$PYTHON" -c "open('b', 'wb').write(b'b\r\nb\r\n')"
14012
b247123d71f6 test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents: 12943
diff changeset
763 $ hg ci -Am addb
b247123d71f6 test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents: 12943
diff changeset
764 adding b
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
765 $ hg transplant -s ../twin1 tip
14012
b247123d71f6 test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents: 12943
diff changeset
766 searching for changes
b247123d71f6 test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents: 12943
diff changeset
767 warning: repository is unrelated
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
768 applying 2e849d776c17
14012
b247123d71f6 test-transplant: fix missing file addition
Patrick Mezard <pmezard@gmail.com>
parents: 12943
diff changeset
769 2e849d776c17 transplanted to 8e65bebc063e
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
770 $ cat b
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
771 a\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12847
diff changeset
772 b\r (esc)
11800
88c3ff051270 tests: unify test-transplant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 9995
diff changeset
773 $ cd ..
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
774
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
775 test transplant with merge changeset is skipped
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
776
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
777 $ hg init merge1a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
778 $ cd merge1a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
779 $ echo a > a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
780 $ hg ci -Am a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
781 adding a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
782 $ hg branch b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
783 marked working directory as branch b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
784 (branches are permanent and global, did you want a bookmark?)
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
785 $ hg ci -m branchb
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
786 $ echo b > b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
787 $ hg ci -Am b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
788 adding b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
789 $ hg update default
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
790 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
791 $ hg merge b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
792 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
793 (branch merge, don't forget to commit)
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
794 $ hg ci -m mergeb
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
795 $ cd ..
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
796
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
797 $ hg init merge1b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
798 $ cd merge1b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
799 $ hg transplant -s ../merge1a tip
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16627
diff changeset
800 $ cd ..
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
801
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
802 test transplant with merge changeset accepts --parent
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
803
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
804 $ hg init merge2a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
805 $ cd merge2a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
806 $ echo a > a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
807 $ hg ci -Am a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
808 adding a
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
809 $ hg branch b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
810 marked working directory as branch b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
811 (branches are permanent and global, did you want a bookmark?)
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
812 $ hg ci -m branchb
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
813 $ echo b > b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
814 $ hg ci -Am b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
815 adding b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
816 $ hg update default
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
817 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
818 $ hg merge b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
819 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
820 (branch merge, don't forget to commit)
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
821 $ hg ci -m mergeb
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
822 $ cd ..
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
823
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
824 $ hg init merge2b
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
825 $ cd merge2b
27666
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
826 $ hg transplant -s ../merge2a --parent tip tip
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
827 abort: be9f9b39483f is not a parent of be9f9b39483f
cd2f691f20b8 test-transplant.t: improve test coverage
timeless <timeless@mozdev.org>
parents: 27639
diff changeset
828 [255]
16400
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
829 $ hg transplant -s ../merge2a --parent 0 tip
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
830 applying be9f9b39483f
f2ba409dbb0f transplant: permit merge changesets via --parent
Steven Stallion <sstallion@gmail.com>
parents: 15446
diff changeset
831 be9f9b39483f transplanted to 9959e51f94d1
16912
6ef3107c661e tests: cleanup of tests that got lost in their own nested directories
Mads Kiilerich <mads@kiilerich.com>
parents: 16627
diff changeset
832 $ cd ..
17319
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
833
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
834 test transplanting a patch turning into a no-op
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
835
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
836 $ hg init binarysource
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
837 $ cd binarysource
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
838 $ echo a > a
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
839 $ hg ci -Am adda a
38371
fb4813304c5f py3: add `and None` to suppress return values of .write() calls
Pulkit Goyal <7895pulkit@gmail.com>
parents: 37845
diff changeset
840 >>> open('b', 'wb').write(b'\0b1') and None
17319
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
841 $ hg ci -Am addb b
38371
fb4813304c5f py3: add `and None` to suppress return values of .write() calls
Pulkit Goyal <7895pulkit@gmail.com>
parents: 37845
diff changeset
842 >>> open('b', 'wb').write(b'\0b2') and None
17319
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
843 $ hg ci -m changeb b
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
844 $ cd ..
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
845
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
846 $ hg clone -r0 binarysource binarydest
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
847 adding changesets
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
848 adding manifests
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
849 adding file changes
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
850 added 1 changesets with 1 changes to 1 files
34661
eb586ed5d8ce transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents: 34251
diff changeset
851 new changesets 07f494440405
17319
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
852 updating to branch default
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
853 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
854 $ cd binarydest
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
855 $ cp ../binarysource/b b
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
856 $ hg ci -Am addb2 b
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
857 $ hg transplant -s ../binarysource 2
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
858 searching for changes
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
859 applying 7a7d57e15850
17320
0c3c65c0d3fc transplant: fix emptied changeset message
Patrick Mezard <patrick@mezard.eu>
parents: 17319
diff changeset
860 skipping emptied changeset 7a7d57e15850
23781
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
861
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
862 Test empty result in --continue
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
863
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
864 $ hg transplant -s ../binarysource 1
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
865 searching for changes
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
866 applying 645035761929
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
867 file b already exists
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
868 1 out of 1 hunks FAILED -- saving rejects to file b.rej
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
869 patch failed to apply
27676
1c48f348f2d0 transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents: 27666
diff changeset
870 abort: fix up the working directory and run hg transplant --continue
23781
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
871 [255]
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
872 $ hg status
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
873 ? b.rej
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
874 $ hg transplant --continue
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
875 645035761929 skipped due to empty diff
49caef455912 transplant: properly skip empty changeset (issue4423)
Pierre-Yves David <pierre-yves.david@fb.com>
parents: 23452
diff changeset
876
17319
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
877 $ cd ..
a189d4470a34 transplant: handle non-empty patches doing nothing (issue2806)
Patrick Mezard <patrick@mezard.eu>
parents: 17186
diff changeset
878
17539
bc7377160fa7 tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 17320
diff changeset
879 Explicitly kill daemons to let the test exit on Windows
bc7377160fa7 tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 17320
diff changeset
880
25474
8c14f87bd0ae tests: drop DAEMON_PIDS from killdaemons calls
Matt Mackall <mpm@selenic.com>
parents: 25472
diff changeset
881 $ killdaemons.py
17539
bc7377160fa7 tests: enable more server tests on Windows
Patrick Mezard <patrick@mezard.eu>
parents: 17320
diff changeset
882
25757
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
883 Test that patch-ed files are treated as "modified", when transplant is
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
884 aborted by failure of patching, even if none of mode, size and
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
885 timestamp of them isn't changed on the filesystem (see also issue4583)
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
886
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
887 $ cd t
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
888
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
889 $ cat > $TESTTMP/abort.py <<EOF
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
890 > # emulate that patch.patch() is aborted at patching on "abort" file
34251
61714510220d error: move patch.PatchError so it can easily implement __bytes__ (API)
Yuya Nishihara <yuya@tcha.org>
parents: 32698
diff changeset
891 > from mercurial import error, extensions, patch as patchmod
25757
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
892 > def patch(orig, ui, repo, patchname,
36326
a2cbff474821 py3: add b'' prefixes in test-transplant.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36016
diff changeset
893 > strip=1, prefix=b'', files=None,
a2cbff474821 py3: add b'' prefixes in test-transplant.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36016
diff changeset
894 > eolmode=b'strict', similarity=0):
25757
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
895 > if files is None:
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
896 > files = set()
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
897 > r = orig(ui, repo, patchname,
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
898 > strip=strip, prefix=prefix, files=files,
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
899 > eolmode=eolmode, similarity=similarity)
36326
a2cbff474821 py3: add b'' prefixes in test-transplant.t
Pulkit Goyal <7895pulkit@gmail.com>
parents: 36016
diff changeset
900 > if b'abort' in files:
34251
61714510220d error: move patch.PatchError so it can easily implement __bytes__ (API)
Yuya Nishihara <yuya@tcha.org>
parents: 32698
diff changeset
901 > raise error.PatchError('intentional error while patching')
25757
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
902 > return r
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
903 > def extsetup(ui):
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
904 > extensions.wrapfunction(patchmod, 'patch', patch)
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
905 > EOF
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
906
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
907 $ echo X1 > r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
908 $ hg diff --nodates r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
909 diff -r a53251cdf717 r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
910 --- a/r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
911 +++ b/r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
912 @@ -1,1 +1,1 @@
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
913 -r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
914 +X1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
915 $ hg commit -m "X1 as r1"
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
916
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
917 $ echo 'marking to abort patching' > abort
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
918 $ hg add abort
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
919 $ echo Y1 > r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
920 $ hg diff --nodates r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
921 diff -r 22c515968f13 r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
922 --- a/r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
923 +++ b/r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
924 @@ -1,1 +1,1 @@
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
925 -X1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
926 +Y1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
927 $ hg commit -m "Y1 as r1"
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
928
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
929 $ hg update -q -C d11e3596cc1a
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
930 $ cat r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
931 r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
932
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
933 $ cat >> .hg/hgrc <<EOF
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
934 > [fakedirstatewritetime]
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
935 > # emulate invoking dirstate.write() via repo.status() or markcommitted()
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
936 > # at 2000-01-01 00:00
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
937 > fakenow = 200001010000
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
938 >
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
939 > # emulate invoking patch.internalpatch() at 2000-01-01 00:00
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
940 > [fakepatchtime]
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
941 > fakenow = 200001010000
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
942 >
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
943 > [extensions]
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
944 > fakedirstatewritetime = $TESTDIR/fakedirstatewritetime.py
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
945 > fakepatchtime = $TESTDIR/fakepatchtime.py
27639
dbd47b21fd28 cleanup: remove superfluous space after space after equals (tests)
timeless <timeless@mozdev.org>
parents: 25879
diff changeset
946 > abort = $TESTTMP/abort.py
25757
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
947 > EOF
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
948 $ hg transplant "22c515968f13::"
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
949 applying 22c515968f13
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
950 22c515968f13 transplanted to * (glob)
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
951 applying e38700ba9dd3
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
952 intentional error while patching
27676
1c48f348f2d0 transplant: correct language to use working directory
timeless <timeless@mozdev.org>
parents: 27666
diff changeset
953 abort: fix up the working directory and run hg transplant --continue
25757
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
954 [255]
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
955 $ cat >> .hg/hgrc <<EOF
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
956 > [hooks]
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
957 > fakedirstatewritetime = !
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
958 > fakepatchtime = !
25879
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
959 > [extensions]
25757
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
960 > abort = !
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
961 > EOF
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
962
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
963 $ cat r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
964 Y1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
965 $ hg debugstate | grep ' r1$'
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
966 n 644 3 unset r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
967 $ hg status -A r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
968 M r1
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
969
25879
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
970 Test that rollback by unexpected failure after transplanting the first
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
971 revision restores dirstate correctly.
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
972
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
973 $ hg rollback -q
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
974 $ rm -f abort
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
975 $ hg update -q -C d11e3596cc1a
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
976 $ hg parents -T "{node|short}\n"
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
977 d11e3596cc1a
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
978 $ hg status -A
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
979 C r1
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
980 C r2
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
981
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
982 $ cat >> .hg/hgrc <<EOF
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
983 > [hooks]
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
984 > # emulate failure at transplanting the 2nd revision
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
985 > pretxncommit.abort = test ! -f abort
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
986 > EOF
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
987 $ hg transplant "22c515968f13::"
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
988 applying 22c515968f13
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
989 22c515968f13 transplanted to * (glob)
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
990 applying e38700ba9dd3
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
991 transaction abort!
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
992 rollback completed
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
993 abort: pretxncommit.abort hook exited with status 1
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
994 [255]
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
995 $ cat >> .hg/hgrc <<EOF
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
996 > [hooks]
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
997 > pretxncommit.abort = !
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
998 > EOF
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
999
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
1000 $ hg parents -T "{node|short}\n"
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
1001 d11e3596cc1a
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
1002 $ hg status -A
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
1003 M r1
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
1004 ? abort
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
1005 C r2
99e88320d665 transplant: restore dirstate correctly at unexpected failure
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25757
diff changeset
1006
25757
4d1382fd96ff context: write dirstate out explicitly at the end of markcommitted
FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
parents: 25695
diff changeset
1007 $ cd ..