comparison tests/test-largefiles-misc.t @ 24133:79c2c29c71ae

largefiles: don't warn when reverting a forgotten largefile Previously, when a largefile is forgotten and then reverted, a warning was issued: $ hg revert -R subrepo subrepo/large.txt file not managed: subrepo/large.txt (glob) This was purely cosmetic as the file itself actually was reverted. The problem was even with all of the matcher patching, the largefile pattern given on the command line wasn't converted to a standin because the standin was neither in ctx nor wctx. This causes the named largefile to be added to the 'names' dict in cmdutil.revert() in the repo walk at line 2550. The warning was printed out when the 'names' dict is iterated, because the file was specified exactly. Since core revert recurses into subrepos and largefiles only overrides the revert method in commands.py, it doesn't work properly when reverting a subrepo. However, it still will recurse into the subrepo and call the installed matcher method, so lfdirstate is reopened for the current repo level to prevent any new problems.
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 07 Feb 2015 19:40:02 -0500
parents f2b6f37d537b
children bb11081562d7
comparison
equal deleted inserted replaced
24132:b5898bf7119a 24133:79c2c29c71ae
359 1 largefiles updated, 0 removed 359 1 largefiles updated, 0 removed
360 getting changed largefiles 360 getting changed largefiles
361 0 largefiles updated, 0 removed 361 0 largefiles updated, 0 removed
362 1 files updated, 0 files merged, 0 files removed, 0 files unresolved 362 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
363 $ hg status -S 363 $ hg status -S
364
365 $ hg forget -v subrepo/large.txt
366 removing subrepo/large.txt (glob)
367
368 Test reverting a forgotten file
369 $ hg revert -R subrepo subrepo/large.txt
370 $ hg status -SA subrepo/large.txt
371 C subrepo/large.txt
364 372
365 $ hg rm -v subrepo/large.txt 373 $ hg rm -v subrepo/large.txt
366 removing subrepo/large.txt (glob) 374 removing subrepo/large.txt (glob)
367 $ hg revert -R subrepo subrepo/large.txt 375 $ hg revert -R subrepo subrepo/large.txt
368 $ rm subrepo/large.txt 376 $ rm subrepo/large.txt