##// END OF EJS Templates
tests: skip some tests when using simple store...
Gregory Szorc -
r37361:0611c954 default
parent child Browse files
Show More
@@ -1,356 +1,358 b''
1 #require no-reposimplestore
2
1 Check whether size of generaldelta revlog is not bigger than its
3 Check whether size of generaldelta revlog is not bigger than its
2 regular equivalent. Test would fail if generaldelta was naive
4 regular equivalent. Test would fail if generaldelta was naive
3 implementation of parentdelta: third manifest revision would be fully
5 implementation of parentdelta: third manifest revision would be fully
4 inserted due to big distance from its paren revision (zero).
6 inserted due to big distance from its paren revision (zero).
5
7
6 $ hg init repo --config format.generaldelta=no --config format.usegeneraldelta=no
8 $ hg init repo --config format.generaldelta=no --config format.usegeneraldelta=no
7 $ cd repo
9 $ cd repo
8 $ echo foo > foo
10 $ echo foo > foo
9 $ echo bar > bar
11 $ echo bar > bar
10 $ echo baz > baz
12 $ echo baz > baz
11 $ hg commit -q -Am boo
13 $ hg commit -q -Am boo
12 $ hg clone --pull . ../gdrepo -q --config format.generaldelta=yes
14 $ hg clone --pull . ../gdrepo -q --config format.generaldelta=yes
13 $ for r in 1 2 3; do
15 $ for r in 1 2 3; do
14 > echo $r > foo
16 > echo $r > foo
15 > hg commit -q -m $r
17 > hg commit -q -m $r
16 > hg up -q -r 0
18 > hg up -q -r 0
17 > hg pull . -q -r $r -R ../gdrepo
19 > hg pull . -q -r $r -R ../gdrepo
18 > done
20 > done
19
21
20 $ cd ..
22 $ cd ..
21 >>> from __future__ import print_function
23 >>> from __future__ import print_function
22 >>> import os
24 >>> import os
23 >>> regsize = os.stat("repo/.hg/store/00manifest.i").st_size
25 >>> regsize = os.stat("repo/.hg/store/00manifest.i").st_size
24 >>> gdsize = os.stat("gdrepo/.hg/store/00manifest.i").st_size
26 >>> gdsize = os.stat("gdrepo/.hg/store/00manifest.i").st_size
25 >>> if regsize < gdsize:
27 >>> if regsize < gdsize:
26 ... print('generaldata increased size of manifest')
28 ... print('generaldata increased size of manifest')
27
29
28 Verify rev reordering doesnt create invalid bundles (issue4462)
30 Verify rev reordering doesnt create invalid bundles (issue4462)
29 This requires a commit tree that when pulled will reorder manifest revs such
31 This requires a commit tree that when pulled will reorder manifest revs such
30 that the second manifest to create a file rev will be ordered before the first
32 that the second manifest to create a file rev will be ordered before the first
31 manifest to create that file rev. We also need to do a partial pull to ensure
33 manifest to create that file rev. We also need to do a partial pull to ensure
32 reordering happens. At the end we verify the linkrev points at the earliest
34 reordering happens. At the end we verify the linkrev points at the earliest
33 commit.
35 commit.
34
36
35 $ hg init server --config format.generaldelta=True
37 $ hg init server --config format.generaldelta=True
36 $ cd server
38 $ cd server
37 $ touch a
39 $ touch a
38 $ hg commit -Aqm a
40 $ hg commit -Aqm a
39 $ echo x > x
41 $ echo x > x
40 $ echo y > y
42 $ echo y > y
41 $ hg commit -Aqm xy
43 $ hg commit -Aqm xy
42 $ hg up -q '.^'
44 $ hg up -q '.^'
43 $ echo x > x
45 $ echo x > x
44 $ echo z > z
46 $ echo z > z
45 $ hg commit -Aqm xz
47 $ hg commit -Aqm xz
46 $ hg up -q 1
48 $ hg up -q 1
47 $ echo b > b
49 $ echo b > b
48 $ hg commit -Aqm b
50 $ hg commit -Aqm b
49 $ hg merge -q 2
51 $ hg merge -q 2
50 $ hg commit -Aqm merge
52 $ hg commit -Aqm merge
51 $ echo c > c
53 $ echo c > c
52 $ hg commit -Aqm c
54 $ hg commit -Aqm c
53 $ hg log -G -T '{rev} {shortest(node)} {desc}'
55 $ hg log -G -T '{rev} {shortest(node)} {desc}'
54 @ 5 ebb8 c
56 @ 5 ebb8 c
55 |
57 |
56 o 4 baf7 merge
58 o 4 baf7 merge
57 |\
59 |\
58 | o 3 a129 b
60 | o 3 a129 b
59 | |
61 | |
60 o | 2 958c xz
62 o | 2 958c xz
61 | |
63 | |
62 | o 1 f00c xy
64 | o 1 f00c xy
63 |/
65 |/
64 o 0 3903 a
66 o 0 3903 a
65
67
66 $ cd ..
68 $ cd ..
67 $ hg init client --config format.generaldelta=false --config format.usegeneraldelta=false
69 $ hg init client --config format.generaldelta=false --config format.usegeneraldelta=false
68 $ cd client
70 $ cd client
69 $ hg pull -q ../server -r 4
71 $ hg pull -q ../server -r 4
70 $ hg debugdeltachain x
72 $ hg debugdeltachain x
71 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
73 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
72 0 1 1 -1 base 3 2 3 1.50000 3 0 0.00000
74 0 1 1 -1 base 3 2 3 1.50000 3 0 0.00000
73
75
74 $ cd ..
76 $ cd ..
75
77
76 Test "usegeneraldelta" config
78 Test "usegeneraldelta" config
77 (repo are general delta, but incoming bundle are not re-deltafied)
79 (repo are general delta, but incoming bundle are not re-deltafied)
78
80
79 delta coming from the server base delta server are not recompressed.
81 delta coming from the server base delta server are not recompressed.
80 (also include the aggressive version for comparison)
82 (also include the aggressive version for comparison)
81
83
82 $ hg clone repo --pull --config format.usegeneraldelta=1 usegd
84 $ hg clone repo --pull --config format.usegeneraldelta=1 usegd
83 requesting all changes
85 requesting all changes
84 adding changesets
86 adding changesets
85 adding manifests
87 adding manifests
86 adding file changes
88 adding file changes
87 added 4 changesets with 6 changes to 3 files (+2 heads)
89 added 4 changesets with 6 changes to 3 files (+2 heads)
88 new changesets 0ea3fcf9d01d:bba78d330d9c
90 new changesets 0ea3fcf9d01d:bba78d330d9c
89 updating to branch default
91 updating to branch default
90 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
92 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
91 $ hg clone repo --pull --config format.generaldelta=1 full
93 $ hg clone repo --pull --config format.generaldelta=1 full
92 requesting all changes
94 requesting all changes
93 adding changesets
95 adding changesets
94 adding manifests
96 adding manifests
95 adding file changes
97 adding file changes
96 added 4 changesets with 6 changes to 3 files (+2 heads)
98 added 4 changesets with 6 changes to 3 files (+2 heads)
97 new changesets 0ea3fcf9d01d:bba78d330d9c
99 new changesets 0ea3fcf9d01d:bba78d330d9c
98 updating to branch default
100 updating to branch default
99 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
101 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
100 $ hg -R repo debugdeltachain -m
102 $ hg -R repo debugdeltachain -m
101 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
103 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
102 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000
104 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000
103 1 1 2 0 prev 57 135 161 1.19259 161 0 0.00000
105 1 1 2 0 prev 57 135 161 1.19259 161 0 0.00000
104 2 1 3 1 prev 57 135 218 1.61481 218 0 0.00000
106 2 1 3 1 prev 57 135 218 1.61481 218 0 0.00000
105 3 2 1 -1 base 104 135 104 0.77037 104 0 0.00000
107 3 2 1 -1 base 104 135 104 0.77037 104 0 0.00000
106 $ hg -R usegd debugdeltachain -m
108 $ hg -R usegd debugdeltachain -m
107 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
109 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
108 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000
110 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000
109 1 1 2 0 p1 57 135 161 1.19259 161 0 0.00000
111 1 1 2 0 p1 57 135 161 1.19259 161 0 0.00000
110 2 1 3 1 prev 57 135 218 1.61481 218 0 0.00000
112 2 1 3 1 prev 57 135 218 1.61481 218 0 0.00000
111 3 1 2 0 p1 57 135 161 1.19259 275 114 0.70807
113 3 1 2 0 p1 57 135 161 1.19259 275 114 0.70807
112 $ hg -R full debugdeltachain -m
114 $ hg -R full debugdeltachain -m
113 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
115 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
114 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000
116 0 1 1 -1 base 104 135 104 0.77037 104 0 0.00000
115 1 1 2 0 p1 57 135 161 1.19259 161 0 0.00000
117 1 1 2 0 p1 57 135 161 1.19259 161 0 0.00000
116 2 1 2 0 p1 57 135 161 1.19259 218 57 0.35404
118 2 1 2 0 p1 57 135 161 1.19259 218 57 0.35404
117 3 1 2 0 p1 57 135 161 1.19259 275 114 0.70807
119 3 1 2 0 p1 57 135 161 1.19259 275 114 0.70807
118
120
119 Test format.aggressivemergedeltas
121 Test format.aggressivemergedeltas
120
122
121 $ hg init --config format.generaldelta=1 aggressive
123 $ hg init --config format.generaldelta=1 aggressive
122 $ cd aggressive
124 $ cd aggressive
123 $ cat << EOF >> .hg/hgrc
125 $ cat << EOF >> .hg/hgrc
124 > [format]
126 > [format]
125 > generaldelta = 1
127 > generaldelta = 1
126 > EOF
128 > EOF
127 $ touch a b c d e
129 $ touch a b c d e
128 $ hg commit -Aqm side1
130 $ hg commit -Aqm side1
129 $ hg up -q null
131 $ hg up -q null
130 $ touch x y
132 $ touch x y
131 $ hg commit -Aqm side2
133 $ hg commit -Aqm side2
132
134
133 - Verify non-aggressive merge uses p1 (commit 1) as delta parent
135 - Verify non-aggressive merge uses p1 (commit 1) as delta parent
134 $ hg merge -q 0
136 $ hg merge -q 0
135 $ hg commit -q -m merge
137 $ hg commit -q -m merge
136 $ hg debugdeltachain -m
138 $ hg debugdeltachain -m
137 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
139 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
138 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000
140 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000
139 1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000
141 1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000
140 2 1 3 1 p1 65 301 185 0.61462 185 0 0.00000
142 2 1 3 1 p1 65 301 185 0.61462 185 0 0.00000
141
143
142 $ hg strip -q -r . --config extensions.strip=
144 $ hg strip -q -r . --config extensions.strip=
143
145
144 - Verify aggressive merge uses p2 (commit 0) as delta parent
146 - Verify aggressive merge uses p2 (commit 0) as delta parent
145 $ hg up -q -C 1
147 $ hg up -q -C 1
146 $ hg merge -q 0
148 $ hg merge -q 0
147 $ hg commit -q -m merge --config format.aggressivemergedeltas=True
149 $ hg commit -q -m merge --config format.aggressivemergedeltas=True
148 $ hg debugdeltachain -m
150 $ hg debugdeltachain -m
149 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
151 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
150 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000
152 0 1 1 -1 base 59 215 59 0.27442 59 0 0.00000
151 1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000
153 1 1 2 0 prev 61 86 120 1.39535 120 0 0.00000
152 2 1 2 0 p2 62 301 121 0.40199 182 61 0.50413
154 2 1 2 0 p2 62 301 121 0.40199 182 61 0.50413
153
155
154 Test that strip bundle use bundle2
156 Test that strip bundle use bundle2
155 $ hg --config extensions.strip= strip .
157 $ hg --config extensions.strip= strip .
156 0 files updated, 0 files merged, 5 files removed, 0 files unresolved
158 0 files updated, 0 files merged, 5 files removed, 0 files unresolved
157 saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg
159 saved backup bundle to $TESTTMP/aggressive/.hg/strip-backup/1c5d4dc9a8b8-6c68e60c-backup.hg
158 $ hg debugbundle .hg/strip-backup/*
160 $ hg debugbundle .hg/strip-backup/*
159 Stream params: {Compression: BZ}
161 Stream params: {Compression: BZ}
160 changegroup -- {nbchanges: 1, version: 02}
162 changegroup -- {nbchanges: 1, version: 02}
161 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9
163 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9
162 cache:rev-branch-cache -- {}
164 cache:rev-branch-cache -- {}
163 phase-heads -- {}
165 phase-heads -- {}
164 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9 draft
166 1c5d4dc9a8b8d6e1750966d343e94db665e7a1e9 draft
165
167
166 $ cd ..
168 $ cd ..
167
169
168 test maxdeltachainspan
170 test maxdeltachainspan
169
171
170 $ hg init source-repo
172 $ hg init source-repo
171 $ cd source-repo
173 $ cd source-repo
172 $ hg debugbuilddag --new-file '.+5:brancha$.+11:branchb$.+30:branchc<brancha+2<branchb+2'
174 $ hg debugbuilddag --new-file '.+5:brancha$.+11:branchb$.+30:branchc<brancha+2<branchb+2'
173 $ cd ..
175 $ cd ..
174 $ hg -R source-repo debugdeltachain -m
176 $ hg -R source-repo debugdeltachain -m
175 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
177 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
176 0 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
178 0 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
177 1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
179 1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
178 2 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
180 2 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
179 3 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
181 3 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
180 4 1 5 3 p1 57 225 274 1.21778 274 0 0.00000
182 4 1 5 3 p1 57 225 274 1.21778 274 0 0.00000
181 5 1 6 4 p1 57 270 331 1.22593 331 0 0.00000
183 5 1 6 4 p1 57 270 331 1.22593 331 0 0.00000
182 6 2 1 -1 base 46 45 46 1.02222 46 0 0.00000
184 6 2 1 -1 base 46 45 46 1.02222 46 0 0.00000
183 7 2 2 6 p1 57 90 103 1.14444 103 0 0.00000
185 7 2 2 6 p1 57 90 103 1.14444 103 0 0.00000
184 8 2 3 7 p1 57 135 160 1.18519 160 0 0.00000
186 8 2 3 7 p1 57 135 160 1.18519 160 0 0.00000
185 9 2 4 8 p1 57 180 217 1.20556 217 0 0.00000
187 9 2 4 8 p1 57 180 217 1.20556 217 0 0.00000
186 10 2 5 9 p1 58 226 275 1.21681 275 0 0.00000
188 10 2 5 9 p1 58 226 275 1.21681 275 0 0.00000
187 11 2 6 10 p1 58 272 333 1.22426 333 0 0.00000
189 11 2 6 10 p1 58 272 333 1.22426 333 0 0.00000
188 12 2 7 11 p1 58 318 391 1.22956 391 0 0.00000
190 12 2 7 11 p1 58 318 391 1.22956 391 0 0.00000
189 13 2 8 12 p1 58 364 449 1.23352 449 0 0.00000
191 13 2 8 12 p1 58 364 449 1.23352 449 0 0.00000
190 14 2 9 13 p1 58 410 507 1.23659 507 0 0.00000
192 14 2 9 13 p1 58 410 507 1.23659 507 0 0.00000
191 15 2 10 14 p1 58 456 565 1.23904 565 0 0.00000
193 15 2 10 14 p1 58 456 565 1.23904 565 0 0.00000
192 16 2 11 15 p1 58 502 623 1.24104 623 0 0.00000
194 16 2 11 15 p1 58 502 623 1.24104 623 0 0.00000
193 17 2 12 16 p1 58 548 681 1.24270 681 0 0.00000
195 17 2 12 16 p1 58 548 681 1.24270 681 0 0.00000
194 18 3 1 -1 base 47 46 47 1.02174 47 0 0.00000
196 18 3 1 -1 base 47 46 47 1.02174 47 0 0.00000
195 19 3 2 18 p1 58 92 105 1.14130 105 0 0.00000
197 19 3 2 18 p1 58 92 105 1.14130 105 0 0.00000
196 20 3 3 19 p1 58 138 163 1.18116 163 0 0.00000
198 20 3 3 19 p1 58 138 163 1.18116 163 0 0.00000
197 21 3 4 20 p1 58 184 221 1.20109 221 0 0.00000
199 21 3 4 20 p1 58 184 221 1.20109 221 0 0.00000
198 22 3 5 21 p1 58 230 279 1.21304 279 0 0.00000
200 22 3 5 21 p1 58 230 279 1.21304 279 0 0.00000
199 23 3 6 22 p1 58 276 337 1.22101 337 0 0.00000
201 23 3 6 22 p1 58 276 337 1.22101 337 0 0.00000
200 24 3 7 23 p1 58 322 395 1.22671 395 0 0.00000
202 24 3 7 23 p1 58 322 395 1.22671 395 0 0.00000
201 25 3 8 24 p1 58 368 453 1.23098 453 0 0.00000
203 25 3 8 24 p1 58 368 453 1.23098 453 0 0.00000
202 26 3 9 25 p1 58 414 511 1.23430 511 0 0.00000
204 26 3 9 25 p1 58 414 511 1.23430 511 0 0.00000
203 27 3 10 26 p1 58 460 569 1.23696 569 0 0.00000
205 27 3 10 26 p1 58 460 569 1.23696 569 0 0.00000
204 28 3 11 27 p1 58 506 627 1.23913 627 0 0.00000
206 28 3 11 27 p1 58 506 627 1.23913 627 0 0.00000
205 29 3 12 28 p1 58 552 685 1.24094 685 0 0.00000
207 29 3 12 28 p1 58 552 685 1.24094 685 0 0.00000
206 30 3 13 29 p1 58 598 743 1.24247 743 0 0.00000
208 30 3 13 29 p1 58 598 743 1.24247 743 0 0.00000
207 31 3 14 30 p1 58 644 801 1.24379 801 0 0.00000
209 31 3 14 30 p1 58 644 801 1.24379 801 0 0.00000
208 32 3 15 31 p1 58 690 859 1.24493 859 0 0.00000
210 32 3 15 31 p1 58 690 859 1.24493 859 0 0.00000
209 33 3 16 32 p1 58 736 917 1.24592 917 0 0.00000
211 33 3 16 32 p1 58 736 917 1.24592 917 0 0.00000
210 34 3 17 33 p1 58 782 975 1.24680 975 0 0.00000
212 34 3 17 33 p1 58 782 975 1.24680 975 0 0.00000
211 35 3 18 34 p1 58 828 1033 1.24758 1033 0 0.00000
213 35 3 18 34 p1 58 828 1033 1.24758 1033 0 0.00000
212 36 3 19 35 p1 58 874 1091 1.24828 1091 0 0.00000
214 36 3 19 35 p1 58 874 1091 1.24828 1091 0 0.00000
213 37 3 20 36 p1 58 920 1149 1.24891 1149 0 0.00000
215 37 3 20 36 p1 58 920 1149 1.24891 1149 0 0.00000
214 38 3 21 37 p1 58 966 1207 1.24948 1207 0 0.00000
216 38 3 21 37 p1 58 966 1207 1.24948 1207 0 0.00000
215 39 3 22 38 p1 58 1012 1265 1.25000 1265 0 0.00000
217 39 3 22 38 p1 58 1012 1265 1.25000 1265 0 0.00000
216 40 3 23 39 p1 58 1058 1323 1.25047 1323 0 0.00000
218 40 3 23 39 p1 58 1058 1323 1.25047 1323 0 0.00000
217 41 3 24 40 p1 58 1104 1381 1.25091 1381 0 0.00000
219 41 3 24 40 p1 58 1104 1381 1.25091 1381 0 0.00000
218 42 3 25 41 p1 58 1150 1439 1.25130 1439 0 0.00000
220 42 3 25 41 p1 58 1150 1439 1.25130 1439 0 0.00000
219 43 3 26 42 p1 58 1196 1497 1.25167 1497 0 0.00000
221 43 3 26 42 p1 58 1196 1497 1.25167 1497 0 0.00000
220 44 3 27 43 p1 58 1242 1555 1.25201 1555 0 0.00000
222 44 3 27 43 p1 58 1242 1555 1.25201 1555 0 0.00000
221 45 3 28 44 p1 58 1288 1613 1.25233 1613 0 0.00000
223 45 3 28 44 p1 58 1288 1613 1.25233 1613 0 0.00000
222 46 3 29 45 p1 58 1334 1671 1.25262 1671 0 0.00000
224 46 3 29 45 p1 58 1334 1671 1.25262 1671 0 0.00000
223 47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
225 47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
224 48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
226 48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
225 49 4 1 -1 base 197 316 197 0.62342 197 0 0.00000
227 49 4 1 -1 base 197 316 197 0.62342 197 0 0.00000
226 50 4 2 49 p1 58 362 255 0.70442 255 0 0.00000
228 50 4 2 49 p1 58 362 255 0.70442 255 0 0.00000
227 51 4 3 50 prev 356 594 611 1.02862 611 0 0.00000
229 51 4 3 50 prev 356 594 611 1.02862 611 0 0.00000
228 52 4 4 51 p1 58 640 669 1.04531 669 0 0.00000
230 52 4 4 51 p1 58 640 669 1.04531 669 0 0.00000
229 $ hg clone --pull source-repo --config experimental.maxdeltachainspan=2800 relax-chain --config format.generaldelta=yes
231 $ hg clone --pull source-repo --config experimental.maxdeltachainspan=2800 relax-chain --config format.generaldelta=yes
230 requesting all changes
232 requesting all changes
231 adding changesets
233 adding changesets
232 adding manifests
234 adding manifests
233 adding file changes
235 adding file changes
234 added 53 changesets with 53 changes to 53 files (+2 heads)
236 added 53 changesets with 53 changes to 53 files (+2 heads)
235 new changesets 61246295ee1e:99cae3713489
237 new changesets 61246295ee1e:99cae3713489
236 updating to branch default
238 updating to branch default
237 14 files updated, 0 files merged, 0 files removed, 0 files unresolved
239 14 files updated, 0 files merged, 0 files removed, 0 files unresolved
238 $ hg -R relax-chain debugdeltachain -m
240 $ hg -R relax-chain debugdeltachain -m
239 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
241 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
240 0 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
242 0 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
241 1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
243 1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
242 2 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
244 2 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
243 3 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
245 3 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
244 4 1 5 3 p1 57 225 274 1.21778 274 0 0.00000
246 4 1 5 3 p1 57 225 274 1.21778 274 0 0.00000
245 5 1 6 4 p1 57 270 331 1.22593 331 0 0.00000
247 5 1 6 4 p1 57 270 331 1.22593 331 0 0.00000
246 6 2 1 -1 base 46 45 46 1.02222 46 0 0.00000
248 6 2 1 -1 base 46 45 46 1.02222 46 0 0.00000
247 7 2 2 6 p1 57 90 103 1.14444 103 0 0.00000
249 7 2 2 6 p1 57 90 103 1.14444 103 0 0.00000
248 8 2 3 7 p1 57 135 160 1.18519 160 0 0.00000
250 8 2 3 7 p1 57 135 160 1.18519 160 0 0.00000
249 9 2 4 8 p1 57 180 217 1.20556 217 0 0.00000
251 9 2 4 8 p1 57 180 217 1.20556 217 0 0.00000
250 10 2 5 9 p1 58 226 275 1.21681 275 0 0.00000
252 10 2 5 9 p1 58 226 275 1.21681 275 0 0.00000
251 11 2 6 10 p1 58 272 333 1.22426 333 0 0.00000
253 11 2 6 10 p1 58 272 333 1.22426 333 0 0.00000
252 12 2 7 11 p1 58 318 391 1.22956 391 0 0.00000
254 12 2 7 11 p1 58 318 391 1.22956 391 0 0.00000
253 13 2 8 12 p1 58 364 449 1.23352 449 0 0.00000
255 13 2 8 12 p1 58 364 449 1.23352 449 0 0.00000
254 14 2 9 13 p1 58 410 507 1.23659 507 0 0.00000
256 14 2 9 13 p1 58 410 507 1.23659 507 0 0.00000
255 15 2 10 14 p1 58 456 565 1.23904 565 0 0.00000
257 15 2 10 14 p1 58 456 565 1.23904 565 0 0.00000
256 16 2 11 15 p1 58 502 623 1.24104 623 0 0.00000
258 16 2 11 15 p1 58 502 623 1.24104 623 0 0.00000
257 17 2 12 16 p1 58 548 681 1.24270 681 0 0.00000
259 17 2 12 16 p1 58 548 681 1.24270 681 0 0.00000
258 18 3 1 -1 base 47 46 47 1.02174 47 0 0.00000
260 18 3 1 -1 base 47 46 47 1.02174 47 0 0.00000
259 19 3 2 18 p1 58 92 105 1.14130 105 0 0.00000
261 19 3 2 18 p1 58 92 105 1.14130 105 0 0.00000
260 20 3 3 19 p1 58 138 163 1.18116 163 0 0.00000
262 20 3 3 19 p1 58 138 163 1.18116 163 0 0.00000
261 21 3 4 20 p1 58 184 221 1.20109 221 0 0.00000
263 21 3 4 20 p1 58 184 221 1.20109 221 0 0.00000
262 22 3 5 21 p1 58 230 279 1.21304 279 0 0.00000
264 22 3 5 21 p1 58 230 279 1.21304 279 0 0.00000
263 23 3 6 22 p1 58 276 337 1.22101 337 0 0.00000
265 23 3 6 22 p1 58 276 337 1.22101 337 0 0.00000
264 24 3 7 23 p1 58 322 395 1.22671 395 0 0.00000
266 24 3 7 23 p1 58 322 395 1.22671 395 0 0.00000
265 25 3 8 24 p1 58 368 453 1.23098 453 0 0.00000
267 25 3 8 24 p1 58 368 453 1.23098 453 0 0.00000
266 26 3 9 25 p1 58 414 511 1.23430 511 0 0.00000
268 26 3 9 25 p1 58 414 511 1.23430 511 0 0.00000
267 27 3 10 26 p1 58 460 569 1.23696 569 0 0.00000
269 27 3 10 26 p1 58 460 569 1.23696 569 0 0.00000
268 28 3 11 27 p1 58 506 627 1.23913 627 0 0.00000
270 28 3 11 27 p1 58 506 627 1.23913 627 0 0.00000
269 29 3 12 28 p1 58 552 685 1.24094 685 0 0.00000
271 29 3 12 28 p1 58 552 685 1.24094 685 0 0.00000
270 30 3 13 29 p1 58 598 743 1.24247 743 0 0.00000
272 30 3 13 29 p1 58 598 743 1.24247 743 0 0.00000
271 31 3 14 30 p1 58 644 801 1.24379 801 0 0.00000
273 31 3 14 30 p1 58 644 801 1.24379 801 0 0.00000
272 32 3 15 31 p1 58 690 859 1.24493 859 0 0.00000
274 32 3 15 31 p1 58 690 859 1.24493 859 0 0.00000
273 33 3 16 32 p1 58 736 917 1.24592 917 0 0.00000
275 33 3 16 32 p1 58 736 917 1.24592 917 0 0.00000
274 34 3 17 33 p1 58 782 975 1.24680 975 0 0.00000
276 34 3 17 33 p1 58 782 975 1.24680 975 0 0.00000
275 35 3 18 34 p1 58 828 1033 1.24758 1033 0 0.00000
277 35 3 18 34 p1 58 828 1033 1.24758 1033 0 0.00000
276 36 3 19 35 p1 58 874 1091 1.24828 1091 0 0.00000
278 36 3 19 35 p1 58 874 1091 1.24828 1091 0 0.00000
277 37 3 20 36 p1 58 920 1149 1.24891 1149 0 0.00000
279 37 3 20 36 p1 58 920 1149 1.24891 1149 0 0.00000
278 38 3 21 37 p1 58 966 1207 1.24948 1207 0 0.00000
280 38 3 21 37 p1 58 966 1207 1.24948 1207 0 0.00000
279 39 3 22 38 p1 58 1012 1265 1.25000 1265 0 0.00000
281 39 3 22 38 p1 58 1012 1265 1.25000 1265 0 0.00000
280 40 3 23 39 p1 58 1058 1323 1.25047 1323 0 0.00000
282 40 3 23 39 p1 58 1058 1323 1.25047 1323 0 0.00000
281 41 3 24 40 p1 58 1104 1381 1.25091 1381 0 0.00000
283 41 3 24 40 p1 58 1104 1381 1.25091 1381 0 0.00000
282 42 3 25 41 p1 58 1150 1439 1.25130 1439 0 0.00000
284 42 3 25 41 p1 58 1150 1439 1.25130 1439 0 0.00000
283 43 3 26 42 p1 58 1196 1497 1.25167 1497 0 0.00000
285 43 3 26 42 p1 58 1196 1497 1.25167 1497 0 0.00000
284 44 3 27 43 p1 58 1242 1555 1.25201 1555 0 0.00000
286 44 3 27 43 p1 58 1242 1555 1.25201 1555 0 0.00000
285 45 3 28 44 p1 58 1288 1613 1.25233 1613 0 0.00000
287 45 3 28 44 p1 58 1288 1613 1.25233 1613 0 0.00000
286 46 3 29 45 p1 58 1334 1671 1.25262 1671 0 0.00000
288 46 3 29 45 p1 58 1334 1671 1.25262 1671 0 0.00000
287 47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
289 47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
288 48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
290 48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
289 49 4 1 -1 base 197 316 197 0.62342 197 0 0.00000
291 49 4 1 -1 base 197 316 197 0.62342 197 0 0.00000
290 50 4 2 49 p1 58 362 255 0.70442 255 0 0.00000
292 50 4 2 49 p1 58 362 255 0.70442 255 0 0.00000
291 51 2 13 17 p1 58 594 739 1.24411 2781 2042 2.76319
293 51 2 13 17 p1 58 594 739 1.24411 2781 2042 2.76319
292 52 5 1 -1 base 369 640 369 0.57656 369 0 0.00000
294 52 5 1 -1 base 369 640 369 0.57656 369 0 0.00000
293 $ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.generaldelta=yes
295 $ hg clone --pull source-repo --config experimental.maxdeltachainspan=0 noconst-chain --config format.generaldelta=yes
294 requesting all changes
296 requesting all changes
295 adding changesets
297 adding changesets
296 adding manifests
298 adding manifests
297 adding file changes
299 adding file changes
298 added 53 changesets with 53 changes to 53 files (+2 heads)
300 added 53 changesets with 53 changes to 53 files (+2 heads)
299 new changesets 61246295ee1e:99cae3713489
301 new changesets 61246295ee1e:99cae3713489
300 updating to branch default
302 updating to branch default
301 14 files updated, 0 files merged, 0 files removed, 0 files unresolved
303 14 files updated, 0 files merged, 0 files removed, 0 files unresolved
302 $ hg -R noconst-chain debugdeltachain -m
304 $ hg -R noconst-chain debugdeltachain -m
303 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
305 rev chain# chainlen prev delta size rawsize chainsize ratio lindist extradist extraratio
304 0 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
306 0 1 1 -1 base 46 45 46 1.02222 46 0 0.00000
305 1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
307 1 1 2 0 p1 57 90 103 1.14444 103 0 0.00000
306 2 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
308 2 1 3 1 p1 57 135 160 1.18519 160 0 0.00000
307 3 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
309 3 1 4 2 p1 57 180 217 1.20556 217 0 0.00000
308 4 1 5 3 p1 57 225 274 1.21778 274 0 0.00000
310 4 1 5 3 p1 57 225 274 1.21778 274 0 0.00000
309 5 1 6 4 p1 57 270 331 1.22593 331 0 0.00000
311 5 1 6 4 p1 57 270 331 1.22593 331 0 0.00000
310 6 2 1 -1 base 46 45 46 1.02222 46 0 0.00000
312 6 2 1 -1 base 46 45 46 1.02222 46 0 0.00000
311 7 2 2 6 p1 57 90 103 1.14444 103 0 0.00000
313 7 2 2 6 p1 57 90 103 1.14444 103 0 0.00000
312 8 2 3 7 p1 57 135 160 1.18519 160 0 0.00000
314 8 2 3 7 p1 57 135 160 1.18519 160 0 0.00000
313 9 2 4 8 p1 57 180 217 1.20556 217 0 0.00000
315 9 2 4 8 p1 57 180 217 1.20556 217 0 0.00000
314 10 2 5 9 p1 58 226 275 1.21681 275 0 0.00000
316 10 2 5 9 p1 58 226 275 1.21681 275 0 0.00000
315 11 2 6 10 p1 58 272 333 1.22426 333 0 0.00000
317 11 2 6 10 p1 58 272 333 1.22426 333 0 0.00000
316 12 2 7 11 p1 58 318 391 1.22956 391 0 0.00000
318 12 2 7 11 p1 58 318 391 1.22956 391 0 0.00000
317 13 2 8 12 p1 58 364 449 1.23352 449 0 0.00000
319 13 2 8 12 p1 58 364 449 1.23352 449 0 0.00000
318 14 2 9 13 p1 58 410 507 1.23659 507 0 0.00000
320 14 2 9 13 p1 58 410 507 1.23659 507 0 0.00000
319 15 2 10 14 p1 58 456 565 1.23904 565 0 0.00000
321 15 2 10 14 p1 58 456 565 1.23904 565 0 0.00000
320 16 2 11 15 p1 58 502 623 1.24104 623 0 0.00000
322 16 2 11 15 p1 58 502 623 1.24104 623 0 0.00000
321 17 2 12 16 p1 58 548 681 1.24270 681 0 0.00000
323 17 2 12 16 p1 58 548 681 1.24270 681 0 0.00000
322 18 3 1 -1 base 47 46 47 1.02174 47 0 0.00000
324 18 3 1 -1 base 47 46 47 1.02174 47 0 0.00000
323 19 3 2 18 p1 58 92 105 1.14130 105 0 0.00000
325 19 3 2 18 p1 58 92 105 1.14130 105 0 0.00000
324 20 3 3 19 p1 58 138 163 1.18116 163 0 0.00000
326 20 3 3 19 p1 58 138 163 1.18116 163 0 0.00000
325 21 3 4 20 p1 58 184 221 1.20109 221 0 0.00000
327 21 3 4 20 p1 58 184 221 1.20109 221 0 0.00000
326 22 3 5 21 p1 58 230 279 1.21304 279 0 0.00000
328 22 3 5 21 p1 58 230 279 1.21304 279 0 0.00000
327 23 3 6 22 p1 58 276 337 1.22101 337 0 0.00000
329 23 3 6 22 p1 58 276 337 1.22101 337 0 0.00000
328 24 3 7 23 p1 58 322 395 1.22671 395 0 0.00000
330 24 3 7 23 p1 58 322 395 1.22671 395 0 0.00000
329 25 3 8 24 p1 58 368 453 1.23098 453 0 0.00000
331 25 3 8 24 p1 58 368 453 1.23098 453 0 0.00000
330 26 3 9 25 p1 58 414 511 1.23430 511 0 0.00000
332 26 3 9 25 p1 58 414 511 1.23430 511 0 0.00000
331 27 3 10 26 p1 58 460 569 1.23696 569 0 0.00000
333 27 3 10 26 p1 58 460 569 1.23696 569 0 0.00000
332 28 3 11 27 p1 58 506 627 1.23913 627 0 0.00000
334 28 3 11 27 p1 58 506 627 1.23913 627 0 0.00000
333 29 3 12 28 p1 58 552 685 1.24094 685 0 0.00000
335 29 3 12 28 p1 58 552 685 1.24094 685 0 0.00000
334 30 3 13 29 p1 58 598 743 1.24247 743 0 0.00000
336 30 3 13 29 p1 58 598 743 1.24247 743 0 0.00000
335 31 3 14 30 p1 58 644 801 1.24379 801 0 0.00000
337 31 3 14 30 p1 58 644 801 1.24379 801 0 0.00000
336 32 3 15 31 p1 58 690 859 1.24493 859 0 0.00000
338 32 3 15 31 p1 58 690 859 1.24493 859 0 0.00000
337 33 3 16 32 p1 58 736 917 1.24592 917 0 0.00000
339 33 3 16 32 p1 58 736 917 1.24592 917 0 0.00000
338 34 3 17 33 p1 58 782 975 1.24680 975 0 0.00000
340 34 3 17 33 p1 58 782 975 1.24680 975 0 0.00000
339 35 3 18 34 p1 58 828 1033 1.24758 1033 0 0.00000
341 35 3 18 34 p1 58 828 1033 1.24758 1033 0 0.00000
340 36 3 19 35 p1 58 874 1091 1.24828 1091 0 0.00000
342 36 3 19 35 p1 58 874 1091 1.24828 1091 0 0.00000
341 37 3 20 36 p1 58 920 1149 1.24891 1149 0 0.00000
343 37 3 20 36 p1 58 920 1149 1.24891 1149 0 0.00000
342 38 3 21 37 p1 58 966 1207 1.24948 1207 0 0.00000
344 38 3 21 37 p1 58 966 1207 1.24948 1207 0 0.00000
343 39 3 22 38 p1 58 1012 1265 1.25000 1265 0 0.00000
345 39 3 22 38 p1 58 1012 1265 1.25000 1265 0 0.00000
344 40 3 23 39 p1 58 1058 1323 1.25047 1323 0 0.00000
346 40 3 23 39 p1 58 1058 1323 1.25047 1323 0 0.00000
345 41 3 24 40 p1 58 1104 1381 1.25091 1381 0 0.00000
347 41 3 24 40 p1 58 1104 1381 1.25091 1381 0 0.00000
346 42 3 25 41 p1 58 1150 1439 1.25130 1439 0 0.00000
348 42 3 25 41 p1 58 1150 1439 1.25130 1439 0 0.00000
347 43 3 26 42 p1 58 1196 1497 1.25167 1497 0 0.00000
349 43 3 26 42 p1 58 1196 1497 1.25167 1497 0 0.00000
348 44 3 27 43 p1 58 1242 1555 1.25201 1555 0 0.00000
350 44 3 27 43 p1 58 1242 1555 1.25201 1555 0 0.00000
349 45 3 28 44 p1 58 1288 1613 1.25233 1613 0 0.00000
351 45 3 28 44 p1 58 1288 1613 1.25233 1613 0 0.00000
350 46 3 29 45 p1 58 1334 1671 1.25262 1671 0 0.00000
352 46 3 29 45 p1 58 1334 1671 1.25262 1671 0 0.00000
351 47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
353 47 3 30 46 p1 58 1380 1729 1.25290 1729 0 0.00000
352 48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
354 48 3 31 47 p1 58 1426 1787 1.25316 1787 0 0.00000
353 49 1 7 5 p1 58 316 389 1.23101 2857 2468 6.34447
355 49 1 7 5 p1 58 316 389 1.23101 2857 2468 6.34447
354 50 1 8 49 p1 58 362 447 1.23481 2915 2468 5.52125
356 50 1 8 49 p1 58 362 447 1.23481 2915 2468 5.52125
355 51 2 13 17 p1 58 594 739 1.24411 2642 1903 2.57510
357 51 2 13 17 p1 58 594 739 1.24411 2642 1903 2.57510
356 52 2 14 51 p1 58 640 797 1.24531 2700 1903 2.38770
358 52 2 14 51 p1 58 640 797 1.24531 2700 1903 2.38770
@@ -1,170 +1,172 b''
1 #require no-reposimplestore
2
1 Test unionrepo functionality
3 Test unionrepo functionality
2
4
3 Create one repository
5 Create one repository
4
6
5 $ hg init repo1
7 $ hg init repo1
6 $ cd repo1
8 $ cd repo1
7 $ touch repo1-0
9 $ touch repo1-0
8 $ echo repo1-0 > f
10 $ echo repo1-0 > f
9 $ hg ci -Aqmrepo1-0
11 $ hg ci -Aqmrepo1-0
10 $ touch repo1-1
12 $ touch repo1-1
11 $ echo repo1-1 >> f
13 $ echo repo1-1 >> f
12 $ hg ci -Aqmrepo1-1
14 $ hg ci -Aqmrepo1-1
13 $ touch repo1-2
15 $ touch repo1-2
14 $ echo repo1-2 >> f
16 $ echo repo1-2 >> f
15 $ hg ci -Aqmrepo1-2
17 $ hg ci -Aqmrepo1-2
16 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
18 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
17 2:68c0685446a3 repo1-2
19 2:68c0685446a3 repo1-2
18 1:8a58db72e69d repo1-1
20 1:8a58db72e69d repo1-1
19 0:f093fec0529b repo1-0
21 0:f093fec0529b repo1-0
20 $ tip1=`hg id -q`
22 $ tip1=`hg id -q`
21 $ cd ..
23 $ cd ..
22
24
23 - and a clone with a not-completely-trivial history
25 - and a clone with a not-completely-trivial history
24
26
25 $ hg clone -q repo1 --rev 0 repo2
27 $ hg clone -q repo1 --rev 0 repo2
26 $ cd repo2
28 $ cd repo2
27 $ touch repo2-1
29 $ touch repo2-1
28 $ sed '1i\
30 $ sed '1i\
29 > repo2-1 at top
31 > repo2-1 at top
30 > ' f > f.tmp
32 > ' f > f.tmp
31 $ mv f.tmp f
33 $ mv f.tmp f
32 $ hg ci -Aqmrepo2-1
34 $ hg ci -Aqmrepo2-1
33 $ touch repo2-2
35 $ touch repo2-2
34 $ hg pull -q ../repo1 -r 1
36 $ hg pull -q ../repo1 -r 1
35 $ hg merge -q
37 $ hg merge -q
36 $ hg ci -Aqmrepo2-2-merge
38 $ hg ci -Aqmrepo2-2-merge
37 $ touch repo2-3
39 $ touch repo2-3
38 $ echo repo2-3 >> f
40 $ echo repo2-3 >> f
39 $ hg ci -mrepo2-3
41 $ hg ci -mrepo2-3
40 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
42 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
41 4:2f0d178c469c repo2-3
43 4:2f0d178c469c repo2-3
42 3:9e6fb3e0b9da repo2-2-merge
44 3:9e6fb3e0b9da repo2-2-merge
43 2:8a58db72e69d repo1-1
45 2:8a58db72e69d repo1-1
44 1:c337dba826e7 repo2-1
46 1:c337dba826e7 repo2-1
45 0:f093fec0529b repo1-0
47 0:f093fec0529b repo1-0
46 $ cd ..
48 $ cd ..
47
49
48 revisions from repo2 appear as appended / pulled to repo1
50 revisions from repo2 appear as appended / pulled to repo1
49
51
50 $ hg -R union:repo1+repo2 log --template '{rev}:{node|short} {desc|firstline}\n'
52 $ hg -R union:repo1+repo2 log --template '{rev}:{node|short} {desc|firstline}\n'
51 5:2f0d178c469c repo2-3
53 5:2f0d178c469c repo2-3
52 4:9e6fb3e0b9da repo2-2-merge
54 4:9e6fb3e0b9da repo2-2-merge
53 3:c337dba826e7 repo2-1
55 3:c337dba826e7 repo2-1
54 2:68c0685446a3 repo1-2
56 2:68c0685446a3 repo1-2
55 1:8a58db72e69d repo1-1
57 1:8a58db72e69d repo1-1
56 0:f093fec0529b repo1-0
58 0:f093fec0529b repo1-0
57
59
58 manifest can be retrieved for revisions in both repos
60 manifest can be retrieved for revisions in both repos
59
61
60 $ hg -R union:repo1+repo2 mani -r $tip1
62 $ hg -R union:repo1+repo2 mani -r $tip1
61 f
63 f
62 repo1-0
64 repo1-0
63 repo1-1
65 repo1-1
64 repo1-2
66 repo1-2
65 $ hg -R union:repo1+repo2 mani -r 4
67 $ hg -R union:repo1+repo2 mani -r 4
66 f
68 f
67 repo1-0
69 repo1-0
68 repo1-1
70 repo1-1
69 repo2-1
71 repo2-1
70 repo2-2
72 repo2-2
71
73
72 files can be retrieved form both repos
74 files can be retrieved form both repos
73
75
74 $ hg -R repo1 cat repo1/f -r2
76 $ hg -R repo1 cat repo1/f -r2
75 repo1-0
77 repo1-0
76 repo1-1
78 repo1-1
77 repo1-2
79 repo1-2
78
80
79 $ hg -R union:repo1+repo2 cat -r$tip1 repo1/f
81 $ hg -R union:repo1+repo2 cat -r$tip1 repo1/f
80 repo1-0
82 repo1-0
81 repo1-1
83 repo1-1
82 repo1-2
84 repo1-2
83
85
84 $ hg -R union:repo1+repo2 cat -r4 $TESTTMP/repo1/f
86 $ hg -R union:repo1+repo2 cat -r4 $TESTTMP/repo1/f
85 repo2-1 at top
87 repo2-1 at top
86 repo1-0
88 repo1-0
87 repo1-1
89 repo1-1
88
90
89 files can be compared across repos
91 files can be compared across repos
90
92
91 $ hg -R union:repo1+repo2 diff -r$tip1 -rtip
93 $ hg -R union:repo1+repo2 diff -r$tip1 -rtip
92 diff -r 68c0685446a3 -r 2f0d178c469c f
94 diff -r 68c0685446a3 -r 2f0d178c469c f
93 --- a/f Thu Jan 01 00:00:00 1970 +0000
95 --- a/f Thu Jan 01 00:00:00 1970 +0000
94 +++ b/f Thu Jan 01 00:00:00 1970 +0000
96 +++ b/f Thu Jan 01 00:00:00 1970 +0000
95 @@ -1,3 +1,4 @@
97 @@ -1,3 +1,4 @@
96 +repo2-1 at top
98 +repo2-1 at top
97 repo1-0
99 repo1-0
98 repo1-1
100 repo1-1
99 -repo1-2
101 -repo1-2
100 +repo2-3
102 +repo2-3
101
103
102 heads from both repos are found correctly
104 heads from both repos are found correctly
103
105
104 $ hg -R union:repo1+repo2 heads --template '{rev}:{node|short} {desc|firstline}\n'
106 $ hg -R union:repo1+repo2 heads --template '{rev}:{node|short} {desc|firstline}\n'
105 5:2f0d178c469c repo2-3
107 5:2f0d178c469c repo2-3
106 2:68c0685446a3 repo1-2
108 2:68c0685446a3 repo1-2
107
109
108 revsets works across repos
110 revsets works across repos
109
111
110 $ hg -R union:repo1+repo2 id -r "ancestor($tip1, 5)"
112 $ hg -R union:repo1+repo2 id -r "ancestor($tip1, 5)"
111 8a58db72e69d
113 8a58db72e69d
112
114
113 annotate works - an indication that linkrevs works
115 annotate works - an indication that linkrevs works
114
116
115 $ hg --cwd repo1 -Runion:../repo2 annotate $TESTTMP/repo1/f -r tip
117 $ hg --cwd repo1 -Runion:../repo2 annotate $TESTTMP/repo1/f -r tip
116 3: repo2-1 at top
118 3: repo2-1 at top
117 0: repo1-0
119 0: repo1-0
118 1: repo1-1
120 1: repo1-1
119 5: repo2-3
121 5: repo2-3
120
122
121 union repos can be cloned ... and clones works correctly
123 union repos can be cloned ... and clones works correctly
122
124
123 $ hg clone -U union:repo1+repo2 repo3
125 $ hg clone -U union:repo1+repo2 repo3
124 requesting all changes
126 requesting all changes
125 adding changesets
127 adding changesets
126 adding manifests
128 adding manifests
127 adding file changes
129 adding file changes
128 added 6 changesets with 11 changes to 6 files (+1 heads)
130 added 6 changesets with 11 changes to 6 files (+1 heads)
129 new changesets f093fec0529b:2f0d178c469c
131 new changesets f093fec0529b:2f0d178c469c
130
132
131 $ hg -R repo3 paths
133 $ hg -R repo3 paths
132 default = union:repo1+repo2
134 default = union:repo1+repo2
133
135
134 $ hg -R repo3 verify
136 $ hg -R repo3 verify
135 checking changesets
137 checking changesets
136 checking manifests
138 checking manifests
137 crosschecking files in changesets and manifests
139 crosschecking files in changesets and manifests
138 checking files
140 checking files
139 6 files, 6 changesets, 11 total revisions
141 6 files, 6 changesets, 11 total revisions
140
142
141 $ hg -R repo3 heads --template '{rev}:{node|short} {desc|firstline}\n'
143 $ hg -R repo3 heads --template '{rev}:{node|short} {desc|firstline}\n'
142 5:2f0d178c469c repo2-3
144 5:2f0d178c469c repo2-3
143 2:68c0685446a3 repo1-2
145 2:68c0685446a3 repo1-2
144
146
145 $ hg -R repo3 log --template '{rev}:{node|short} {desc|firstline}\n'
147 $ hg -R repo3 log --template '{rev}:{node|short} {desc|firstline}\n'
146 5:2f0d178c469c repo2-3
148 5:2f0d178c469c repo2-3
147 4:9e6fb3e0b9da repo2-2-merge
149 4:9e6fb3e0b9da repo2-2-merge
148 3:c337dba826e7 repo2-1
150 3:c337dba826e7 repo2-1
149 2:68c0685446a3 repo1-2
151 2:68c0685446a3 repo1-2
150 1:8a58db72e69d repo1-1
152 1:8a58db72e69d repo1-1
151 0:f093fec0529b repo1-0
153 0:f093fec0529b repo1-0
152
154
153 union repos should use the correct rev number (issue5024)
155 union repos should use the correct rev number (issue5024)
154
156
155 $ hg init a
157 $ hg init a
156 $ cd a
158 $ cd a
157 $ echo a0 >> f
159 $ echo a0 >> f
158 $ hg ci -Aqm a0
160 $ hg ci -Aqm a0
159 $ cd ..
161 $ cd ..
160 $ hg init b
162 $ hg init b
161 $ cd b
163 $ cd b
162 $ echo b0 >> f
164 $ echo b0 >> f
163 $ hg ci -Aqm b0
165 $ hg ci -Aqm b0
164 $ echo b1 >> f
166 $ echo b1 >> f
165 $ hg ci -qm b1
167 $ hg ci -qm b1
166 $ cd ..
168 $ cd ..
167
169
168 "hg files -v" to call fctx.size() -> fctx.iscensored()
170 "hg files -v" to call fctx.size() -> fctx.iscensored()
169 $ hg files -R union:b+a -r2 -v
171 $ hg files -R union:b+a -r2 -v
170 3 b/f
172 3 b/f
General Comments 0
You need to be logged in to leave comments. Login now