##// END OF EJS Templates
largefiles: don't convert dest=None to dest=hg.defaultdest() in clone command...
Matt Harbison -
r17600:3a1c6b64 stable
parent child Browse files
Show More
@@ -1,1102 +1,1103 b''
1 1 # Copyright 2009-2010 Gregory P. Ward
2 2 # Copyright 2009-2010 Intelerad Medical Systems Incorporated
3 3 # Copyright 2010-2011 Fog Creek Software
4 4 # Copyright 2010-2011 Unity Technologies
5 5 #
6 6 # This software may be used and distributed according to the terms of the
7 7 # GNU General Public License version 2 or any later version.
8 8
9 9 '''Overridden Mercurial commands and functions for the largefiles extension'''
10 10
11 11 import os
12 12 import copy
13 13
14 14 from mercurial import hg, commands, util, cmdutil, scmutil, match as match_, \
15 15 node, archival, error, merge
16 16 from mercurial.i18n import _
17 17 from mercurial.node import hex
18 18 from hgext import rebase
19 19
20 20 import lfutil
21 21 import lfcommands
22 22
23 23 # -- Utility functions: commonly/repeatedly needed functionality ---------------
24 24
25 25 def installnormalfilesmatchfn(manifest):
26 26 '''overrides scmutil.match so that the matcher it returns will ignore all
27 27 largefiles'''
28 28 oldmatch = None # for the closure
29 29 def overridematch(ctx, pats=[], opts={}, globbed=False,
30 30 default='relpath'):
31 31 match = oldmatch(ctx, pats, opts, globbed, default)
32 32 m = copy.copy(match)
33 33 notlfile = lambda f: not (lfutil.isstandin(f) or lfutil.standin(f) in
34 34 manifest)
35 35 m._files = filter(notlfile, m._files)
36 36 m._fmap = set(m._files)
37 37 origmatchfn = m.matchfn
38 38 m.matchfn = lambda f: notlfile(f) and origmatchfn(f) or None
39 39 return m
40 40 oldmatch = installmatchfn(overridematch)
41 41
42 42 def installmatchfn(f):
43 43 oldmatch = scmutil.match
44 44 setattr(f, 'oldmatch', oldmatch)
45 45 scmutil.match = f
46 46 return oldmatch
47 47
48 48 def restorematchfn():
49 49 '''restores scmutil.match to what it was before installnormalfilesmatchfn
50 50 was called. no-op if scmutil.match is its original function.
51 51
52 52 Note that n calls to installnormalfilesmatchfn will require n calls to
53 53 restore matchfn to reverse'''
54 54 scmutil.match = getattr(scmutil.match, 'oldmatch', scmutil.match)
55 55
56 56 def addlargefiles(ui, repo, *pats, **opts):
57 57 large = opts.pop('large', None)
58 58 lfsize = lfutil.getminsize(
59 59 ui, lfutil.islfilesrepo(repo), opts.pop('lfsize', None))
60 60
61 61 lfmatcher = None
62 62 if lfutil.islfilesrepo(repo):
63 63 lfpats = ui.configlist(lfutil.longname, 'patterns', default=[])
64 64 if lfpats:
65 65 lfmatcher = match_.match(repo.root, '', list(lfpats))
66 66
67 67 lfnames = []
68 68 m = scmutil.match(repo[None], pats, opts)
69 69 m.bad = lambda x, y: None
70 70 wctx = repo[None]
71 71 for f in repo.walk(m):
72 72 exact = m.exact(f)
73 73 lfile = lfutil.standin(f) in wctx
74 74 nfile = f in wctx
75 75 exists = lfile or nfile
76 76
77 77 # Don't warn the user when they attempt to add a normal tracked file.
78 78 # The normal add code will do that for us.
79 79 if exact and exists:
80 80 if lfile:
81 81 ui.warn(_('%s already a largefile\n') % f)
82 82 continue
83 83
84 84 if (exact or not exists) and not lfutil.isstandin(f):
85 85 wfile = repo.wjoin(f)
86 86
87 87 # In case the file was removed previously, but not committed
88 88 # (issue3507)
89 89 if not os.path.exists(wfile):
90 90 continue
91 91
92 92 abovemin = (lfsize and
93 93 os.lstat(wfile).st_size >= lfsize * 1024 * 1024)
94 94 if large or abovemin or (lfmatcher and lfmatcher(f)):
95 95 lfnames.append(f)
96 96 if ui.verbose or not exact:
97 97 ui.status(_('adding %s as a largefile\n') % m.rel(f))
98 98
99 99 bad = []
100 100 standins = []
101 101
102 102 # Need to lock, otherwise there could be a race condition between
103 103 # when standins are created and added to the repo.
104 104 wlock = repo.wlock()
105 105 try:
106 106 if not opts.get('dry_run'):
107 107 lfdirstate = lfutil.openlfdirstate(ui, repo)
108 108 for f in lfnames:
109 109 standinname = lfutil.standin(f)
110 110 lfutil.writestandin(repo, standinname, hash='',
111 111 executable=lfutil.getexecutable(repo.wjoin(f)))
112 112 standins.append(standinname)
113 113 if lfdirstate[f] == 'r':
114 114 lfdirstate.normallookup(f)
115 115 else:
116 116 lfdirstate.add(f)
117 117 lfdirstate.write()
118 118 bad += [lfutil.splitstandin(f)
119 119 for f in lfutil.repoadd(repo, standins)
120 120 if f in m.files()]
121 121 finally:
122 122 wlock.release()
123 123 return bad
124 124
125 125 def removelargefiles(ui, repo, *pats, **opts):
126 126 after = opts.get('after')
127 127 if not pats and not after:
128 128 raise util.Abort(_('no files specified'))
129 129 m = scmutil.match(repo[None], pats, opts)
130 130 try:
131 131 repo.lfstatus = True
132 132 s = repo.status(match=m, clean=True)
133 133 finally:
134 134 repo.lfstatus = False
135 135 manifest = repo[None].manifest()
136 136 modified, added, deleted, clean = [[f for f in list
137 137 if lfutil.standin(f) in manifest]
138 138 for list in [s[0], s[1], s[3], s[6]]]
139 139
140 140 def warn(files, reason):
141 141 for f in files:
142 142 ui.warn(_('not removing %s: %s (use forget to undo)\n')
143 143 % (m.rel(f), reason))
144 144 return int(len(files) > 0)
145 145
146 146 result = 0
147 147
148 148 if after:
149 149 remove, forget = deleted, []
150 150 result = warn(modified + added + clean, _('file still exists'))
151 151 else:
152 152 remove, forget = deleted + clean, []
153 153 result = warn(modified, _('file is modified'))
154 154 result = warn(added, _('file has been marked for add')) or result
155 155
156 156 for f in sorted(remove + forget):
157 157 if ui.verbose or not m.exact(f):
158 158 ui.status(_('removing %s\n') % m.rel(f))
159 159
160 160 # Need to lock because standin files are deleted then removed from the
161 161 # repository and we could race inbetween.
162 162 wlock = repo.wlock()
163 163 try:
164 164 lfdirstate = lfutil.openlfdirstate(ui, repo)
165 165 for f in remove:
166 166 if not after:
167 167 # If this is being called by addremove, notify the user that we
168 168 # are removing the file.
169 169 if getattr(repo, "_isaddremove", False):
170 170 ui.status(_('removing %s\n') % f)
171 171 if os.path.exists(repo.wjoin(f)):
172 172 util.unlinkpath(repo.wjoin(f))
173 173 lfdirstate.remove(f)
174 174 lfdirstate.write()
175 175 forget = [lfutil.standin(f) for f in forget]
176 176 remove = [lfutil.standin(f) for f in remove]
177 177 lfutil.repoforget(repo, forget)
178 178 # If this is being called by addremove, let the original addremove
179 179 # function handle this.
180 180 if not getattr(repo, "_isaddremove", False):
181 181 lfutil.reporemove(repo, remove, unlink=True)
182 182 else:
183 183 lfutil.reporemove(repo, remove, unlink=False)
184 184 finally:
185 185 wlock.release()
186 186
187 187 return result
188 188
189 189 # For overriding mercurial.hgweb.webcommands so that largefiles will
190 190 # appear at their right place in the manifests.
191 191 def decodepath(orig, path):
192 192 return lfutil.splitstandin(path) or path
193 193
194 194 # -- Wrappers: modify existing commands --------------------------------
195 195
196 196 # Add works by going through the files that the user wanted to add and
197 197 # checking if they should be added as largefiles. Then it makes a new
198 198 # matcher which matches only the normal files and runs the original
199 199 # version of add.
200 200 def overrideadd(orig, ui, repo, *pats, **opts):
201 201 normal = opts.pop('normal')
202 202 if normal:
203 203 if opts.get('large'):
204 204 raise util.Abort(_('--normal cannot be used with --large'))
205 205 return orig(ui, repo, *pats, **opts)
206 206 bad = addlargefiles(ui, repo, *pats, **opts)
207 207 installnormalfilesmatchfn(repo[None].manifest())
208 208 result = orig(ui, repo, *pats, **opts)
209 209 restorematchfn()
210 210
211 211 return (result == 1 or bad) and 1 or 0
212 212
213 213 def overrideremove(orig, ui, repo, *pats, **opts):
214 214 installnormalfilesmatchfn(repo[None].manifest())
215 215 result = orig(ui, repo, *pats, **opts)
216 216 restorematchfn()
217 217 return removelargefiles(ui, repo, *pats, **opts) or result
218 218
219 219 def overridestatusfn(orig, repo, rev2, **opts):
220 220 try:
221 221 repo._repo.lfstatus = True
222 222 return orig(repo, rev2, **opts)
223 223 finally:
224 224 repo._repo.lfstatus = False
225 225
226 226 def overridestatus(orig, ui, repo, *pats, **opts):
227 227 try:
228 228 repo.lfstatus = True
229 229 return orig(ui, repo, *pats, **opts)
230 230 finally:
231 231 repo.lfstatus = False
232 232
233 233 def overridedirty(orig, repo, ignoreupdate=False):
234 234 try:
235 235 repo._repo.lfstatus = True
236 236 return orig(repo, ignoreupdate)
237 237 finally:
238 238 repo._repo.lfstatus = False
239 239
240 240 def overridelog(orig, ui, repo, *pats, **opts):
241 241 try:
242 242 repo.lfstatus = True
243 243 return orig(ui, repo, *pats, **opts)
244 244 finally:
245 245 repo.lfstatus = False
246 246
247 247 def overrideverify(orig, ui, repo, *pats, **opts):
248 248 large = opts.pop('large', False)
249 249 all = opts.pop('lfa', False)
250 250 contents = opts.pop('lfc', False)
251 251
252 252 result = orig(ui, repo, *pats, **opts)
253 253 if large:
254 254 result = result or lfcommands.verifylfiles(ui, repo, all, contents)
255 255 return result
256 256
257 257 # Override needs to refresh standins so that update's normal merge
258 258 # will go through properly. Then the other update hook (overriding repo.update)
259 259 # will get the new files. Filemerge is also overriden so that the merge
260 260 # will merge standins correctly.
261 261 def overrideupdate(orig, ui, repo, *pats, **opts):
262 262 lfdirstate = lfutil.openlfdirstate(ui, repo)
263 263 s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False,
264 264 False, False)
265 265 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s
266 266
267 267 # Need to lock between the standins getting updated and their
268 268 # largefiles getting updated
269 269 wlock = repo.wlock()
270 270 try:
271 271 if opts['check']:
272 272 mod = len(modified) > 0
273 273 for lfile in unsure:
274 274 standin = lfutil.standin(lfile)
275 275 if repo['.'][standin].data().strip() != \
276 276 lfutil.hashfile(repo.wjoin(lfile)):
277 277 mod = True
278 278 else:
279 279 lfdirstate.normal(lfile)
280 280 lfdirstate.write()
281 281 if mod:
282 282 raise util.Abort(_('uncommitted local changes'))
283 283 # XXX handle removed differently
284 284 if not opts['clean']:
285 285 for lfile in unsure + modified + added:
286 286 lfutil.updatestandin(repo, lfutil.standin(lfile))
287 287 finally:
288 288 wlock.release()
289 289 return orig(ui, repo, *pats, **opts)
290 290
291 291 # Before starting the manifest merge, merge.updates will call
292 292 # _checkunknown to check if there are any files in the merged-in
293 293 # changeset that collide with unknown files in the working copy.
294 294 #
295 295 # The largefiles are seen as unknown, so this prevents us from merging
296 296 # in a file 'foo' if we already have a largefile with the same name.
297 297 #
298 298 # The overridden function filters the unknown files by removing any
299 299 # largefiles. This makes the merge proceed and we can then handle this
300 300 # case further in the overridden manifestmerge function below.
301 301 def overridecheckunknownfile(origfn, repo, wctx, mctx, f):
302 302 if lfutil.standin(f) in wctx:
303 303 return False
304 304 return origfn(repo, wctx, mctx, f)
305 305
306 306 # The manifest merge handles conflicts on the manifest level. We want
307 307 # to handle changes in largefile-ness of files at this level too.
308 308 #
309 309 # The strategy is to run the original manifestmerge and then process
310 310 # the action list it outputs. There are two cases we need to deal with:
311 311 #
312 312 # 1. Normal file in p1, largefile in p2. Here the largefile is
313 313 # detected via its standin file, which will enter the working copy
314 314 # with a "get" action. It is not "merge" since the standin is all
315 315 # Mercurial is concerned with at this level -- the link to the
316 316 # existing normal file is not relevant here.
317 317 #
318 318 # 2. Largefile in p1, normal file in p2. Here we get a "merge" action
319 319 # since the largefile will be present in the working copy and
320 320 # different from the normal file in p2. Mercurial therefore
321 321 # triggers a merge action.
322 322 #
323 323 # In both cases, we prompt the user and emit new actions to either
324 324 # remove the standin (if the normal file was kept) or to remove the
325 325 # normal file and get the standin (if the largefile was kept). The
326 326 # default prompt answer is to use the largefile version since it was
327 327 # presumably changed on purpose.
328 328 #
329 329 # Finally, the merge.applyupdates function will then take care of
330 330 # writing the files into the working copy and lfcommands.updatelfiles
331 331 # will update the largefiles.
332 332 def overridemanifestmerge(origfn, repo, p1, p2, pa, overwrite, partial):
333 333 actions = origfn(repo, p1, p2, pa, overwrite, partial)
334 334 processed = []
335 335
336 336 for action in actions:
337 337 if overwrite:
338 338 processed.append(action)
339 339 continue
340 340 f, m = action[:2]
341 341
342 342 choices = (_('&Largefile'), _('&Normal file'))
343 343 if m == "g" and lfutil.splitstandin(f) in p1 and f in p2:
344 344 # Case 1: normal file in the working copy, largefile in
345 345 # the second parent
346 346 lfile = lfutil.splitstandin(f)
347 347 standin = f
348 348 msg = _('%s has been turned into a largefile\n'
349 349 'use (l)argefile or keep as (n)ormal file?') % lfile
350 350 if repo.ui.promptchoice(msg, choices, 0) == 0:
351 351 processed.append((lfile, "r"))
352 352 processed.append((standin, "g", p2.flags(standin)))
353 353 else:
354 354 processed.append((standin, "r"))
355 355 elif m == "g" and lfutil.standin(f) in p1 and f in p2:
356 356 # Case 2: largefile in the working copy, normal file in
357 357 # the second parent
358 358 standin = lfutil.standin(f)
359 359 lfile = f
360 360 msg = _('%s has been turned into a normal file\n'
361 361 'keep as (l)argefile or use (n)ormal file?') % lfile
362 362 if repo.ui.promptchoice(msg, choices, 0) == 0:
363 363 processed.append((lfile, "r"))
364 364 else:
365 365 processed.append((standin, "r"))
366 366 processed.append((lfile, "g", p2.flags(lfile)))
367 367 else:
368 368 processed.append(action)
369 369
370 370 return processed
371 371
372 372 # Override filemerge to prompt the user about how they wish to merge
373 373 # largefiles. This will handle identical edits, and copy/rename +
374 374 # edit without prompting the user.
375 375 def overridefilemerge(origfn, repo, mynode, orig, fcd, fco, fca):
376 376 # Use better variable names here. Because this is a wrapper we cannot
377 377 # change the variable names in the function declaration.
378 378 fcdest, fcother, fcancestor = fcd, fco, fca
379 379 if not lfutil.isstandin(orig):
380 380 return origfn(repo, mynode, orig, fcdest, fcother, fcancestor)
381 381 else:
382 382 if not fcother.cmp(fcdest): # files identical?
383 383 return None
384 384
385 385 # backwards, use working dir parent as ancestor
386 386 if fcancestor == fcother:
387 387 fcancestor = fcdest.parents()[0]
388 388
389 389 if orig != fcother.path():
390 390 repo.ui.status(_('merging %s and %s to %s\n')
391 391 % (lfutil.splitstandin(orig),
392 392 lfutil.splitstandin(fcother.path()),
393 393 lfutil.splitstandin(fcdest.path())))
394 394 else:
395 395 repo.ui.status(_('merging %s\n')
396 396 % lfutil.splitstandin(fcdest.path()))
397 397
398 398 if fcancestor.path() != fcother.path() and fcother.data() == \
399 399 fcancestor.data():
400 400 return 0
401 401 if fcancestor.path() != fcdest.path() and fcdest.data() == \
402 402 fcancestor.data():
403 403 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags())
404 404 return 0
405 405
406 406 if repo.ui.promptchoice(_('largefile %s has a merge conflict\n'
407 407 'keep (l)ocal or take (o)ther?') %
408 408 lfutil.splitstandin(orig),
409 409 (_('&Local'), _('&Other')), 0) == 0:
410 410 return 0
411 411 else:
412 412 repo.wwrite(fcdest.path(), fcother.data(), fcother.flags())
413 413 return 0
414 414
415 415 # Copy first changes the matchers to match standins instead of
416 416 # largefiles. Then it overrides util.copyfile in that function it
417 417 # checks if the destination largefile already exists. It also keeps a
418 418 # list of copied files so that the largefiles can be copied and the
419 419 # dirstate updated.
420 420 def overridecopy(orig, ui, repo, pats, opts, rename=False):
421 421 # doesn't remove largefile on rename
422 422 if len(pats) < 2:
423 423 # this isn't legal, let the original function deal with it
424 424 return orig(ui, repo, pats, opts, rename)
425 425
426 426 def makestandin(relpath):
427 427 path = scmutil.canonpath(repo.root, repo.getcwd(), relpath)
428 428 return os.path.join(repo.wjoin(lfutil.standin(path)))
429 429
430 430 fullpats = scmutil.expandpats(pats)
431 431 dest = fullpats[-1]
432 432
433 433 if os.path.isdir(dest):
434 434 if not os.path.isdir(makestandin(dest)):
435 435 os.makedirs(makestandin(dest))
436 436 # This could copy both lfiles and normal files in one command,
437 437 # but we don't want to do that. First replace their matcher to
438 438 # only match normal files and run it, then replace it to just
439 439 # match largefiles and run it again.
440 440 nonormalfiles = False
441 441 nolfiles = False
442 442 try:
443 443 try:
444 444 installnormalfilesmatchfn(repo[None].manifest())
445 445 result = orig(ui, repo, pats, opts, rename)
446 446 except util.Abort, e:
447 447 if str(e) != _('no files to copy'):
448 448 raise e
449 449 else:
450 450 nonormalfiles = True
451 451 result = 0
452 452 finally:
453 453 restorematchfn()
454 454
455 455 # The first rename can cause our current working directory to be removed.
456 456 # In that case there is nothing left to copy/rename so just quit.
457 457 try:
458 458 repo.getcwd()
459 459 except OSError:
460 460 return result
461 461
462 462 try:
463 463 try:
464 464 # When we call orig below it creates the standins but we don't add
465 465 # them to the dir state until later so lock during that time.
466 466 wlock = repo.wlock()
467 467
468 468 manifest = repo[None].manifest()
469 469 oldmatch = None # for the closure
470 470 def overridematch(ctx, pats=[], opts={}, globbed=False,
471 471 default='relpath'):
472 472 newpats = []
473 473 # The patterns were previously mangled to add the standin
474 474 # directory; we need to remove that now
475 475 for pat in pats:
476 476 if match_.patkind(pat) is None and lfutil.shortname in pat:
477 477 newpats.append(pat.replace(lfutil.shortname, ''))
478 478 else:
479 479 newpats.append(pat)
480 480 match = oldmatch(ctx, newpats, opts, globbed, default)
481 481 m = copy.copy(match)
482 482 lfile = lambda f: lfutil.standin(f) in manifest
483 483 m._files = [lfutil.standin(f) for f in m._files if lfile(f)]
484 484 m._fmap = set(m._files)
485 485 origmatchfn = m.matchfn
486 486 m.matchfn = lambda f: (lfutil.isstandin(f) and
487 487 (f in manifest) and
488 488 origmatchfn(lfutil.splitstandin(f)) or
489 489 None)
490 490 return m
491 491 oldmatch = installmatchfn(overridematch)
492 492 listpats = []
493 493 for pat in pats:
494 494 if match_.patkind(pat) is not None:
495 495 listpats.append(pat)
496 496 else:
497 497 listpats.append(makestandin(pat))
498 498
499 499 try:
500 500 origcopyfile = util.copyfile
501 501 copiedfiles = []
502 502 def overridecopyfile(src, dest):
503 503 if (lfutil.shortname in src and
504 504 dest.startswith(repo.wjoin(lfutil.shortname))):
505 505 destlfile = dest.replace(lfutil.shortname, '')
506 506 if not opts['force'] and os.path.exists(destlfile):
507 507 raise IOError('',
508 508 _('destination largefile already exists'))
509 509 copiedfiles.append((src, dest))
510 510 origcopyfile(src, dest)
511 511
512 512 util.copyfile = overridecopyfile
513 513 result += orig(ui, repo, listpats, opts, rename)
514 514 finally:
515 515 util.copyfile = origcopyfile
516 516
517 517 lfdirstate = lfutil.openlfdirstate(ui, repo)
518 518 for (src, dest) in copiedfiles:
519 519 if (lfutil.shortname in src and
520 520 dest.startswith(repo.wjoin(lfutil.shortname))):
521 521 srclfile = src.replace(repo.wjoin(lfutil.standin('')), '')
522 522 destlfile = dest.replace(repo.wjoin(lfutil.standin('')), '')
523 523 destlfiledir = os.path.dirname(repo.wjoin(destlfile)) or '.'
524 524 if not os.path.isdir(destlfiledir):
525 525 os.makedirs(destlfiledir)
526 526 if rename:
527 527 os.rename(repo.wjoin(srclfile), repo.wjoin(destlfile))
528 528 lfdirstate.remove(srclfile)
529 529 else:
530 530 util.copyfile(repo.wjoin(srclfile),
531 531 repo.wjoin(destlfile))
532 532
533 533 lfdirstate.add(destlfile)
534 534 lfdirstate.write()
535 535 except util.Abort, e:
536 536 if str(e) != _('no files to copy'):
537 537 raise e
538 538 else:
539 539 nolfiles = True
540 540 finally:
541 541 restorematchfn()
542 542 wlock.release()
543 543
544 544 if nolfiles and nonormalfiles:
545 545 raise util.Abort(_('no files to copy'))
546 546
547 547 return result
548 548
549 549 # When the user calls revert, we have to be careful to not revert any
550 550 # changes to other largefiles accidentally. This means we have to keep
551 551 # track of the largefiles that are being reverted so we only pull down
552 552 # the necessary largefiles.
553 553 #
554 554 # Standins are only updated (to match the hash of largefiles) before
555 555 # commits. Update the standins then run the original revert, changing
556 556 # the matcher to hit standins instead of largefiles. Based on the
557 557 # resulting standins update the largefiles. Then return the standins
558 558 # to their proper state
559 559 def overriderevert(orig, ui, repo, *pats, **opts):
560 560 # Because we put the standins in a bad state (by updating them)
561 561 # and then return them to a correct state we need to lock to
562 562 # prevent others from changing them in their incorrect state.
563 563 wlock = repo.wlock()
564 564 try:
565 565 lfdirstate = lfutil.openlfdirstate(ui, repo)
566 566 (modified, added, removed, missing, unknown, ignored, clean) = \
567 567 lfutil.lfdirstatestatus(lfdirstate, repo, repo['.'].rev())
568 568 for lfile in modified:
569 569 lfutil.updatestandin(repo, lfutil.standin(lfile))
570 570 for lfile in missing:
571 571 if (os.path.exists(repo.wjoin(lfutil.standin(lfile)))):
572 572 os.unlink(repo.wjoin(lfutil.standin(lfile)))
573 573
574 574 try:
575 575 ctx = scmutil.revsingle(repo, opts.get('rev'))
576 576 oldmatch = None # for the closure
577 577 def overridematch(ctx, pats=[], opts={}, globbed=False,
578 578 default='relpath'):
579 579 match = oldmatch(ctx, pats, opts, globbed, default)
580 580 m = copy.copy(match)
581 581 def tostandin(f):
582 582 if lfutil.standin(f) in ctx:
583 583 return lfutil.standin(f)
584 584 elif lfutil.standin(f) in repo[None]:
585 585 return None
586 586 return f
587 587 m._files = [tostandin(f) for f in m._files]
588 588 m._files = [f for f in m._files if f is not None]
589 589 m._fmap = set(m._files)
590 590 origmatchfn = m.matchfn
591 591 def matchfn(f):
592 592 if lfutil.isstandin(f):
593 593 # We need to keep track of what largefiles are being
594 594 # matched so we know which ones to update later --
595 595 # otherwise we accidentally revert changes to other
596 596 # largefiles. This is repo-specific, so duckpunch the
597 597 # repo object to keep the list of largefiles for us
598 598 # later.
599 599 if origmatchfn(lfutil.splitstandin(f)) and \
600 600 (f in repo[None] or f in ctx):
601 601 lfileslist = getattr(repo, '_lfilestoupdate', [])
602 602 lfileslist.append(lfutil.splitstandin(f))
603 603 repo._lfilestoupdate = lfileslist
604 604 return True
605 605 else:
606 606 return False
607 607 return origmatchfn(f)
608 608 m.matchfn = matchfn
609 609 return m
610 610 oldmatch = installmatchfn(overridematch)
611 611 scmutil.match
612 612 matches = overridematch(repo[None], pats, opts)
613 613 orig(ui, repo, *pats, **opts)
614 614 finally:
615 615 restorematchfn()
616 616 lfileslist = getattr(repo, '_lfilestoupdate', [])
617 617 lfcommands.updatelfiles(ui, repo, filelist=lfileslist,
618 618 printmessage=False)
619 619
620 620 # empty out the largefiles list so we start fresh next time
621 621 repo._lfilestoupdate = []
622 622 for lfile in modified:
623 623 if lfile in lfileslist:
624 624 if os.path.exists(repo.wjoin(lfutil.standin(lfile))) and lfile\
625 625 in repo['.']:
626 626 lfutil.writestandin(repo, lfutil.standin(lfile),
627 627 repo['.'][lfile].data().strip(),
628 628 'x' in repo['.'][lfile].flags())
629 629 lfdirstate = lfutil.openlfdirstate(ui, repo)
630 630 for lfile in added:
631 631 standin = lfutil.standin(lfile)
632 632 if standin not in ctx and (standin in matches or opts.get('all')):
633 633 if lfile in lfdirstate:
634 634 lfdirstate.drop(lfile)
635 635 util.unlinkpath(repo.wjoin(standin))
636 636 lfdirstate.write()
637 637 finally:
638 638 wlock.release()
639 639
640 640 def hgupdate(orig, repo, node):
641 641 # Only call updatelfiles the standins that have changed to save time
642 642 oldstandins = lfutil.getstandinsstate(repo)
643 643 result = orig(repo, node)
644 644 newstandins = lfutil.getstandinsstate(repo)
645 645 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
646 646 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist, printmessage=True)
647 647 return result
648 648
649 649 def hgclean(orig, repo, node, show_stats=True):
650 650 result = orig(repo, node, show_stats)
651 651 lfcommands.updatelfiles(repo.ui, repo)
652 652 return result
653 653
654 654 def hgmerge(orig, repo, node, force=None, remind=True):
655 655 # Mark the repo as being in the middle of a merge, so that
656 656 # updatelfiles() will know that it needs to trust the standins in
657 657 # the working copy, not in the standins in the current node
658 658 repo._ismerging = True
659 659 try:
660 660 result = orig(repo, node, force, remind)
661 661 lfcommands.updatelfiles(repo.ui, repo)
662 662 finally:
663 663 repo._ismerging = False
664 664 return result
665 665
666 666 # When we rebase a repository with remotely changed largefiles, we need to
667 667 # take some extra care so that the largefiles are correctly updated in the
668 668 # working copy
669 669 def overridepull(orig, ui, repo, source=None, **opts):
670 670 revsprepull = len(repo)
671 671 if opts.get('rebase', False):
672 672 repo._isrebasing = True
673 673 try:
674 674 if opts.get('update'):
675 675 del opts['update']
676 676 ui.debug('--update and --rebase are not compatible, ignoring '
677 677 'the update flag\n')
678 678 del opts['rebase']
679 679 cmdutil.bailifchanged(repo)
680 680 origpostincoming = commands.postincoming
681 681 def _dummy(*args, **kwargs):
682 682 pass
683 683 commands.postincoming = _dummy
684 684 repo.lfpullsource = source
685 685 if not source:
686 686 source = 'default'
687 687 try:
688 688 result = commands.pull(ui, repo, source, **opts)
689 689 finally:
690 690 commands.postincoming = origpostincoming
691 691 revspostpull = len(repo)
692 692 if revspostpull > revsprepull:
693 693 result = result or rebase.rebase(ui, repo)
694 694 finally:
695 695 repo._isrebasing = False
696 696 else:
697 697 repo.lfpullsource = source
698 698 if not source:
699 699 source = 'default'
700 700 oldheads = lfutil.getcurrentheads(repo)
701 701 result = orig(ui, repo, source, **opts)
702 702 # If we do not have the new largefiles for any new heads we pulled, we
703 703 # will run into a problem later if we try to merge or rebase with one of
704 704 # these heads, so cache the largefiles now direclty into the system
705 705 # cache.
706 706 ui.status(_("caching new largefiles\n"))
707 707 numcached = 0
708 708 heads = lfutil.getcurrentheads(repo)
709 709 newheads = set(heads).difference(set(oldheads))
710 710 for head in newheads:
711 711 (cached, missing) = lfcommands.cachelfiles(ui, repo, head)
712 712 numcached += len(cached)
713 713 ui.status(_("%d largefiles cached\n") % numcached)
714 714 if opts.get('all_largefiles'):
715 715 revspostpull = len(repo)
716 716 revs = []
717 717 for rev in xrange(revsprepull + 1, revspostpull):
718 718 revs.append(repo[rev].rev())
719 719 lfcommands.downloadlfiles(ui, repo, revs)
720 720 return result
721 721
722 722 def overrideclone(orig, ui, source, dest=None, **opts):
723 if dest is None:
724 dest = hg.defaultdest(source)
725 if opts.get('all_largefiles') and not hg.islocal(dest):
723 d = dest
724 if d is None:
725 d = hg.defaultdest(source)
726 if opts.get('all_largefiles') and not hg.islocal(d):
726 727 raise util.Abort(_(
727 728 '--all-largefiles is incompatible with non-local destination %s' %
728 dest))
729 d))
729 730 result = hg.clone(ui, opts, source, dest,
730 731 pull=opts.get('pull'),
731 732 stream=opts.get('uncompressed'),
732 733 rev=opts.get('rev'),
733 734 update=opts.get('updaterev') or not opts.get('noupdate'),
734 735 branch=opts.get('branch'))
735 736 if result is None:
736 737 return True
737 738 if opts.get('all_largefiles'):
738 739 sourcerepo, destrepo = result
739 740 repo = destrepo.local()
740 741
741 742 # The .hglf directory must exist for the standin matcher to match
742 743 # anything (which listlfiles uses for each rev), and .hg/largefiles is
743 744 # assumed to exist by the code that caches the downloaded file. These
744 745 # directories exist if clone updated to any rev.
745 746 if opts.get('noupdate'):
746 747 util.makedirs(repo.pathto(lfutil.shortname))
747 748 util.makedirs(repo.join(lfutil.longname))
748 749
749 750 # Caching is implicitly limited to 'rev' option, since the dest repo was
750 751 # truncated at that point.
751 752 success, missing = lfcommands.downloadlfiles(ui, repo, None)
752 753 return missing != 0
753 754 return result is None
754 755
755 756 def overriderebase(orig, ui, repo, **opts):
756 757 repo._isrebasing = True
757 758 try:
758 759 return orig(ui, repo, **opts)
759 760 finally:
760 761 repo._isrebasing = False
761 762
762 763 def overridearchive(orig, repo, dest, node, kind, decode=True, matchfn=None,
763 764 prefix=None, mtime=None, subrepos=None):
764 765 # No need to lock because we are only reading history and
765 766 # largefile caches, neither of which are modified.
766 767 lfcommands.cachelfiles(repo.ui, repo, node)
767 768
768 769 if kind not in archival.archivers:
769 770 raise util.Abort(_("unknown archive type '%s'") % kind)
770 771
771 772 ctx = repo[node]
772 773
773 774 if kind == 'files':
774 775 if prefix:
775 776 raise util.Abort(
776 777 _('cannot give prefix when archiving to files'))
777 778 else:
778 779 prefix = archival.tidyprefix(dest, kind, prefix)
779 780
780 781 def write(name, mode, islink, getdata):
781 782 if matchfn and not matchfn(name):
782 783 return
783 784 data = getdata()
784 785 if decode:
785 786 data = repo.wwritedata(name, data)
786 787 archiver.addfile(prefix + name, mode, islink, data)
787 788
788 789 archiver = archival.archivers[kind](dest, mtime or ctx.date()[0])
789 790
790 791 if repo.ui.configbool("ui", "archivemeta", True):
791 792 def metadata():
792 793 base = 'repo: %s\nnode: %s\nbranch: %s\n' % (
793 794 hex(repo.changelog.node(0)), hex(node), ctx.branch())
794 795
795 796 tags = ''.join('tag: %s\n' % t for t in ctx.tags()
796 797 if repo.tagtype(t) == 'global')
797 798 if not tags:
798 799 repo.ui.pushbuffer()
799 800 opts = {'template': '{latesttag}\n{latesttagdistance}',
800 801 'style': '', 'patch': None, 'git': None}
801 802 cmdutil.show_changeset(repo.ui, repo, opts).show(ctx)
802 803 ltags, dist = repo.ui.popbuffer().split('\n')
803 804 tags = ''.join('latesttag: %s\n' % t for t in ltags.split(':'))
804 805 tags += 'latesttagdistance: %s\n' % dist
805 806
806 807 return base + tags
807 808
808 809 write('.hg_archival.txt', 0644, False, metadata)
809 810
810 811 for f in ctx:
811 812 ff = ctx.flags(f)
812 813 getdata = ctx[f].data
813 814 if lfutil.isstandin(f):
814 815 path = lfutil.findfile(repo, getdata().strip())
815 816 if path is None:
816 817 raise util.Abort(
817 818 _('largefile %s not found in repo store or system cache')
818 819 % lfutil.splitstandin(f))
819 820 f = lfutil.splitstandin(f)
820 821
821 822 def getdatafn():
822 823 fd = None
823 824 try:
824 825 fd = open(path, 'rb')
825 826 return fd.read()
826 827 finally:
827 828 if fd:
828 829 fd.close()
829 830
830 831 getdata = getdatafn
831 832 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata)
832 833
833 834 if subrepos:
834 835 for subpath in ctx.substate:
835 836 sub = ctx.sub(subpath)
836 837 submatch = match_.narrowmatcher(subpath, matchfn)
837 838 sub.archive(repo.ui, archiver, prefix, submatch)
838 839
839 840 archiver.done()
840 841
841 842 def hgsubrepoarchive(orig, repo, ui, archiver, prefix, match=None):
842 843 rev = repo._state[1]
843 844 ctx = repo._repo[rev]
844 845
845 846 lfcommands.cachelfiles(ui, repo._repo, ctx.node())
846 847
847 848 def write(name, mode, islink, getdata):
848 849 # At this point, the standin has been replaced with the largefile name,
849 850 # so the normal matcher works here without the lfutil variants.
850 851 if match and not match(f):
851 852 return
852 853 data = getdata()
853 854
854 855 archiver.addfile(prefix + repo._path + '/' + name, mode, islink, data)
855 856
856 857 for f in ctx:
857 858 ff = ctx.flags(f)
858 859 getdata = ctx[f].data
859 860 if lfutil.isstandin(f):
860 861 path = lfutil.findfile(repo._repo, getdata().strip())
861 862 if path is None:
862 863 raise util.Abort(
863 864 _('largefile %s not found in repo store or system cache')
864 865 % lfutil.splitstandin(f))
865 866 f = lfutil.splitstandin(f)
866 867
867 868 def getdatafn():
868 869 fd = None
869 870 try:
870 871 fd = open(os.path.join(prefix, path), 'rb')
871 872 return fd.read()
872 873 finally:
873 874 if fd:
874 875 fd.close()
875 876
876 877 getdata = getdatafn
877 878
878 879 write(f, 'x' in ff and 0755 or 0644, 'l' in ff, getdata)
879 880
880 881 for subpath in ctx.substate:
881 882 sub = ctx.sub(subpath)
882 883 submatch = match_.narrowmatcher(subpath, match)
883 884 sub.archive(ui, archiver, os.path.join(prefix, repo._path) + '/',
884 885 submatch)
885 886
886 887 # If a largefile is modified, the change is not reflected in its
887 888 # standin until a commit. cmdutil.bailifchanged() raises an exception
888 889 # if the repo has uncommitted changes. Wrap it to also check if
889 890 # largefiles were changed. This is used by bisect and backout.
890 891 def overridebailifchanged(orig, repo):
891 892 orig(repo)
892 893 repo.lfstatus = True
893 894 modified, added, removed, deleted = repo.status()[:4]
894 895 repo.lfstatus = False
895 896 if modified or added or removed or deleted:
896 897 raise util.Abort(_('outstanding uncommitted changes'))
897 898
898 899 # Fetch doesn't use cmdutil.bailifchanged so override it to add the check
899 900 def overridefetch(orig, ui, repo, *pats, **opts):
900 901 repo.lfstatus = True
901 902 modified, added, removed, deleted = repo.status()[:4]
902 903 repo.lfstatus = False
903 904 if modified or added or removed or deleted:
904 905 raise util.Abort(_('outstanding uncommitted changes'))
905 906 return orig(ui, repo, *pats, **opts)
906 907
907 908 def overrideforget(orig, ui, repo, *pats, **opts):
908 909 installnormalfilesmatchfn(repo[None].manifest())
909 910 result = orig(ui, repo, *pats, **opts)
910 911 restorematchfn()
911 912 m = scmutil.match(repo[None], pats, opts)
912 913
913 914 try:
914 915 repo.lfstatus = True
915 916 s = repo.status(match=m, clean=True)
916 917 finally:
917 918 repo.lfstatus = False
918 919 forget = sorted(s[0] + s[1] + s[3] + s[6])
919 920 forget = [f for f in forget if lfutil.standin(f) in repo[None].manifest()]
920 921
921 922 for f in forget:
922 923 if lfutil.standin(f) not in repo.dirstate and not \
923 924 os.path.isdir(m.rel(lfutil.standin(f))):
924 925 ui.warn(_('not removing %s: file is already untracked\n')
925 926 % m.rel(f))
926 927 result = 1
927 928
928 929 for f in forget:
929 930 if ui.verbose or not m.exact(f):
930 931 ui.status(_('removing %s\n') % m.rel(f))
931 932
932 933 # Need to lock because standin files are deleted then removed from the
933 934 # repository and we could race inbetween.
934 935 wlock = repo.wlock()
935 936 try:
936 937 lfdirstate = lfutil.openlfdirstate(ui, repo)
937 938 for f in forget:
938 939 if lfdirstate[f] == 'a':
939 940 lfdirstate.drop(f)
940 941 else:
941 942 lfdirstate.remove(f)
942 943 lfdirstate.write()
943 944 lfutil.reporemove(repo, [lfutil.standin(f) for f in forget],
944 945 unlink=True)
945 946 finally:
946 947 wlock.release()
947 948
948 949 return result
949 950
950 951 def getoutgoinglfiles(ui, repo, dest=None, **opts):
951 952 dest = ui.expandpath(dest or 'default-push', dest or 'default')
952 953 dest, branches = hg.parseurl(dest, opts.get('branch'))
953 954 revs, checkout = hg.addbranchrevs(repo, repo, branches, opts.get('rev'))
954 955 if revs:
955 956 revs = [repo.lookup(rev) for rev in scmutil.revrange(repo, revs)]
956 957
957 958 try:
958 959 remote = hg.peer(repo, opts, dest)
959 960 except error.RepoError:
960 961 return None
961 962 o = lfutil.findoutgoing(repo, remote, False)
962 963 if not o:
963 964 return None
964 965 o = repo.changelog.nodesbetween(o, revs)[0]
965 966 if opts.get('newest_first'):
966 967 o.reverse()
967 968
968 969 toupload = set()
969 970 for n in o:
970 971 parents = [p for p in repo.changelog.parents(n) if p != node.nullid]
971 972 ctx = repo[n]
972 973 files = set(ctx.files())
973 974 if len(parents) == 2:
974 975 mc = ctx.manifest()
975 976 mp1 = ctx.parents()[0].manifest()
976 977 mp2 = ctx.parents()[1].manifest()
977 978 for f in mp1:
978 979 if f not in mc:
979 980 files.add(f)
980 981 for f in mp2:
981 982 if f not in mc:
982 983 files.add(f)
983 984 for f in mc:
984 985 if mc[f] != mp1.get(f, None) or mc[f] != mp2.get(f, None):
985 986 files.add(f)
986 987 toupload = toupload.union(
987 988 set([f for f in files if lfutil.isstandin(f) and f in ctx]))
988 989 return toupload
989 990
990 991 def overrideoutgoing(orig, ui, repo, dest=None, **opts):
991 992 result = orig(ui, repo, dest, **opts)
992 993
993 994 if opts.pop('large', None):
994 995 toupload = getoutgoinglfiles(ui, repo, dest, **opts)
995 996 if toupload is None:
996 997 ui.status(_('largefiles: No remote repo\n'))
997 998 else:
998 999 ui.status(_('largefiles to upload:\n'))
999 1000 for file in toupload:
1000 1001 ui.status(lfutil.splitstandin(file) + '\n')
1001 1002 ui.status('\n')
1002 1003
1003 1004 return result
1004 1005
1005 1006 def overridesummary(orig, ui, repo, *pats, **opts):
1006 1007 try:
1007 1008 repo.lfstatus = True
1008 1009 orig(ui, repo, *pats, **opts)
1009 1010 finally:
1010 1011 repo.lfstatus = False
1011 1012
1012 1013 if opts.pop('large', None):
1013 1014 toupload = getoutgoinglfiles(ui, repo, None, **opts)
1014 1015 if toupload is None:
1015 1016 ui.status(_('largefiles: No remote repo\n'))
1016 1017 else:
1017 1018 ui.status(_('largefiles: %d to upload\n') % len(toupload))
1018 1019
1019 1020 def overrideaddremove(orig, ui, repo, *pats, **opts):
1020 1021 if not lfutil.islfilesrepo(repo):
1021 1022 return orig(ui, repo, *pats, **opts)
1022 1023 # Get the list of missing largefiles so we can remove them
1023 1024 lfdirstate = lfutil.openlfdirstate(ui, repo)
1024 1025 s = lfdirstate.status(match_.always(repo.root, repo.getcwd()), [], False,
1025 1026 False, False)
1026 1027 (unsure, modified, added, removed, missing, unknown, ignored, clean) = s
1027 1028
1028 1029 # Call into the normal remove code, but the removing of the standin, we want
1029 1030 # to have handled by original addremove. Monkey patching here makes sure
1030 1031 # we don't remove the standin in the largefiles code, preventing a very
1031 1032 # confused state later.
1032 1033 if missing:
1033 1034 m = [repo.wjoin(f) for f in missing]
1034 1035 repo._isaddremove = True
1035 1036 removelargefiles(ui, repo, *m, **opts)
1036 1037 repo._isaddremove = False
1037 1038 # Call into the normal add code, and any files that *should* be added as
1038 1039 # largefiles will be
1039 1040 addlargefiles(ui, repo, *pats, **opts)
1040 1041 # Now that we've handled largefiles, hand off to the original addremove
1041 1042 # function to take care of the rest. Make sure it doesn't do anything with
1042 1043 # largefiles by installing a matcher that will ignore them.
1043 1044 installnormalfilesmatchfn(repo[None].manifest())
1044 1045 result = orig(ui, repo, *pats, **opts)
1045 1046 restorematchfn()
1046 1047 return result
1047 1048
1048 1049 # Calling purge with --all will cause the largefiles to be deleted.
1049 1050 # Override repo.status to prevent this from happening.
1050 1051 def overridepurge(orig, ui, repo, *dirs, **opts):
1051 1052 oldstatus = repo.status
1052 1053 def overridestatus(node1='.', node2=None, match=None, ignored=False,
1053 1054 clean=False, unknown=False, listsubrepos=False):
1054 1055 r = oldstatus(node1, node2, match, ignored, clean, unknown,
1055 1056 listsubrepos)
1056 1057 lfdirstate = lfutil.openlfdirstate(ui, repo)
1057 1058 modified, added, removed, deleted, unknown, ignored, clean = r
1058 1059 unknown = [f for f in unknown if lfdirstate[f] == '?']
1059 1060 ignored = [f for f in ignored if lfdirstate[f] == '?']
1060 1061 return modified, added, removed, deleted, unknown, ignored, clean
1061 1062 repo.status = overridestatus
1062 1063 orig(ui, repo, *dirs, **opts)
1063 1064 repo.status = oldstatus
1064 1065
1065 1066 def overriderollback(orig, ui, repo, **opts):
1066 1067 result = orig(ui, repo, **opts)
1067 1068 merge.update(repo, node=None, branchmerge=False, force=True,
1068 1069 partial=lfutil.isstandin)
1069 1070 wlock = repo.wlock()
1070 1071 try:
1071 1072 lfdirstate = lfutil.openlfdirstate(ui, repo)
1072 1073 lfiles = lfutil.listlfiles(repo)
1073 1074 oldlfiles = lfutil.listlfiles(repo, repo[None].parents()[0].rev())
1074 1075 for file in lfiles:
1075 1076 if file in oldlfiles:
1076 1077 lfdirstate.normallookup(file)
1077 1078 else:
1078 1079 lfdirstate.add(file)
1079 1080 lfdirstate.write()
1080 1081 finally:
1081 1082 wlock.release()
1082 1083 return result
1083 1084
1084 1085 def overridetransplant(orig, ui, repo, *revs, **opts):
1085 1086 try:
1086 1087 oldstandins = lfutil.getstandinsstate(repo)
1087 1088 repo._istransplanting = True
1088 1089 result = orig(ui, repo, *revs, **opts)
1089 1090 newstandins = lfutil.getstandinsstate(repo)
1090 1091 filelist = lfutil.getlfilestoupdate(oldstandins, newstandins)
1091 1092 lfcommands.updatelfiles(repo.ui, repo, filelist=filelist,
1092 1093 printmessage=True)
1093 1094 finally:
1094 1095 repo._istransplanting = False
1095 1096 return result
1096 1097
1097 1098 def overridecat(orig, ui, repo, file1, *pats, **opts):
1098 1099 ctx = scmutil.revsingle(repo, opts.get('rev'))
1099 1100 if not lfutil.standin(file1) in ctx:
1100 1101 result = orig(ui, repo, file1, *pats, **opts)
1101 1102 return result
1102 1103 return lfcommands.catlfile(repo, file1, ctx.rev(), opts.get('output'))
@@ -1,1531 +1,1541 b''
1 1 $ USERCACHE="$TESTTMP/cache"; export USERCACHE
2 2 $ mkdir "${USERCACHE}"
3 3 $ cat >> $HGRCPATH <<EOF
4 4 > [extensions]
5 5 > largefiles=
6 6 > purge=
7 7 > rebase=
8 8 > transplant=
9 9 > [phases]
10 10 > publish=False
11 11 > [largefiles]
12 12 > minsize=2
13 13 > patterns=glob:**.dat
14 14 > usercache=${USERCACHE}
15 15 > [hooks]
16 16 > precommit=sh -c "echo \\"Invoking status precommit hook\\"; hg status"
17 17 > EOF
18 18
19 19 Create the repo with a couple of revisions of both large and normal
20 20 files, testing that status correctly shows largefiles and that summary output
21 21 is correct.
22 22
23 23 $ hg init a
24 24 $ cd a
25 25 $ mkdir sub
26 26 $ echo normal1 > normal1
27 27 $ echo normal2 > sub/normal2
28 28 $ echo large1 > large1
29 29 $ echo large2 > sub/large2
30 30 $ hg add normal1 sub/normal2
31 31 $ hg add --large large1 sub/large2
32 32 $ hg commit -m "add files"
33 33 Invoking status precommit hook
34 34 A large1
35 35 A normal1
36 36 A sub/large2
37 37 A sub/normal2
38 38 $ echo normal11 > normal1
39 39 $ echo normal22 > sub/normal2
40 40 $ echo large11 > large1
41 41 $ echo large22 > sub/large2
42 42 $ hg commit -m "edit files"
43 43 Invoking status precommit hook
44 44 M large1
45 45 M normal1
46 46 M sub/large2
47 47 M sub/normal2
48 48 $ hg sum --large
49 49 parent: 1:ce8896473775 tip
50 50 edit files
51 51 branch: default
52 52 commit: (clean)
53 53 update: (current)
54 54 largefiles: No remote repo
55 55
56 56 Commit preserved largefile contents.
57 57
58 58 $ cat normal1
59 59 normal11
60 60 $ cat large1
61 61 large11
62 62 $ cat sub/normal2
63 63 normal22
64 64 $ cat sub/large2
65 65 large22
66 66
67 67 Test status, subdir and unknown files
68 68
69 69 $ echo unknown > sub/unknown
70 70 $ hg st --all
71 71 ? sub/unknown
72 72 C large1
73 73 C normal1
74 74 C sub/large2
75 75 C sub/normal2
76 76 $ hg st --all sub
77 77 ? sub/unknown
78 78 C sub/large2
79 79 C sub/normal2
80 80 $ rm sub/unknown
81 81
82 82 Test exit codes for remove warning cases (modified and still exiting)
83 83
84 84 $ hg remove -A large1
85 85 not removing large1: file still exists (use forget to undo)
86 86 [1]
87 87 $ echo 'modified' > large1
88 88 $ hg remove large1
89 89 not removing large1: file is modified (use forget to undo)
90 90 [1]
91 91 $ hg up -Cq
92 92
93 93 Remove both largefiles and normal files.
94 94
95 95 $ hg remove normal1 large1
96 96 $ hg status large1
97 97 R large1
98 98 $ hg commit -m "remove files"
99 99 Invoking status precommit hook
100 100 R large1
101 101 R normal1
102 102 $ ls
103 103 sub
104 104 $ echo "testlargefile" > large1-test
105 105 $ hg add --large large1-test
106 106 $ hg st
107 107 A large1-test
108 108 $ hg rm large1-test
109 109 not removing large1-test: file has been marked for add (use forget to undo)
110 110 [1]
111 111 $ hg st
112 112 A large1-test
113 113 $ hg forget large1-test
114 114 $ hg st
115 115 ? large1-test
116 116 $ hg remove large1-test
117 117 not removing large1-test: file is untracked
118 118 [1]
119 119 $ hg forget large1-test
120 120 not removing large1-test: file is already untracked
121 121 [1]
122 122 $ rm large1-test
123 123
124 124 Copy both largefiles and normal files (testing that status output is correct).
125 125
126 126 $ hg cp sub/normal2 normal1
127 127 $ hg cp sub/large2 large1
128 128 $ hg commit -m "copy files"
129 129 Invoking status precommit hook
130 130 A large1
131 131 A normal1
132 132 $ cat normal1
133 133 normal22
134 134 $ cat large1
135 135 large22
136 136
137 137 Test moving largefiles and verify that normal files are also unaffected.
138 138
139 139 $ hg mv normal1 normal3
140 140 $ hg mv large1 large3
141 141 $ hg mv sub/normal2 sub/normal4
142 142 $ hg mv sub/large2 sub/large4
143 143 $ hg commit -m "move files"
144 144 Invoking status precommit hook
145 145 A large3
146 146 A normal3
147 147 A sub/large4
148 148 A sub/normal4
149 149 R large1
150 150 R normal1
151 151 R sub/large2
152 152 R sub/normal2
153 153 $ cat normal3
154 154 normal22
155 155 $ cat large3
156 156 large22
157 157 $ cat sub/normal4
158 158 normal22
159 159 $ cat sub/large4
160 160 large22
161 161
162 162 Test copies and moves from a directory other than root (issue3516)
163 163
164 164 $ cd ..
165 165 $ hg init lf_cpmv
166 166 $ cd lf_cpmv
167 167 $ mkdir dira
168 168 $ mkdir dira/dirb
169 169 $ touch dira/dirb/largefile
170 170 $ hg add --large dira/dirb/largefile
171 171 $ hg commit -m "added"
172 172 Invoking status precommit hook
173 173 A dira/dirb/largefile
174 174 $ cd dira
175 175 $ hg cp dirb/largefile foo/largefile
176 176 $ hg ci -m "deep copy"
177 177 Invoking status precommit hook
178 178 A dira/foo/largefile
179 179 $ find . | sort
180 180 .
181 181 ./dirb
182 182 ./dirb/largefile
183 183 ./foo
184 184 ./foo/largefile
185 185 $ hg mv foo/largefile baz/largefile
186 186 $ hg ci -m "moved"
187 187 Invoking status precommit hook
188 188 A dira/baz/largefile
189 189 R dira/foo/largefile
190 190 $ find . | sort
191 191 .
192 192 ./baz
193 193 ./baz/largefile
194 194 ./dirb
195 195 ./dirb/largefile
196 196 ./foo
197 197 $ cd ../../a
198 198
199 199 #if hgweb
200 200 Test display of largefiles in hgweb
201 201
202 202 $ hg serve -d -p $HGPORT --pid-file ../hg.pid
203 203 $ cat ../hg.pid >> $DAEMON_PIDS
204 204 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/?style=raw'
205 205 200 Script output follows
206 206
207 207
208 208 drwxr-xr-x sub
209 209 -rw-r--r-- 41 large3
210 210 -rw-r--r-- 9 normal3
211 211
212 212
213 213 $ "$TESTDIR/get-with-headers.py" 127.0.0.1:$HGPORT 'file/tip/sub/?style=raw'
214 214 200 Script output follows
215 215
216 216
217 217 -rw-r--r-- 41 large4
218 218 -rw-r--r-- 9 normal4
219 219
220 220
221 221 $ "$TESTDIR/killdaemons.py"
222 222 #endif
223 223
224 224 Test archiving the various revisions. These hit corner cases known with
225 225 archiving.
226 226
227 227 $ hg archive -r 0 ../archive0
228 228 $ hg archive -r 1 ../archive1
229 229 $ hg archive -r 2 ../archive2
230 230 $ hg archive -r 3 ../archive3
231 231 $ hg archive -r 4 ../archive4
232 232 $ cd ../archive0
233 233 $ cat normal1
234 234 normal1
235 235 $ cat large1
236 236 large1
237 237 $ cat sub/normal2
238 238 normal2
239 239 $ cat sub/large2
240 240 large2
241 241 $ cd ../archive1
242 242 $ cat normal1
243 243 normal11
244 244 $ cat large1
245 245 large11
246 246 $ cat sub/normal2
247 247 normal22
248 248 $ cat sub/large2
249 249 large22
250 250 $ cd ../archive2
251 251 $ ls
252 252 sub
253 253 $ cat sub/normal2
254 254 normal22
255 255 $ cat sub/large2
256 256 large22
257 257 $ cd ../archive3
258 258 $ cat normal1
259 259 normal22
260 260 $ cat large1
261 261 large22
262 262 $ cat sub/normal2
263 263 normal22
264 264 $ cat sub/large2
265 265 large22
266 266 $ cd ../archive4
267 267 $ cat normal3
268 268 normal22
269 269 $ cat large3
270 270 large22
271 271 $ cat sub/normal4
272 272 normal22
273 273 $ cat sub/large4
274 274 large22
275 275
276 276 Commit corner case: specify files to commit.
277 277
278 278 $ cd ../a
279 279 $ echo normal3 > normal3
280 280 $ echo large3 > large3
281 281 $ echo normal4 > sub/normal4
282 282 $ echo large4 > sub/large4
283 283 $ hg commit normal3 large3 sub/normal4 sub/large4 -m "edit files again"
284 284 Invoking status precommit hook
285 285 M large3
286 286 M normal3
287 287 M sub/large4
288 288 M sub/normal4
289 289 $ cat normal3
290 290 normal3
291 291 $ cat large3
292 292 large3
293 293 $ cat sub/normal4
294 294 normal4
295 295 $ cat sub/large4
296 296 large4
297 297
298 298 One more commit corner case: commit from a subdirectory.
299 299
300 300 $ cd ../a
301 301 $ echo normal33 > normal3
302 302 $ echo large33 > large3
303 303 $ echo normal44 > sub/normal4
304 304 $ echo large44 > sub/large4
305 305 $ cd sub
306 306 $ hg commit -m "edit files yet again"
307 307 Invoking status precommit hook
308 308 M large3
309 309 M normal3
310 310 M sub/large4
311 311 M sub/normal4
312 312 $ cat ../normal3
313 313 normal33
314 314 $ cat ../large3
315 315 large33
316 316 $ cat normal4
317 317 normal44
318 318 $ cat large4
319 319 large44
320 320
321 321 Committing standins is not allowed.
322 322
323 323 $ cd ..
324 324 $ echo large3 > large3
325 325 $ hg commit .hglf/large3 -m "try to commit standin"
326 326 abort: file ".hglf/large3" is a largefile standin
327 327 (commit the largefile itself instead)
328 328 [255]
329 329
330 330 Corner cases for adding largefiles.
331 331
332 332 $ echo large5 > large5
333 333 $ hg add --large large5
334 334 $ hg add --large large5
335 335 large5 already a largefile
336 336 $ mkdir sub2
337 337 $ echo large6 > sub2/large6
338 338 $ echo large7 > sub2/large7
339 339 $ hg add --large sub2
340 340 adding sub2/large6 as a largefile (glob)
341 341 adding sub2/large7 as a largefile (glob)
342 342 $ hg st
343 343 M large3
344 344 A large5
345 345 A sub2/large6
346 346 A sub2/large7
347 347
348 348 Test "hg status" with combination of 'file pattern' and 'directory
349 349 pattern' for largefiles:
350 350
351 351 $ hg status sub2/large6 sub2
352 352 A sub2/large6
353 353 A sub2/large7
354 354
355 355 Config settings (pattern **.dat, minsize 2 MB) are respected.
356 356
357 357 $ echo testdata > test.dat
358 358 $ dd bs=1k count=2k if=/dev/zero of=reallylarge > /dev/null 2> /dev/null
359 359 $ hg add
360 360 adding reallylarge as a largefile
361 361 adding test.dat as a largefile
362 362
363 363 Test that minsize and --lfsize handle float values;
364 364 also tests that --lfsize overrides largefiles.minsize.
365 365 (0.250 MB = 256 kB = 262144 B)
366 366
367 367 $ dd if=/dev/zero of=ratherlarge bs=1024 count=256 > /dev/null 2> /dev/null
368 368 $ dd if=/dev/zero of=medium bs=1024 count=128 > /dev/null 2> /dev/null
369 369 $ hg --config largefiles.minsize=.25 add
370 370 adding ratherlarge as a largefile
371 371 adding medium
372 372 $ hg forget medium
373 373 $ hg --config largefiles.minsize=.25 add --lfsize=.125
374 374 adding medium as a largefile
375 375 $ dd if=/dev/zero of=notlarge bs=1024 count=127 > /dev/null 2> /dev/null
376 376 $ hg --config largefiles.minsize=.25 add --lfsize=.125
377 377 adding notlarge
378 378 $ hg forget notlarge
379 379
380 380 Test forget on largefiles.
381 381
382 382 $ hg forget large3 large5 test.dat reallylarge ratherlarge medium
383 383 $ hg commit -m "add/edit more largefiles"
384 384 Invoking status precommit hook
385 385 A sub2/large6
386 386 A sub2/large7
387 387 R large3
388 388 ? large5
389 389 ? medium
390 390 ? notlarge
391 391 ? ratherlarge
392 392 ? reallylarge
393 393 ? test.dat
394 394 $ hg st
395 395 ? large3
396 396 ? large5
397 397 ? medium
398 398 ? notlarge
399 399 ? ratherlarge
400 400 ? reallylarge
401 401 ? test.dat
402 402
403 403 Purge with largefiles: verify that largefiles are still in the working
404 404 dir after a purge.
405 405
406 406 $ hg purge --all
407 407 $ cat sub/large4
408 408 large44
409 409 $ cat sub2/large6
410 410 large6
411 411 $ cat sub2/large7
412 412 large7
413 413
414 414 Test addremove: verify that files that should be added as largfiles are added as
415 415 such and that already-existing largfiles are not added as normal files by
416 416 accident.
417 417
418 418 $ rm normal3
419 419 $ rm sub/large4
420 420 $ echo "testing addremove with patterns" > testaddremove.dat
421 421 $ echo "normaladdremove" > normaladdremove
422 422 $ hg addremove
423 423 removing sub/large4
424 424 adding testaddremove.dat as a largefile
425 425 removing normal3
426 426 adding normaladdremove
427 427
428 428 Test addremove with -R
429 429
430 430 $ hg up -C
431 431 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
432 432 getting changed largefiles
433 433 1 largefiles updated, 0 removed
434 434 $ rm normal3
435 435 $ rm sub/large4
436 436 $ echo "testing addremove with patterns" > testaddremove.dat
437 437 $ echo "normaladdremove" > normaladdremove
438 438 $ cd ..
439 439 $ hg -R a addremove
440 440 removing sub/large4
441 441 adding a/testaddremove.dat as a largefile (glob)
442 442 removing normal3
443 443 adding normaladdremove
444 444 $ cd a
445 445
446 446 Test 3364
447 447 $ hg clone . ../addrm
448 448 updating to branch default
449 449 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
450 450 getting changed largefiles
451 451 3 largefiles updated, 0 removed
452 452 $ cd ../addrm
453 453 $ cat >> .hg/hgrc <<EOF
454 454 > [hooks]
455 455 > post-commit.stat=sh -c "echo \\"Invoking status postcommit hook\\"; hg status -A"
456 456 > EOF
457 457 $ touch foo
458 458 $ hg add --large foo
459 459 $ hg ci -m "add foo"
460 460 Invoking status precommit hook
461 461 A foo
462 462 Invoking status postcommit hook
463 463 C foo
464 464 C normal3
465 465 C sub/large4
466 466 C sub/normal4
467 467 C sub2/large6
468 468 C sub2/large7
469 469 $ rm foo
470 470 $ hg st
471 471 ! foo
472 472 hmm.. no precommit invoked, but there is a postcommit??
473 473 $ hg ci -m "will not checkin"
474 474 nothing changed
475 475 Invoking status postcommit hook
476 476 ! foo
477 477 C normal3
478 478 C sub/large4
479 479 C sub/normal4
480 480 C sub2/large6
481 481 C sub2/large7
482 482 [1]
483 483 $ hg addremove
484 484 removing foo
485 485 $ hg st
486 486 R foo
487 487 $ hg ci -m "used to say nothing changed"
488 488 Invoking status precommit hook
489 489 R foo
490 490 Invoking status postcommit hook
491 491 C normal3
492 492 C sub/large4
493 493 C sub/normal4
494 494 C sub2/large6
495 495 C sub2/large7
496 496 $ hg st
497 497
498 498 Test 3507 (both normal files and largefiles were a problem)
499 499
500 500 $ touch normal
501 501 $ touch large
502 502 $ hg add normal
503 503 $ hg add --large large
504 504 $ hg ci -m "added"
505 505 Invoking status precommit hook
506 506 A large
507 507 A normal
508 508 Invoking status postcommit hook
509 509 C large
510 510 C normal
511 511 C normal3
512 512 C sub/large4
513 513 C sub/normal4
514 514 C sub2/large6
515 515 C sub2/large7
516 516 $ hg remove normal
517 517 $ hg addremove --traceback
518 518 $ hg ci -m "addremoved normal"
519 519 Invoking status precommit hook
520 520 R normal
521 521 Invoking status postcommit hook
522 522 C large
523 523 C normal3
524 524 C sub/large4
525 525 C sub/normal4
526 526 C sub2/large6
527 527 C sub2/large7
528 528 $ hg up -C '.^'
529 529 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
530 530 getting changed largefiles
531 531 0 largefiles updated, 0 removed
532 532 $ hg remove large
533 533 $ hg addremove --traceback
534 534 $ hg ci -m "removed large"
535 535 Invoking status precommit hook
536 536 R large
537 537 created new head
538 538 Invoking status postcommit hook
539 539 C normal
540 540 C normal3
541 541 C sub/large4
542 542 C sub/normal4
543 543 C sub2/large6
544 544 C sub2/large7
545 545
546 546 Test that a standin can't be added as a large file
547 547
548 548 $ touch large
549 549 $ hg add --large large
550 550 $ hg ci -m "add"
551 551 Invoking status precommit hook
552 552 A large
553 553 Invoking status postcommit hook
554 554 C large
555 555 C normal
556 556 C normal3
557 557 C sub/large4
558 558 C sub/normal4
559 559 C sub2/large6
560 560 C sub2/large7
561 561 $ hg remove large
562 562 $ touch large
563 563 $ hg addremove --config largefiles.patterns=**large --traceback
564 564 adding large as a largefile
565 565
566 566 Test that outgoing --large works (with revsets too)
567 567 $ hg outgoing --rev '.^' --large
568 568 comparing with $TESTTMP/a (glob)
569 569 searching for changes
570 570 changeset: 8:c02fd3b77ec4
571 571 user: test
572 572 date: Thu Jan 01 00:00:00 1970 +0000
573 573 summary: add foo
574 574
575 575 changeset: 9:289dd08c9bbb
576 576 user: test
577 577 date: Thu Jan 01 00:00:00 1970 +0000
578 578 summary: used to say nothing changed
579 579
580 580 changeset: 10:34f23ac6ac12
581 581 user: test
582 582 date: Thu Jan 01 00:00:00 1970 +0000
583 583 summary: added
584 584
585 585 changeset: 12:710c1b2f523c
586 586 parent: 10:34f23ac6ac12
587 587 user: test
588 588 date: Thu Jan 01 00:00:00 1970 +0000
589 589 summary: removed large
590 590
591 591 searching for changes
592 592 largefiles to upload:
593 593 large
594 594 foo
595 595
596 596 $ cd ../a
597 597
598 598 Clone a largefiles repo.
599 599
600 600 $ hg clone . ../b
601 601 updating to branch default
602 602 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
603 603 getting changed largefiles
604 604 3 largefiles updated, 0 removed
605 605 $ cd ../b
606 606 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
607 607 7:daea875e9014 add/edit more largefiles
608 608 6:4355d653f84f edit files yet again
609 609 5:9d5af5072dbd edit files again
610 610 4:74c02385b94c move files
611 611 3:9e8fbc4bce62 copy files
612 612 2:51a0ae4d5864 remove files
613 613 1:ce8896473775 edit files
614 614 0:30d30fe6a5be add files
615 615 $ cat normal3
616 616 normal33
617 617 $ cat sub/normal4
618 618 normal44
619 619 $ cat sub/large4
620 620 large44
621 621 $ cat sub2/large6
622 622 large6
623 623 $ cat sub2/large7
624 624 large7
625 625 $ cd ..
626 626 $ hg clone a -r 3 c
627 627 adding changesets
628 628 adding manifests
629 629 adding file changes
630 630 added 4 changesets with 10 changes to 4 files
631 631 updating to branch default
632 632 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
633 633 getting changed largefiles
634 634 2 largefiles updated, 0 removed
635 635 $ cd c
636 636 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
637 637 3:9e8fbc4bce62 copy files
638 638 2:51a0ae4d5864 remove files
639 639 1:ce8896473775 edit files
640 640 0:30d30fe6a5be add files
641 641 $ cat normal1
642 642 normal22
643 643 $ cat large1
644 644 large22
645 645 $ cat sub/normal2
646 646 normal22
647 647 $ cat sub/large2
648 648 large22
649 649
650 650 Old revisions of a clone have correct largefiles content (this also
651 651 tests update).
652 652
653 653 $ hg update -r 1
654 654 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
655 655 getting changed largefiles
656 656 1 largefiles updated, 0 removed
657 657 $ cat large1
658 658 large11
659 659 $ cat sub/large2
660 660 large22
661 661 $ cd ..
662 662
663 663 Test cloning with --all-largefiles flag
664 664
665 665 $ rm "${USERCACHE}"/*
666 666 $ hg clone --all-largefiles a a-backup
667 667 updating to branch default
668 668 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
669 669 getting changed largefiles
670 670 3 largefiles updated, 0 removed
671 671 8 additional largefiles cached
672 672
673 673 $ rm "${USERCACHE}"/*
674 674 $ hg clone --all-largefiles -u 0 a a-clone0
675 675 updating to branch default
676 676 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
677 677 getting changed largefiles
678 678 2 largefiles updated, 0 removed
679 679 9 additional largefiles cached
680 680 $ hg -R a-clone0 sum
681 681 parent: 0:30d30fe6a5be
682 682 add files
683 683 branch: default
684 684 commit: (clean)
685 685 update: 7 new changesets (update)
686 686
687 687 $ rm "${USERCACHE}"/*
688 688 $ hg clone --all-largefiles -u 1 a a-clone1
689 689 updating to branch default
690 690 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
691 691 getting changed largefiles
692 692 2 largefiles updated, 0 removed
693 693 8 additional largefiles cached
694 694 $ hg -R a-clone1 sum
695 695 parent: 1:ce8896473775
696 696 edit files
697 697 branch: default
698 698 commit: (clean)
699 699 update: 6 new changesets (update)
700 700
701 701 $ rm "${USERCACHE}"/*
702 702 $ hg clone --all-largefiles -U a a-clone-u
703 703 11 additional largefiles cached
704 704 $ hg -R a-clone-u sum
705 705 parent: -1:000000000000 (no revision checked out)
706 706 branch: default
707 707 commit: (clean)
708 708 update: 8 new changesets (update)
709 709
710 $ mkdir xyz
711 $ cd xyz
712 $ hg clone ../a
713 destination directory: a
714 updating to branch default
715 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
716 getting changed largefiles
717 3 largefiles updated, 0 removed
718 $ cd ..
719
710 720 $ hg clone --all-largefiles a ssh://localhost/a
711 721 abort: --all-largefiles is incompatible with non-local destination ssh://localhost/a
712 722 [255]
713 723
714 724 Test pulling with --all-largefiles flag
715 725
716 726 $ rm -Rf a-backup
717 727 $ hg clone -r 1 a a-backup
718 728 adding changesets
719 729 adding manifests
720 730 adding file changes
721 731 added 2 changesets with 8 changes to 4 files
722 732 updating to branch default
723 733 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
724 734 getting changed largefiles
725 735 2 largefiles updated, 0 removed
726 736 $ rm "${USERCACHE}"/*
727 737 $ cd a-backup
728 738 $ hg pull --all-largefiles
729 739 pulling from $TESTTMP/a (glob)
730 740 searching for changes
731 741 adding changesets
732 742 adding manifests
733 743 adding file changes
734 744 added 6 changesets with 16 changes to 8 files
735 745 (run 'hg update' to get a working copy)
736 746 caching new largefiles
737 747 3 largefiles cached
738 748 3 additional largefiles cached
739 749 $ cd ..
740 750
741 751 Rebasing between two repositories does not revert largefiles to old
742 752 revisions (this was a very bad bug that took a lot of work to fix).
743 753
744 754 $ hg clone a d
745 755 updating to branch default
746 756 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
747 757 getting changed largefiles
748 758 3 largefiles updated, 0 removed
749 759 $ cd b
750 760 $ echo large4-modified > sub/large4
751 761 $ echo normal3-modified > normal3
752 762 $ hg commit -m "modify normal file and largefile in repo b"
753 763 Invoking status precommit hook
754 764 M normal3
755 765 M sub/large4
756 766 $ cd ../d
757 767 $ echo large6-modified > sub2/large6
758 768 $ echo normal4-modified > sub/normal4
759 769 $ hg commit -m "modify normal file largefile in repo d"
760 770 Invoking status precommit hook
761 771 M sub/normal4
762 772 M sub2/large6
763 773 $ cd ..
764 774 $ hg clone d e
765 775 updating to branch default
766 776 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
767 777 getting changed largefiles
768 778 3 largefiles updated, 0 removed
769 779 $ cd d
770 780 $ hg pull --rebase ../b
771 781 pulling from ../b
772 782 searching for changes
773 783 adding changesets
774 784 adding manifests
775 785 adding file changes
776 786 added 1 changesets with 2 changes to 2 files (+1 heads)
777 787 Invoking status precommit hook
778 788 M sub/normal4
779 789 M sub2/large6
780 790 saved backup bundle to $TESTTMP/d/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
781 791 nothing to rebase
782 792 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
783 793 9:598410d3eb9a modify normal file largefile in repo d
784 794 8:a381d2c8c80e modify normal file and largefile in repo b
785 795 7:daea875e9014 add/edit more largefiles
786 796 6:4355d653f84f edit files yet again
787 797 5:9d5af5072dbd edit files again
788 798 4:74c02385b94c move files
789 799 3:9e8fbc4bce62 copy files
790 800 2:51a0ae4d5864 remove files
791 801 1:ce8896473775 edit files
792 802 0:30d30fe6a5be add files
793 803 $ cat normal3
794 804 normal3-modified
795 805 $ cat sub/normal4
796 806 normal4-modified
797 807 $ cat sub/large4
798 808 large4-modified
799 809 $ cat sub2/large6
800 810 large6-modified
801 811 $ cat sub2/large7
802 812 large7
803 813 $ cd ../e
804 814 $ hg pull ../b
805 815 pulling from ../b
806 816 searching for changes
807 817 adding changesets
808 818 adding manifests
809 819 adding file changes
810 820 added 1 changesets with 2 changes to 2 files (+1 heads)
811 821 (run 'hg heads' to see heads, 'hg merge' to merge)
812 822 caching new largefiles
813 823 0 largefiles cached
814 824 $ hg rebase
815 825 Invoking status precommit hook
816 826 M sub/normal4
817 827 M sub2/large6
818 828 saved backup bundle to $TESTTMP/e/.hg/strip-backup/f574fb32bb45-backup.hg (glob)
819 829 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
820 830 9:598410d3eb9a modify normal file largefile in repo d
821 831 8:a381d2c8c80e modify normal file and largefile in repo b
822 832 7:daea875e9014 add/edit more largefiles
823 833 6:4355d653f84f edit files yet again
824 834 5:9d5af5072dbd edit files again
825 835 4:74c02385b94c move files
826 836 3:9e8fbc4bce62 copy files
827 837 2:51a0ae4d5864 remove files
828 838 1:ce8896473775 edit files
829 839 0:30d30fe6a5be add files
830 840 $ cat normal3
831 841 normal3-modified
832 842 $ cat sub/normal4
833 843 normal4-modified
834 844 $ cat sub/large4
835 845 large4-modified
836 846 $ cat sub2/large6
837 847 large6-modified
838 848 $ cat sub2/large7
839 849 large7
840 850
841 851 Rollback on largefiles.
842 852
843 853 $ echo large4-modified-again > sub/large4
844 854 $ hg commit -m "Modify large4 again"
845 855 Invoking status precommit hook
846 856 M sub/large4
847 857 $ hg rollback
848 858 repository tip rolled back to revision 9 (undo commit)
849 859 working directory now based on revision 9
850 860 $ hg st
851 861 M sub/large4
852 862 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
853 863 9:598410d3eb9a modify normal file largefile in repo d
854 864 8:a381d2c8c80e modify normal file and largefile in repo b
855 865 7:daea875e9014 add/edit more largefiles
856 866 6:4355d653f84f edit files yet again
857 867 5:9d5af5072dbd edit files again
858 868 4:74c02385b94c move files
859 869 3:9e8fbc4bce62 copy files
860 870 2:51a0ae4d5864 remove files
861 871 1:ce8896473775 edit files
862 872 0:30d30fe6a5be add files
863 873 $ cat sub/large4
864 874 large4-modified-again
865 875
866 876 "update --check" refuses to update with uncommitted changes.
867 877 $ hg update --check 8
868 878 abort: uncommitted local changes
869 879 [255]
870 880
871 881 "update --clean" leaves correct largefiles in working copy.
872 882
873 883 $ hg update --clean
874 884 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
875 885 getting changed largefiles
876 886 1 largefiles updated, 0 removed
877 887 $ cat normal3
878 888 normal3-modified
879 889 $ cat sub/normal4
880 890 normal4-modified
881 891 $ cat sub/large4
882 892 large4-modified
883 893 $ cat sub2/large6
884 894 large6-modified
885 895 $ cat sub2/large7
886 896 large7
887 897
888 898 Now "update check" is happy.
889 899 $ hg update --check 8
890 900 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
891 901 getting changed largefiles
892 902 1 largefiles updated, 0 removed
893 903 $ hg update --check
894 904 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
895 905 getting changed largefiles
896 906 1 largefiles updated, 0 removed
897 907
898 908 Test removing empty largefiles directories on update
899 909 $ test -d sub2 && echo "sub2 exists"
900 910 sub2 exists
901 911 $ hg update -q null
902 912 $ test -d sub2 && echo "error: sub2 should not exist anymore"
903 913 [1]
904 914 $ hg update -q
905 915
906 916 Test hg remove removes empty largefiles directories
907 917 $ test -d sub2 && echo "sub2 exists"
908 918 sub2 exists
909 919 $ hg remove sub2/*
910 920 $ test -d sub2 && echo "error: sub2 should not exist anymore"
911 921 [1]
912 922 $ hg revert sub2/large6 sub2/large7
913 923
914 924 "revert" works on largefiles (and normal files too).
915 925 $ echo hack3 >> normal3
916 926 $ echo hack4 >> sub/normal4
917 927 $ echo hack4 >> sub/large4
918 928 $ rm sub2/large6
919 929 $ hg revert sub2/large6
920 930 $ hg rm sub2/large6
921 931 $ echo new >> sub2/large8
922 932 $ hg add --large sub2/large8
923 933 # XXX we don't really want to report that we're reverting the standin;
924 934 # that's just an implementation detail. But I don't see an obvious fix. ;-(
925 935 $ hg revert sub
926 936 reverting .hglf/sub/large4 (glob)
927 937 reverting sub/normal4 (glob)
928 938 $ hg status
929 939 M normal3
930 940 A sub2/large8
931 941 R sub2/large6
932 942 ? sub/large4.orig
933 943 ? sub/normal4.orig
934 944 $ cat sub/normal4
935 945 normal4-modified
936 946 $ cat sub/large4
937 947 large4-modified
938 948 $ hg revert -a --no-backup
939 949 undeleting .hglf/sub2/large6 (glob)
940 950 forgetting .hglf/sub2/large8 (glob)
941 951 reverting normal3
942 952 $ hg status
943 953 ? sub/large4.orig
944 954 ? sub/normal4.orig
945 955 ? sub2/large8
946 956 $ cat normal3
947 957 normal3-modified
948 958 $ cat sub2/large6
949 959 large6-modified
950 960 $ rm sub/*.orig sub2/large8
951 961
952 962 revert some files to an older revision
953 963 $ hg revert --no-backup -r 8 sub2
954 964 reverting .hglf/sub2/large6 (glob)
955 965 $ cat sub2/large6
956 966 large6
957 967 $ hg revert --no-backup -C -r '.^' sub2
958 968 reverting .hglf/sub2/large6 (glob)
959 969 $ hg revert --no-backup sub2
960 970 reverting .hglf/sub2/large6 (glob)
961 971 $ hg status
962 972
963 973 "verify --large" actually verifies largefiles
964 974
965 975 $ hg verify --large
966 976 checking changesets
967 977 checking manifests
968 978 crosschecking files in changesets and manifests
969 979 checking files
970 980 10 files, 10 changesets, 28 total revisions
971 981 searching 1 changesets for largefiles
972 982 verified existence of 3 revisions of 3 largefiles
973 983
974 984 Merging does not revert to old versions of largefiles and also check
975 985 that merging after having pulled from a non-default remote works
976 986 correctly.
977 987
978 988 $ cd ..
979 989 $ hg clone -r 7 e temp
980 990 adding changesets
981 991 adding manifests
982 992 adding file changes
983 993 added 8 changesets with 24 changes to 10 files
984 994 updating to branch default
985 995 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
986 996 getting changed largefiles
987 997 3 largefiles updated, 0 removed
988 998 $ hg clone temp f
989 999 updating to branch default
990 1000 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
991 1001 getting changed largefiles
992 1002 3 largefiles updated, 0 removed
993 1003 # Delete the largefiles in the largefiles system cache so that we have an
994 1004 # opportunity to test that caching after a pull works.
995 1005 $ rm "${USERCACHE}"/*
996 1006 $ cd f
997 1007 $ echo "large4-merge-test" > sub/large4
998 1008 $ hg commit -m "Modify large4 to test merge"
999 1009 Invoking status precommit hook
1000 1010 M sub/large4
1001 1011 $ hg pull ../e
1002 1012 pulling from ../e
1003 1013 searching for changes
1004 1014 adding changesets
1005 1015 adding manifests
1006 1016 adding file changes
1007 1017 added 2 changesets with 4 changes to 4 files (+1 heads)
1008 1018 (run 'hg heads' to see heads, 'hg merge' to merge)
1009 1019 caching new largefiles
1010 1020 2 largefiles cached
1011 1021 $ hg merge
1012 1022 merging sub/large4
1013 1023 largefile sub/large4 has a merge conflict
1014 1024 keep (l)ocal or take (o)ther? l
1015 1025 3 files updated, 1 files merged, 0 files removed, 0 files unresolved
1016 1026 (branch merge, don't forget to commit)
1017 1027 getting changed largefiles
1018 1028 1 largefiles updated, 0 removed
1019 1029 $ hg commit -m "Merge repos e and f"
1020 1030 Invoking status precommit hook
1021 1031 M normal3
1022 1032 M sub/normal4
1023 1033 M sub2/large6
1024 1034 $ cat normal3
1025 1035 normal3-modified
1026 1036 $ cat sub/normal4
1027 1037 normal4-modified
1028 1038 $ cat sub/large4
1029 1039 large4-merge-test
1030 1040 $ cat sub2/large6
1031 1041 large6-modified
1032 1042 $ cat sub2/large7
1033 1043 large7
1034 1044
1035 1045 Test status after merging with a branch that introduces a new largefile:
1036 1046
1037 1047 $ echo large > large
1038 1048 $ hg add --large large
1039 1049 $ hg commit -m 'add largefile'
1040 1050 Invoking status precommit hook
1041 1051 A large
1042 1052 $ hg update -q ".^"
1043 1053 $ echo change >> normal3
1044 1054 $ hg commit -m 'some change'
1045 1055 Invoking status precommit hook
1046 1056 M normal3
1047 1057 created new head
1048 1058 $ hg merge
1049 1059 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1050 1060 (branch merge, don't forget to commit)
1051 1061 getting changed largefiles
1052 1062 1 largefiles updated, 0 removed
1053 1063 $ hg status
1054 1064 M large
1055 1065
1056 1066 Test that a normal file and a largefile with the same name and path cannot
1057 1067 coexist.
1058 1068
1059 1069 $ rm sub2/large7
1060 1070 $ echo "largeasnormal" > sub2/large7
1061 1071 $ hg add sub2/large7
1062 1072 sub2/large7 already a largefile
1063 1073
1064 1074 Test that transplanting a largefile change works correctly.
1065 1075
1066 1076 $ cd ..
1067 1077 $ hg clone -r 8 d g
1068 1078 adding changesets
1069 1079 adding manifests
1070 1080 adding file changes
1071 1081 added 9 changesets with 26 changes to 10 files
1072 1082 updating to branch default
1073 1083 5 files updated, 0 files merged, 0 files removed, 0 files unresolved
1074 1084 getting changed largefiles
1075 1085 3 largefiles updated, 0 removed
1076 1086 $ cd g
1077 1087 $ hg transplant -s ../d 598410d3eb9a
1078 1088 searching for changes
1079 1089 searching for changes
1080 1090 adding changesets
1081 1091 adding manifests
1082 1092 adding file changes
1083 1093 added 1 changesets with 2 changes to 2 files
1084 1094 getting changed largefiles
1085 1095 1 largefiles updated, 0 removed
1086 1096 $ hg log --template '{rev}:{node|short} {desc|firstline}\n'
1087 1097 9:598410d3eb9a modify normal file largefile in repo d
1088 1098 8:a381d2c8c80e modify normal file and largefile in repo b
1089 1099 7:daea875e9014 add/edit more largefiles
1090 1100 6:4355d653f84f edit files yet again
1091 1101 5:9d5af5072dbd edit files again
1092 1102 4:74c02385b94c move files
1093 1103 3:9e8fbc4bce62 copy files
1094 1104 2:51a0ae4d5864 remove files
1095 1105 1:ce8896473775 edit files
1096 1106 0:30d30fe6a5be add files
1097 1107 $ cat normal3
1098 1108 normal3-modified
1099 1109 $ cat sub/normal4
1100 1110 normal4-modified
1101 1111 $ cat sub/large4
1102 1112 large4-modified
1103 1113 $ cat sub2/large6
1104 1114 large6-modified
1105 1115 $ cat sub2/large7
1106 1116 large7
1107 1117
1108 1118 Cat a largefile
1109 1119 $ hg cat normal3
1110 1120 normal3-modified
1111 1121 $ hg cat sub/large4
1112 1122 large4-modified
1113 1123 $ rm "${USERCACHE}"/*
1114 1124 $ hg cat -r a381d2c8c80e -o cat.out sub/large4
1115 1125 $ cat cat.out
1116 1126 large4-modified
1117 1127 $ rm cat.out
1118 1128 $ hg cat -r a381d2c8c80e normal3
1119 1129 normal3-modified
1120 1130 $ hg cat -r '.^' normal3
1121 1131 normal3-modified
1122 1132 $ hg cat -r '.^' sub/large4
1123 1133 large4-modified
1124 1134
1125 1135 Test that renaming a largefile results in correct output for status
1126 1136
1127 1137 $ hg rename sub/large4 large4-renamed
1128 1138 $ hg commit -m "test rename output"
1129 1139 Invoking status precommit hook
1130 1140 A large4-renamed
1131 1141 R sub/large4
1132 1142 $ cat large4-renamed
1133 1143 large4-modified
1134 1144 $ cd sub2
1135 1145 $ hg rename large6 large6-renamed
1136 1146 $ hg st
1137 1147 A sub2/large6-renamed
1138 1148 R sub2/large6
1139 1149 $ cd ..
1140 1150
1141 1151 Test --normal flag
1142 1152
1143 1153 $ dd if=/dev/zero bs=2k count=11k > new-largefile 2> /dev/null
1144 1154 $ hg add --normal --large new-largefile
1145 1155 abort: --normal cannot be used with --large
1146 1156 [255]
1147 1157 $ hg add --normal new-largefile
1148 1158 new-largefile: up to 69 MB of RAM may be required to manage this file
1149 1159 (use 'hg revert new-largefile' to cancel the pending addition)
1150 1160 $ cd ..
1151 1161
1152 1162 #if serve
1153 1163 vanilla clients not locked out from largefiles servers on vanilla repos
1154 1164 $ mkdir r1
1155 1165 $ cd r1
1156 1166 $ hg init
1157 1167 $ echo c1 > f1
1158 1168 $ hg add f1
1159 1169 $ hg commit -m "m1"
1160 1170 Invoking status precommit hook
1161 1171 A f1
1162 1172 $ cd ..
1163 1173 $ hg serve -R r1 -d -p $HGPORT --pid-file hg.pid
1164 1174 $ cat hg.pid >> $DAEMON_PIDS
1165 1175 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT r2
1166 1176 requesting all changes
1167 1177 adding changesets
1168 1178 adding manifests
1169 1179 adding file changes
1170 1180 added 1 changesets with 1 changes to 1 files
1171 1181 updating to branch default
1172 1182 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1173 1183
1174 1184 largefiles clients still work with vanilla servers
1175 1185 $ hg --config extensions.largefiles=! serve -R r1 -d -p $HGPORT1 --pid-file hg.pid
1176 1186 $ cat hg.pid >> $DAEMON_PIDS
1177 1187 $ hg clone http://localhost:$HGPORT1 r3
1178 1188 requesting all changes
1179 1189 adding changesets
1180 1190 adding manifests
1181 1191 adding file changes
1182 1192 added 1 changesets with 1 changes to 1 files
1183 1193 updating to branch default
1184 1194 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1185 1195 #endif
1186 1196
1187 1197
1188 1198 vanilla clients locked out from largefiles http repos
1189 1199 $ mkdir r4
1190 1200 $ cd r4
1191 1201 $ hg init
1192 1202 $ echo c1 > f1
1193 1203 $ hg add --large f1
1194 1204 $ hg commit -m "m1"
1195 1205 Invoking status precommit hook
1196 1206 A f1
1197 1207 $ cd ..
1198 1208
1199 1209 largefiles can be pushed locally (issue3583)
1200 1210 $ hg init dest
1201 1211 $ cd r4
1202 1212 $ hg outgoing ../dest
1203 1213 comparing with ../dest
1204 1214 searching for changes
1205 1215 changeset: 0:639881c12b4c
1206 1216 tag: tip
1207 1217 user: test
1208 1218 date: Thu Jan 01 00:00:00 1970 +0000
1209 1219 summary: m1
1210 1220
1211 1221 $ hg push ../dest
1212 1222 pushing to ../dest
1213 1223 searching for changes
1214 1224 searching for changes
1215 1225 adding changesets
1216 1226 adding manifests
1217 1227 adding file changes
1218 1228 added 1 changesets with 1 changes to 1 files
1219 1229
1220 1230 exit code with nothing outgoing (issue3611)
1221 1231 $ hg outgoing ../dest
1222 1232 comparing with ../dest
1223 1233 searching for changes
1224 1234 no changes found
1225 1235 [1]
1226 1236 $ cd ..
1227 1237
1228 1238 #if serve
1229 1239 $ hg serve -R r4 -d -p $HGPORT2 --pid-file hg.pid
1230 1240 $ cat hg.pid >> $DAEMON_PIDS
1231 1241 $ hg --config extensions.largefiles=! clone http://localhost:$HGPORT2 r5
1232 1242 abort: remote error:
1233 1243
1234 1244 This repository uses the largefiles extension.
1235 1245
1236 1246 Please enable it in your Mercurial config file.
1237 1247 [255]
1238 1248
1239 1249 used all HGPORTs, kill all daemons
1240 1250 $ "$TESTDIR/killdaemons.py"
1241 1251 #endif
1242 1252
1243 1253 vanilla clients locked out from largefiles ssh repos
1244 1254 $ hg --config extensions.largefiles=! clone -e "python \"$TESTDIR/dummyssh\"" ssh://user@dummy/r4 r5
1245 1255 abort: remote error:
1246 1256
1247 1257 This repository uses the largefiles extension.
1248 1258
1249 1259 Please enable it in your Mercurial config file.
1250 1260 [255]
1251 1261
1252 1262 #if serve
1253 1263
1254 1264 largefiles clients refuse to push largefiles repos to vanilla servers
1255 1265 $ mkdir r6
1256 1266 $ cd r6
1257 1267 $ hg init
1258 1268 $ echo c1 > f1
1259 1269 $ hg add f1
1260 1270 $ hg commit -m "m1"
1261 1271 Invoking status precommit hook
1262 1272 A f1
1263 1273 $ cat >> .hg/hgrc <<!
1264 1274 > [web]
1265 1275 > push_ssl = false
1266 1276 > allow_push = *
1267 1277 > !
1268 1278 $ cd ..
1269 1279 $ hg clone r6 r7
1270 1280 updating to branch default
1271 1281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1272 1282 $ cd r7
1273 1283 $ echo c2 > f2
1274 1284 $ hg add --large f2
1275 1285 $ hg commit -m "m2"
1276 1286 Invoking status precommit hook
1277 1287 A f2
1278 1288 $ hg --config extensions.largefiles=! -R ../r6 serve -d -p $HGPORT --pid-file ../hg.pid
1279 1289 $ cat ../hg.pid >> $DAEMON_PIDS
1280 1290 $ hg push http://localhost:$HGPORT
1281 1291 pushing to http://localhost:$HGPORT/
1282 1292 searching for changes
1283 1293 abort: http://localhost:$HGPORT/ does not appear to be a largefile store
1284 1294 [255]
1285 1295 $ cd ..
1286 1296
1287 1297 putlfile errors are shown (issue3123)
1288 1298 Corrupt the cached largefile in r7 and in the usercache (required for testing on vfat)
1289 1299 $ echo corruption > "$TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8"
1290 1300 $ echo corruption > "$USERCACHE/4cdac4d8b084d0b599525cf732437fb337d422a8"
1291 1301 $ hg init empty
1292 1302 $ hg serve -R empty -d -p $HGPORT1 --pid-file hg.pid \
1293 1303 > --config 'web.allow_push=*' --config web.push_ssl=False
1294 1304 $ cat hg.pid >> $DAEMON_PIDS
1295 1305 $ hg push -R r7 http://localhost:$HGPORT1
1296 1306 pushing to http://localhost:$HGPORT1/
1297 1307 searching for changes
1298 1308 remote: largefiles: failed to put 4cdac4d8b084d0b599525cf732437fb337d422a8 into store: largefile contents do not match hash
1299 1309 abort: remotestore: could not put $TESTTMP/r7/.hg/largefiles/4cdac4d8b084d0b599525cf732437fb337d422a8 to remote store http://localhost:$HGPORT1/ (glob)
1300 1310 [255]
1301 1311 $ rm -rf empty
1302 1312
1303 1313 Push a largefiles repository to a served empty repository
1304 1314 $ hg init r8
1305 1315 $ echo c3 > r8/f1
1306 1316 $ hg add --large r8/f1 -R r8
1307 1317 $ hg commit -m "m1" -R r8
1308 1318 Invoking status precommit hook
1309 1319 A f1
1310 1320 $ hg init empty
1311 1321 $ hg serve -R empty -d -p $HGPORT2 --pid-file hg.pid \
1312 1322 > --config 'web.allow_push=*' --config web.push_ssl=False
1313 1323 $ cat hg.pid >> $DAEMON_PIDS
1314 1324 $ rm "${USERCACHE}"/*
1315 1325 $ hg push -R r8 http://localhost:$HGPORT2
1316 1326 pushing to http://localhost:$HGPORT2/
1317 1327 searching for changes
1318 1328 searching for changes
1319 1329 remote: adding changesets
1320 1330 remote: adding manifests
1321 1331 remote: adding file changes
1322 1332 remote: added 1 changesets with 1 changes to 1 files
1323 1333 $ rm -rf empty
1324 1334
1325 1335 used all HGPORTs, kill all daemons
1326 1336 $ "$TESTDIR/killdaemons.py"
1327 1337
1328 1338 #endif
1329 1339
1330 1340
1331 1341 #if unix-permissions
1332 1342
1333 1343 Clone a local repository owned by another user
1334 1344 We have to simulate that here by setting $HOME and removing write permissions
1335 1345 $ ORIGHOME="$HOME"
1336 1346 $ mkdir alice
1337 1347 $ HOME="`pwd`/alice"
1338 1348 $ cd alice
1339 1349 $ hg init pubrepo
1340 1350 $ cd pubrepo
1341 1351 $ dd if=/dev/zero bs=1k count=11k > a-large-file 2> /dev/null
1342 1352 $ hg add --large a-large-file
1343 1353 $ hg commit -m "Add a large file"
1344 1354 Invoking status precommit hook
1345 1355 A a-large-file
1346 1356 $ cd ..
1347 1357 $ chmod -R a-w pubrepo
1348 1358 $ cd ..
1349 1359 $ mkdir bob
1350 1360 $ HOME="`pwd`/bob"
1351 1361 $ cd bob
1352 1362 $ hg clone --pull ../alice/pubrepo pubrepo
1353 1363 requesting all changes
1354 1364 adding changesets
1355 1365 adding manifests
1356 1366 adding file changes
1357 1367 added 1 changesets with 1 changes to 1 files
1358 1368 updating to branch default
1359 1369 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1360 1370 getting changed largefiles
1361 1371 1 largefiles updated, 0 removed
1362 1372 $ cd ..
1363 1373 $ chmod -R u+w alice/pubrepo
1364 1374 $ HOME="$ORIGHOME"
1365 1375
1366 1376 #endif
1367 1377
1368 1378 #if symlink
1369 1379
1370 1380 Symlink to a large largefile should behave the same as a symlink to a normal file
1371 1381 $ hg init largesymlink
1372 1382 $ cd largesymlink
1373 1383 $ dd if=/dev/zero bs=1k count=10k of=largefile 2>/dev/null
1374 1384 $ hg add --large largefile
1375 1385 $ hg commit -m "commit a large file"
1376 1386 Invoking status precommit hook
1377 1387 A largefile
1378 1388 $ ln -s largefile largelink
1379 1389 $ hg add largelink
1380 1390 $ hg commit -m "commit a large symlink"
1381 1391 Invoking status precommit hook
1382 1392 A largelink
1383 1393 $ rm -f largelink
1384 1394 $ hg up >/dev/null
1385 1395 $ test -f largelink
1386 1396 [1]
1387 1397 $ test -L largelink
1388 1398 [1]
1389 1399 $ rm -f largelink # make next part of the test independent of the previous
1390 1400 $ hg up -C >/dev/null
1391 1401 $ test -f largelink
1392 1402 $ test -L largelink
1393 1403 $ cd ..
1394 1404
1395 1405 #endif
1396 1406
1397 1407 test for pattern matching on 'hg status':
1398 1408 to boost performance, largefiles checks whether specified patterns are
1399 1409 related to largefiles in working directory (NOT to STANDIN) or not.
1400 1410
1401 1411 $ hg init statusmatch
1402 1412 $ cd statusmatch
1403 1413
1404 1414 $ mkdir -p a/b/c/d
1405 1415 $ echo normal > a/b/c/d/e.normal.txt
1406 1416 $ hg add a/b/c/d/e.normal.txt
1407 1417 $ echo large > a/b/c/d/e.large.txt
1408 1418 $ hg add --large a/b/c/d/e.large.txt
1409 1419 $ mkdir -p a/b/c/x
1410 1420 $ echo normal > a/b/c/x/y.normal.txt
1411 1421 $ hg add a/b/c/x/y.normal.txt
1412 1422 $ hg commit -m 'add files'
1413 1423 Invoking status precommit hook
1414 1424 A a/b/c/d/e.large.txt
1415 1425 A a/b/c/d/e.normal.txt
1416 1426 A a/b/c/x/y.normal.txt
1417 1427
1418 1428 (1) no pattern: no performance boost
1419 1429 $ hg status -A
1420 1430 C a/b/c/d/e.large.txt
1421 1431 C a/b/c/d/e.normal.txt
1422 1432 C a/b/c/x/y.normal.txt
1423 1433
1424 1434 (2) pattern not related to largefiles: performance boost
1425 1435 $ hg status -A a/b/c/x
1426 1436 C a/b/c/x/y.normal.txt
1427 1437
1428 1438 (3) pattern related to largefiles: no performance boost
1429 1439 $ hg status -A a/b/c/d
1430 1440 C a/b/c/d/e.large.txt
1431 1441 C a/b/c/d/e.normal.txt
1432 1442
1433 1443 (4) pattern related to STANDIN (not to largefiles): performance boost
1434 1444 $ hg status -A .hglf/a
1435 1445 C .hglf/a/b/c/d/e.large.txt
1436 1446
1437 1447 (5) mixed case: no performance boost
1438 1448 $ hg status -A a/b/c/x a/b/c/d
1439 1449 C a/b/c/d/e.large.txt
1440 1450 C a/b/c/d/e.normal.txt
1441 1451 C a/b/c/x/y.normal.txt
1442 1452
1443 1453 verify that largefiles doesn't break filesets
1444 1454
1445 1455 $ hg log --rev . --exclude "set:binary()"
1446 1456 changeset: 0:41bd42f10efa
1447 1457 tag: tip
1448 1458 user: test
1449 1459 date: Thu Jan 01 00:00:00 1970 +0000
1450 1460 summary: add files
1451 1461
1452 1462 verify that large files in subrepos handled properly
1453 1463 $ hg init subrepo
1454 1464 $ echo "subrepo = subrepo" > .hgsub
1455 1465 $ hg add .hgsub
1456 1466 $ hg ci -m "add subrepo"
1457 1467 Invoking status precommit hook
1458 1468 A .hgsub
1459 1469 ? .hgsubstate
1460 1470 $ echo "rev 1" > subrepo/large.txt
1461 1471 $ hg -R subrepo add --large subrepo/large.txt
1462 1472 $ hg sum
1463 1473 parent: 1:8ee150ea2e9c tip
1464 1474 add subrepo
1465 1475 branch: default
1466 1476 commit: 1 subrepos
1467 1477 update: (current)
1468 1478 $ hg st
1469 1479 $ hg st -S
1470 1480 A subrepo/large.txt
1471 1481 $ hg ci -S -m "commit top repo"
1472 1482 committing subrepository subrepo
1473 1483 Invoking status precommit hook
1474 1484 A large.txt
1475 1485 Invoking status precommit hook
1476 1486 M .hgsubstate
1477 1487 # No differences
1478 1488 $ hg st -S
1479 1489 $ hg sum
1480 1490 parent: 2:ce4cd0c527a6 tip
1481 1491 commit top repo
1482 1492 branch: default
1483 1493 commit: (clean)
1484 1494 update: (current)
1485 1495 $ echo "rev 2" > subrepo/large.txt
1486 1496 $ hg st -S
1487 1497 M subrepo/large.txt
1488 1498 $ hg sum
1489 1499 parent: 2:ce4cd0c527a6 tip
1490 1500 commit top repo
1491 1501 branch: default
1492 1502 commit: 1 subrepos
1493 1503 update: (current)
1494 1504 $ hg ci -m "this commit should fail without -S"
1495 1505 abort: uncommitted changes in subrepo subrepo
1496 1506 (use --subrepos for recursive commit)
1497 1507 [255]
1498 1508
1499 1509 Add a normal file to the subrepo, then test archiving
1500 1510
1501 1511 $ echo 'normal file' > subrepo/normal.txt
1502 1512 $ hg -R subrepo add subrepo/normal.txt
1503 1513
1504 1514 Lock in subrepo, otherwise the change isn't archived
1505 1515
1506 1516 $ hg ci -S -m "add normal file to top level"
1507 1517 committing subrepository subrepo
1508 1518 Invoking status precommit hook
1509 1519 M large.txt
1510 1520 A normal.txt
1511 1521 Invoking status precommit hook
1512 1522 M .hgsubstate
1513 1523 $ hg archive -S lf_subrepo_archive
1514 1524 $ find lf_subrepo_archive | sort
1515 1525 lf_subrepo_archive
1516 1526 lf_subrepo_archive/.hg_archival.txt
1517 1527 lf_subrepo_archive/.hgsub
1518 1528 lf_subrepo_archive/.hgsubstate
1519 1529 lf_subrepo_archive/a
1520 1530 lf_subrepo_archive/a/b
1521 1531 lf_subrepo_archive/a/b/c
1522 1532 lf_subrepo_archive/a/b/c/d
1523 1533 lf_subrepo_archive/a/b/c/d/e.large.txt
1524 1534 lf_subrepo_archive/a/b/c/d/e.normal.txt
1525 1535 lf_subrepo_archive/a/b/c/x
1526 1536 lf_subrepo_archive/a/b/c/x/y.normal.txt
1527 1537 lf_subrepo_archive/subrepo
1528 1538 lf_subrepo_archive/subrepo/large.txt
1529 1539 lf_subrepo_archive/subrepo/normal.txt
1530 1540
1531 1541 $ cd ..
General Comments 0
You need to be logged in to leave comments. Login now