Mercurial > hg
comparison tests/test-sparse-profiles.t @ 44724:5c2a4f37eace
tests: deal with "ls" vs "ls -A" difference on 2BSD derived systems
BSD-derived systems will use "ls -A" when running as root. Adjust the
test cases to always use the flag and include .hg and related output as
appropiately.
Differential Revision: https://phab.mercurial-scm.org/D8397
author | Joerg Sonnenberger <joerg@bec.de> |
---|---|
date | Fri, 10 Apr 2020 19:58:34 +0200 |
parents | 9db856446298 |
children | dc5e5577af39 |
comparison
equal
deleted
inserted
replaced
44723:28aacddf3af0 | 44724:5c2a4f37eace |
---|---|
40 $ hg debugsparse --include '*.sparse' | 40 $ hg debugsparse --include '*.sparse' |
41 | 41 |
42 Verify enabling a single profile works | 42 Verify enabling a single profile works |
43 | 43 |
44 $ hg debugsparse --enable-profile webpage.sparse | 44 $ hg debugsparse --enable-profile webpage.sparse |
45 $ ls | 45 $ ls -A |
46 .hg | |
46 backend.sparse | 47 backend.sparse |
47 index.html | 48 index.html |
48 webpage.sparse | 49 webpage.sparse |
49 | 50 |
50 Verify enabling two profiles works | 51 Verify enabling two profiles works |
51 | 52 |
52 $ hg debugsparse --enable-profile backend.sparse | 53 $ hg debugsparse --enable-profile backend.sparse |
53 $ ls | 54 $ ls -A |
55 .hg | |
54 backend.sparse | 56 backend.sparse |
55 data.py | 57 data.py |
56 index.html | 58 index.html |
57 webpage.sparse | 59 webpage.sparse |
58 | 60 |
59 Verify disabling a profile works | 61 Verify disabling a profile works |
60 | 62 |
61 $ hg debugsparse --disable-profile webpage.sparse | 63 $ hg debugsparse --disable-profile webpage.sparse |
62 $ ls | 64 $ ls -A |
65 .hg | |
63 backend.sparse | 66 backend.sparse |
64 data.py | 67 data.py |
65 webpage.sparse | 68 webpage.sparse |
66 | 69 |
67 Verify that a profile is updated across multiple commits | 70 Verify that a profile is updated across multiple commits |
79 > EOF | 82 > EOF |
80 | 83 |
81 $ echo foo >> data.py | 84 $ echo foo >> data.py |
82 | 85 |
83 $ hg ci -m 'edit profile' | 86 $ hg ci -m 'edit profile' |
84 $ ls | 87 $ ls -A |
88 .hg | |
85 backend.sparse | 89 backend.sparse |
86 data.py | 90 data.py |
87 readme.txt | 91 readme.txt |
88 webpage.sparse | 92 webpage.sparse |
89 | 93 |
90 $ hg up -q 0 | 94 $ hg up -q 0 |
91 $ ls | 95 $ ls -A |
96 .hg | |
92 backend.sparse | 97 backend.sparse |
93 data.py | 98 data.py |
94 webpage.sparse | 99 webpage.sparse |
95 | 100 |
96 $ hg up -q 1 | 101 $ hg up -q 1 |
97 $ ls | 102 $ ls -A |
103 .hg | |
98 backend.sparse | 104 backend.sparse |
99 data.py | 105 data.py |
100 readme.txt | 106 readme.txt |
101 webpage.sparse | 107 webpage.sparse |
102 | 108 |
109 > *.html | 115 > *.html |
110 > EOF | 116 > EOF |
111 $ echo bar >> data.py | 117 $ echo bar >> data.py |
112 | 118 |
113 $ hg ci -qAm "edit profile other" | 119 $ hg ci -qAm "edit profile other" |
114 $ ls | 120 $ ls -A |
121 .hg | |
115 backend.sparse | 122 backend.sparse |
116 index.html | 123 index.html |
117 webpage.sparse | 124 webpage.sparse |
118 | 125 |
119 Verify conflicting merge pulls in the conflicting changes | 126 Verify conflicting merge pulls in the conflicting changes |
127 0 files updated, 0 files merged, 0 files removed, 2 files unresolved | 134 0 files updated, 0 files merged, 0 files removed, 2 files unresolved |
128 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon | 135 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
129 [1] | 136 [1] |
130 | 137 |
131 $ rm *.orig | 138 $ rm *.orig |
132 $ ls | 139 $ ls -A |
140 .hg | |
133 backend.sparse | 141 backend.sparse |
134 data.py | 142 data.py |
135 index.html | 143 index.html |
136 webpage.sparse | 144 webpage.sparse |
137 | 145 |
152 > EOF | 160 > EOF |
153 $ hg resolve -m data.py | 161 $ hg resolve -m data.py |
154 (no more unresolved files) | 162 (no more unresolved files) |
155 | 163 |
156 $ hg ci -qAm "merge profiles" | 164 $ hg ci -qAm "merge profiles" |
157 $ ls | 165 $ ls -A |
166 .hg | |
158 backend.sparse | 167 backend.sparse |
159 index.html | 168 index.html |
160 readme.txt | 169 readme.txt |
161 webpage.sparse | 170 webpage.sparse |
162 | 171 |
166 bar | 175 bar |
167 | 176 |
168 Verify stripping refreshes dirstate | 177 Verify stripping refreshes dirstate |
169 | 178 |
170 $ hg strip -q -r . | 179 $ hg strip -q -r . |
171 $ ls | 180 $ ls -A |
181 .hg | |
172 backend.sparse | 182 backend.sparse |
173 index.html | 183 index.html |
174 webpage.sparse | 184 webpage.sparse |
175 | 185 |
176 Verify rebase conflicts pulls in the conflicting changes | 186 Verify rebase conflicts pulls in the conflicting changes |
177 | 187 |
178 $ hg up -q 1 | 188 $ hg up -q 1 |
179 $ ls | 189 $ ls -A |
190 .hg | |
180 backend.sparse | 191 backend.sparse |
181 data.py | 192 data.py |
182 readme.txt | 193 readme.txt |
183 webpage.sparse | 194 webpage.sparse |
184 | 195 |
190 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') | 201 warning: conflicts while merging backend.sparse! (edit, then use 'hg resolve --mark') |
191 warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark') | 202 warning: conflicts while merging data.py! (edit, then use 'hg resolve --mark') |
192 unresolved conflicts (see hg resolve, then hg rebase --continue) | 203 unresolved conflicts (see hg resolve, then hg rebase --continue) |
193 [1] | 204 [1] |
194 $ rm *.orig | 205 $ rm *.orig |
195 $ ls | 206 $ ls -A |
207 .hg | |
196 backend.sparse | 208 backend.sparse |
197 data.py | 209 data.py |
198 index.html | 210 index.html |
199 webpage.sparse | 211 webpage.sparse |
200 | 212 |
215 $ hg resolve -m data.py | 227 $ hg resolve -m data.py |
216 (no more unresolved files) | 228 (no more unresolved files) |
217 continue: hg rebase --continue | 229 continue: hg rebase --continue |
218 | 230 |
219 $ hg rebase -q --continue | 231 $ hg rebase -q --continue |
220 $ ls | 232 $ ls -A |
233 .hg | |
221 backend.sparse | 234 backend.sparse |
222 index.html | 235 index.html |
223 readme.txt | 236 readme.txt |
224 webpage.sparse | 237 webpage.sparse |
225 | 238 |
235 $ hg debugsparse --reset | 248 $ hg debugsparse --reset |
236 $ hg rm *.sparse | 249 $ hg rm *.sparse |
237 $ hg commit -m "delete profiles" | 250 $ hg commit -m "delete profiles" |
238 $ hg up -q ".^" | 251 $ hg up -q ".^" |
239 $ hg debugsparse --enable-profile backend.sparse | 252 $ hg debugsparse --enable-profile backend.sparse |
240 $ ls | 253 $ ls -A |
254 .hg | |
241 index.html | 255 index.html |
242 readme.txt | 256 readme.txt |
243 $ hg up tip | grep warning | 257 $ hg up tip | grep warning |
244 warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it | 258 warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it |
245 [1] | 259 [1] |
246 $ ls | 260 $ ls -A |
261 .hg | |
247 data.py | 262 data.py |
248 index.html | 263 index.html |
249 readme.txt | 264 readme.txt |
250 $ hg debugsparse --disable-profile backend.sparse | grep warning | 265 $ hg debugsparse --disable-profile backend.sparse | grep warning |
251 warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it | 266 warning: sparse profile 'backend.sparse' not found in rev bfcb76de99cc - ignoring it |