comparison tests/test-sparse.t @ 33303:8b571495d811

sparse: move config file writing into core The code was refactored during the move to be more procedural instead of using string formatting. This has the benefit of not writing empty sections, which changed tests.
author Gregory Szorc <gregory.szorc@gmail.com>
date Thu, 06 Jul 2017 12:24:55 -0700
parents c9cbf4de27ba
children 3b7cb3d17137
comparison
equal deleted inserted replaced
33302:36a415b5a4b2 33303:8b571495d811
61 $ hg debugsparse --include 'show*' 61 $ hg debugsparse --include 'show*'
62 62
63 $ hg debugsparse 63 $ hg debugsparse
64 [include] 64 [include]
65 show* 65 show*
66 [exclude]
67
68 66
69 Verify update only writes included files 67 Verify update only writes included files
70 68
71 $ hg up -q 0 69 $ hg up -q 0
72 $ ls 70 $ ls
148 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') 146 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark')
149 unresolved conflicts (see hg resolve, then hg rebase --continue) 147 unresolved conflicts (see hg resolve, then hg rebase --continue)
150 [1] 148 [1]
151 149
152 $ hg debugsparse 150 $ hg debugsparse
153 [include]
154
155 [exclude] 151 [exclude]
156 hide* 152 hide*
157 153
158 Temporarily Included Files (for merge/rebase): 154 Temporarily Included Files (for merge/rebase):
159 hide 155 hide
185 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark') 181 warning: conflicts while merging hide! (edit, then use 'hg resolve --mark')
186 0 files updated, 0 files merged, 0 files removed, 1 files unresolved 182 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
187 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon 183 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
188 [1] 184 [1]
189 $ hg debugsparse 185 $ hg debugsparse
190 [include]
191
192 [exclude] 186 [exclude]
193 hide* 187 hide*
194 188
195 Temporarily Included Files (for merge/rebase): 189 Temporarily Included Files (for merge/rebase):
196 hide 190 hide
197 191
198 $ hg up -C . 192 $ hg up -C .
199 cleaned up 1 temporarily added file(s) from the sparse checkout 193 cleaned up 1 temporarily added file(s) from the sparse checkout
200 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 194 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
201 $ hg debugsparse 195 $ hg debugsparse
202 [include]
203
204 [exclude] 196 [exclude]
205 hide* 197 hide*
206 198
207 199
208 Verify strip -k resets dirstate correctly 200 Verify strip -k resets dirstate correctly
209 201
210 $ hg status 202 $ hg status
211 $ hg debugsparse 203 $ hg debugsparse
212 [include]
213
214 [exclude] 204 [exclude]
215 hide* 205 hide*
216 206
217 $ hg log -r . -T '{rev}\n' --stat 207 $ hg log -r . -T '{rev}\n' --stat
218 1 208 1
255 $ hg debugsparse --reset 245 $ hg debugsparse --reset
256 $ hg debugsparse --include empty 246 $ hg debugsparse --include empty
257 $ hg debugsparse 247 $ hg debugsparse
258 [include] 248 [include]
259 empty 249 empty
260 [exclude]
261
262 250
263 251
264 $ mkdir add 252 $ mkdir add
265 $ touch add/foo 253 $ touch add/foo
266 $ touch add/bar 254 $ touch add/bar
274 ? add/bar 262 ? add/bar
275 $ hg debugsparse 263 $ hg debugsparse
276 [include] 264 [include]
277 add 265 add
278 empty 266 empty
279 [exclude]
280
281 267
282 $ hg add -s add/* 268 $ hg add -s add/*
283 add/foo already tracked! 269 add/foo already tracked!
284 $ hg st 270 $ hg st
285 A add/bar 271 A add/bar
286 A add/foo 272 A add/foo
287 $ hg debugsparse 273 $ hg debugsparse
288 [include] 274 [include]
289 add 275 add
290 empty 276 empty
291 [exclude]
292
293 277
294 278
295 $ cd .. 279 $ cd ..
296 280
297 Test non-sparse repos work while sparse is loaded 281 Test non-sparse repos work while sparse is loaded