Mercurial > hg-stable
view tests/test-lfconvert.t @ 18726:431b246cfb12 stable
largefiles: missing largefiles should not be committed as removed
Largefiles can easily become missing - for example if it simply isn't available
or the download fail. It might even be convenient to be able to work that way
in some cases.
But commiting missing largefiles as if they had been 'hg remove'd is plain wrong.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Thu, 28 Feb 2013 13:45:18 +0100 |
parents | abfbb04fab8e |
children | a49b7c9fc246 |
line wrap: on
line source
$ USERCACHE="$TESTTMP/cache"; export USERCACHE $ mkdir "${USERCACHE}" $ cat >> $HGRCPATH <<EOF > [extensions] > largefiles = > share = > graphlog = > mq = > convert = > [largefiles] > minsize = 0.5 > patterns = **.other > **.dat > usercache=${USERCACHE} > EOF "lfconvert" works $ hg init bigfile-repo $ cd bigfile-repo $ cat >> .hg/hgrc <<EOF > [extensions] > largefiles = ! > EOF $ mkdir sub $ dd if=/dev/zero bs=1k count=256 > large 2> /dev/null $ dd if=/dev/zero bs=1k count=256 > large2 2> /dev/null $ echo normal > normal1 $ echo alsonormal > sub/normal2 $ dd if=/dev/zero bs=1k count=10 > sub/maybelarge.dat 2> /dev/null $ hg addremove adding large adding large2 adding normal1 adding sub/maybelarge.dat adding sub/normal2 $ hg commit -m"add large, normal1" large normal1 $ hg commit -m"add sub/*" sub Test tag parsing $ cat >> .hgtags <<EOF > IncorrectlyFormattedTag! > invalidhash sometag > 0123456789abcdef anothertag > EOF $ hg add .hgtags $ hg commit -m"add large2" large2 .hgtags Test link+rename largefile codepath $ [ -d .hg/largefiles ] && echo fail || echo pass pass $ cd .. $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo initializing destination largefiles-repo skipping incorrectly formatted tag IncorrectlyFormattedTag! skipping incorrectly formatted id invalidhash no mapping for id 0123456789abcdef #if symlink $ hg --cwd bigfile-repo rename large2 large3 $ ln -sf large bigfile-repo/large3 $ hg --cwd bigfile-repo commit -m"make large2 a symlink" large2 large3 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo-symlink initializing destination largefiles-repo-symlink skipping incorrectly formatted tag IncorrectlyFormattedTag! skipping incorrectly formatted id invalidhash no mapping for id 0123456789abcdef abort: renamed/copied largefile large3 becomes symlink [255] #endif $ cd bigfile-repo $ hg strip --no-backup 2 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ cd .. $ rm -rf largefiles-repo largefiles-repo-symlink $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo initializing destination largefiles-repo "lfconvert" converts content correctly $ cd largefiles-repo $ hg up getting changed largefiles 2 largefiles updated, 0 removed 4 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg locate .hglf/large .hglf/sub/maybelarge.dat normal1 sub/normal2 $ cat normal1 normal $ cat sub/normal2 alsonormal $ "$TESTDIR/md5sum.py" large sub/maybelarge.dat ec87a838931d4d5d2e94a04644788a55 large 1276481102f218c981e0324180bafd9f sub/maybelarge.dat "lfconvert" adds 'largefiles' to .hg/requires. $ cat .hg/requires dotencode fncache largefiles revlogv1 store "lfconvert" includes a newline at the end of the standin files. $ cat .hglf/large .hglf/sub/maybelarge.dat 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c $ cd .. add some changesets to rename/remove/merge $ cd bigfile-repo $ hg mv -q sub stuff $ hg commit -m"rename sub/ to stuff/" $ hg update -q 1 $ echo blah >> normal3 $ echo blah >> sub/normal2 $ echo blah >> sub/maybelarge.dat $ "$TESTDIR/md5sum.py" sub/maybelarge.dat 1dd0b99ff80e19cff409702a1d3f5e15 sub/maybelarge.dat $ hg commit -A -m"add normal3, modify sub/*" adding normal3 created new head $ hg rm large normal3 $ hg commit -q -m"remove large, normal3" $ hg merge merging sub/maybelarge.dat and stuff/maybelarge.dat to stuff/maybelarge.dat warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob) merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark') merging sub/normal2 and stuff/normal2 to stuff/normal2 0 files updated, 1 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon [1] $ hg cat -r . sub/maybelarge.dat > stuff/maybelarge.dat $ hg resolve -m stuff/maybelarge.dat $ hg commit -m"merge" $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" @ 5:4884f215abda merge |\ | o 4:7285f817b77e remove large, normal3 | | | o 3:67e3892e3534 add normal3, modify sub/* | | o | 2:c96c8beb5d56 rename sub/ to stuff/ |/ o 1:020c65d24e11 add sub/* | o 0:117b8328f97a add large, normal1 $ cd .. lfconvert with rename, merge, and remove $ rm -rf largefiles-repo $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo initializing destination largefiles-repo $ cd largefiles-repo $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" o 5:8e05f5f2b77e merge |\ | o 4:a5a02de7a8e4 remove large, normal3 | | | o 3:55759520c76f add normal3, modify sub/* | | o | 2:261ad3f3f037 rename sub/ to stuff/ |/ o 1:334e5237836d add sub/* | o 0:d4892ec57ce2 add large, normal1 $ hg locate -r 2 .hglf/large .hglf/stuff/maybelarge.dat normal1 stuff/normal2 $ hg locate -r 3 .hglf/large .hglf/sub/maybelarge.dat normal1 normal3 sub/normal2 $ hg locate -r 4 .hglf/sub/maybelarge.dat normal1 sub/normal2 $ hg locate -r 5 .hglf/stuff/maybelarge.dat normal1 stuff/normal2 $ hg update getting changed largefiles 1 largefiles updated, 0 removed 3 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cat stuff/normal2 alsonormal blah $ "$TESTDIR/md5sum.py" stuff/maybelarge.dat 1dd0b99ff80e19cff409702a1d3f5e15 stuff/maybelarge.dat $ cat .hglf/stuff/maybelarge.dat 76236b6a2c6102826c61af4297dd738fb3b1de38 $ cd .. "lfconvert" error cases $ hg lfconvert http://localhost/foo foo abort: http://localhost/foo is not a local Mercurial repo [255] $ hg lfconvert foo ssh://localhost/foo abort: ssh://localhost/foo is not a local Mercurial repo [255] $ hg lfconvert nosuchrepo foo abort: repository nosuchrepo not found! [255] $ hg share -q -U bigfile-repo shared $ printf 'bogus' > shared/.hg/sharedpath $ hg lfconvert shared foo abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob) [255] $ hg lfconvert bigfile-repo largefiles-repo initializing destination largefiles-repo abort: repository largefiles-repo already exists! [255] add another largefile to the new largefiles repo $ cd largefiles-repo $ dd if=/dev/zero bs=1k count=1k > anotherlarge 2> /dev/null $ hg add --lfsize=1 anotherlarge $ hg commit -m "add anotherlarge (should be a largefile)" $ cat .hglf/anotherlarge 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 $ cd .. round-trip: converting back to a normal (non-largefiles) repo with "lfconvert --to-normal" should give the same as ../bigfile-repo $ cd largefiles-repo $ hg lfconvert --to-normal . ../normal-repo initializing destination ../normal-repo $ cd ../normal-repo $ cat >> .hg/hgrc <<EOF > [extensions] > largefiles = ! > EOF # Hmmm: the changeset ID for rev 5 is different from the original # normal repo (../bigfile-repo), because the changelog filelist # differs between the two incarnations of rev 5: this repo includes # 'large' in the list, but ../bigfile-repo does not. Since rev 5 # removes 'large' relative to the first parent in both repos, it seems # to me that lfconvert is doing a *better* job than # "hg remove" + "hg merge" + "hg commit". # $ hg -R ../bigfile-repo debugdata -c 5 # $ hg debugdata -c 5 $ hg glog --template "{rev}:{node|short} {desc|firstline}\n" o 6:1635824e6f59 add anotherlarge (should be a largefile) | o 5:7215f8deeaaf merge |\ | o 4:7285f817b77e remove large, normal3 | | | o 3:67e3892e3534 add normal3, modify sub/* | | o | 2:c96c8beb5d56 rename sub/ to stuff/ |/ o 1:020c65d24e11 add sub/* | o 0:117b8328f97a add large, normal1 $ hg update 4 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg locate anotherlarge normal1 stuff/maybelarge.dat stuff/normal2 $ [ -d .hg/largefiles ] && echo fail || echo pass pass $ cd .. Clearing the usercache ensures that commitctx doesn't try to cache largefiles from the working dir on a convert. $ rm "${USERCACHE}"/* $ hg convert largefiles-repo assuming destination largefiles-repo-hg initializing destination largefiles-repo-hg repository scanning source... sorting... converting... 6 add large, normal1 5 add sub/* 4 rename sub/ to stuff/ 3 add normal3, modify sub/* 2 remove large, normal3 1 merge 0 add anotherlarge (should be a largefile) $ hg -R largefiles-repo-hg glog --template "{rev}:{node|short} {desc|firstline}\n" o 6:17126745edfd add anotherlarge (should be a largefile) | o 5:9cc5aa7204f0 merge |\ | o 4:a5a02de7a8e4 remove large, normal3 | | | o 3:55759520c76f add normal3, modify sub/* | | o | 2:261ad3f3f037 rename sub/ to stuff/ |/ o 1:334e5237836d add sub/* | o 0:d4892ec57ce2 add large, normal1 Verify will fail (for now) if the usercache is purged before converting, since largefiles are not cached in the converted repo's local store by the conversion process. $ hg -R largefiles-repo-hg verify --large --lfa checking changesets checking manifests crosschecking files in changesets and manifests checking files 8 files, 7 changesets, 12 total revisions searching 7 changesets for largefiles changeset 0:d4892ec57ce2: large missing (looked for hash 2e000fa7e85759c7f4c254d4d9c33ef481e459a7) changeset 1:334e5237836d: sub/maybelarge.dat missing (looked for hash 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c) changeset 2:261ad3f3f037: stuff/maybelarge.dat missing (looked for hash 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c) changeset 3:55759520c76f: sub/maybelarge.dat missing (looked for hash 76236b6a2c6102826c61af4297dd738fb3b1de38) changeset 5:9cc5aa7204f0: stuff/maybelarge.dat missing (looked for hash 76236b6a2c6102826c61af4297dd738fb3b1de38) changeset 6:17126745edfd: anotherlarge missing (looked for hash 3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3) verified existence of 6 revisions of 4 largefiles [1] $ hg -R largefiles-repo-hg showconfig paths Avoid a traceback if a largefile isn't available (issue3519) Ensure the largefile can be cached in the source if necessary $ hg clone -U largefiles-repo issue3519 $ rm -f "${USERCACHE}"/* $ hg lfconvert --to-normal issue3519 normalized3519 initializing destination normalized3519 Ensure the abort message is useful if a largefile is entirely unavailable $ rm -rf normalized3519 $ rm "${USERCACHE}"/* $ rm issue3519/.hg/largefiles/* $ rm largefiles-repo/.hg/largefiles/* $ hg lfconvert --to-normal issue3519 normalized3519 initializing destination normalized3519 error getting id 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 from url file:$TESTTMP/largefiles-repo for file large: can't get file locally (glob) abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad [255]