##// END OF EJS Templates
mq: use dirstateguard instead of dirstate.invalidate (qpush)...
mq: use dirstateguard instead of dirstate.invalidate (qpush) Before this patch, "mq.queue.apply()" uses "dirstate.invalidate()" as a kind of "restore .hg/dirstate to the original status" during afailure. But it just discards changes in memory, and doesn't actually restore ".hg/dirstate". Then, it can't work as expected, if "dirstate.write()" is executed while processing. This patch uses "dirstateguard" instead of "dirstate.invalidate()" to restore ".hg/dirstate" at failure even if "dirstate.write()" is executed before failure. This is a part of preparations to fix the issue that the recent (in memory) dirstate isn't visible to external processes (e.g. "precommit" hook).

File last commit:

r22316:816be4ca stable
r24996:58308dde default
Show More
test-lfconvert.t
351 lines | 11.1 KiB | text/troff | Tads3Lexer
Matt Harbison
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)...
r17823 $ USERCACHE="$TESTTMP/cache"; export USERCACHE
$ mkdir "${USERCACHE}"
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 $ cat >> $HGRCPATH <<EOF
> [extensions]
> largefiles =
Greg Ward
largefiles: test lfconvert error handling; remove redundant code
r15339 > share =
Martin Geisler
tests: use strip extension instead of mq where it makes sense...
r20115 > strip =
Matt Harbison
largefiles: respect the rev when reading standins in copytostore() (issue3630)...
r17877 > convert =
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 > [largefiles]
> minsize = 0.5
FUJIWARA Katsunori
largefiles: use "ui.configlist()" to get largefiles.patterns configuration...
r15579 > patterns = **.other
> **.dat
Matt Harbison
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)...
r17823 > usercache=${USERCACHE}
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 > EOF
"lfconvert" works
$ hg init bigfile-repo
$ cd bigfile-repo
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 $ cat >> .hg/hgrc <<EOF
> [extensions]
> largefiles = !
> EOF
$ mkdir sub
$ dd if=/dev/zero bs=1k count=256 > large 2> /dev/null
Levi Bard
largefiles: add tests for uncovered codepaths (issue3092)...
r15810 $ dd if=/dev/zero bs=1k count=256 > large2 2> /dev/null
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 $ echo normal > normal1
$ echo alsonormal > sub/normal2
$ dd if=/dev/zero bs=1k count=10 > sub/maybelarge.dat 2> /dev/null
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 $ hg addremove
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 adding large
Levi Bard
largefiles: add tests for uncovered codepaths (issue3092)...
r15810 adding large2
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 adding normal1
adding sub/maybelarge.dat
adding sub/normal2
$ hg commit -m"add large, normal1" large normal1
$ hg commit -m"add sub/*" sub
Mads Kiilerich
tests: convert some 'hghave symlink' to #if...
r16908
Levi Bard
largefiles: add tests for uncovered codepaths (issue3092)...
r15810 Test tag parsing
$ cat >> .hgtags <<EOF
> IncorrectlyFormattedTag!
> invalidhash sometag
> 0123456789abcdef anothertag
> EOF
$ hg add .hgtags
$ hg commit -m"add large2" large2 .hgtags
Mads Kiilerich
tests: convert some 'hghave symlink' to #if...
r16908
Levi Bard
largefiles: add tests for uncovered codepaths (issue3092)...
r15810 Test link+rename largefile codepath
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 $ [ -d .hg/largefiles ] && echo fail || echo pass
pass
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 $ cd ..
$ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
initializing destination largefiles-repo
Levi Bard
largefiles: add tests for uncovered codepaths (issue3092)...
r15810 skipping incorrectly formatted tag IncorrectlyFormattedTag!
skipping incorrectly formatted id invalidhash
no mapping for id 0123456789abcdef
Mads Kiilerich
tests: convert some 'hghave symlink' to #if...
r16908 #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
Levi Bard
largefiles: add tests for uncovered codepaths (issue3092)...
r15810 abort: renamed/copied largefile large3 becomes symlink
[255]
Mads Kiilerich
tests: convert some 'hghave symlink' to #if...
r16908 #endif
Levi Bard
largefiles: add tests for uncovered codepaths (issue3092)...
r15810 $ cd bigfile-repo
$ hg strip --no-backup 2
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ cd ..
Mads Kiilerich
tests: convert some 'hghave symlink' to #if...
r16908 $ rm -rf largefiles-repo largefiles-repo-symlink
Levi Bard
largefiles: add tests for uncovered codepaths (issue3092)...
r15810 $ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
initializing destination largefiles-repo
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 "lfconvert" converts content correctly
$ cd largefiles-repo
$ hg up
getting changed largefiles
2 largefiles updated, 0 removed
Benoit Boissinot
largefiles: fix largefiles+subrepo update (issue3752)...
r18459 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 $ hg locate
.hglf/large
.hglf/sub/maybelarge.dat
normal1
sub/normal2
$ cat normal1
normal
$ cat sub/normal2
alsonormal
Matt Mackall
tests: use md5sum.py instead of sha1sum, add check
r15389 $ "$TESTDIR/md5sum.py" large sub/maybelarge.dat
ec87a838931d4d5d2e94a04644788a55 large
1276481102f218c981e0324180bafd9f sub/maybelarge.dat
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 "lfconvert" adds 'largefiles' to .hg/requires.
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 $ cat .hg/requires
Mads Kiilerich
localrepo: store requirements sorted
r18356 dotencode
fncache
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 largefiles
revlogv1
store
"lfconvert" includes a newline at the end of the standin files.
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 $ cat .hglf/large .hglf/sub/maybelarge.dat
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 2e000fa7e85759c7f4c254d4d9c33ef481e459a7
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c
Greg Ward
largefiles: test lfconvert error handling; remove redundant code
r15339 $ cd ..
Greg Ward
largefiles: test lfconvert with rename, remove, and merge
r15342 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
Matt Mackall
tests: use md5sum.py instead of sha1sum, add check
r15389 $ "$TESTDIR/md5sum.py" sub/maybelarge.dat
1dd0b99ff80e19cff409702a1d3f5e15 sub/maybelarge.dat
Greg Ward
largefiles: test lfconvert with rename, remove, and merge
r15342 $ 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
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 warning: $TESTTMP/bigfile-repo/stuff/maybelarge.dat looks like a binary file. (glob)
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
r15501 merging stuff/maybelarge.dat incomplete! (edit conflicts, then use 'hg resolve --mark')
Greg Ward
largefiles: test lfconvert with rename, remove, and merge
r15342 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
Pierre-Yves David
resolve: add parenthesis around "no more unresolved files" message...
r21947 (no more unresolved files)
Greg Ward
largefiles: test lfconvert with rename, remove, and merge
r15342 $ hg commit -m"merge"
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
Greg Ward
largefiles: test lfconvert with rename, remove, and merge
r15342 @ 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
Greg Ward
largefiles: test "lfconvert --to-normal" with rename/remove/merge...
r15343 $ rm -rf largefiles-repo
$ hg lfconvert --size 0.2 bigfile-repo largefiles-repo
initializing destination largefiles-repo
$ cd largefiles-repo
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
Greg Ward
largefiles: test lfconvert with rename, remove, and merge
r15342 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
Benoit Boissinot
largefiles: fix largefiles+subrepo update (issue3752)...
r18459 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Greg Ward
largefiles: test lfconvert with rename, remove, and merge
r15342 $ cat stuff/normal2
alsonormal
blah
Matt Mackall
tests: use md5sum.py instead of sha1sum, add check
r15389 $ "$TESTDIR/md5sum.py" stuff/maybelarge.dat
1dd0b99ff80e19cff409702a1d3f5e15 stuff/maybelarge.dat
Greg Ward
largefiles: test lfconvert with rename, remove, and merge
r15342 $ cat .hglf/stuff/maybelarge.dat
76236b6a2c6102826c61af4297dd738fb3b1de38
$ cd ..
Greg Ward
largefiles: test lfconvert error handling; remove redundant code
r15339 "lfconvert" error cases
Greg Ward
largefiles: rearrange how lfconvert detects non-local repos...
r15340 $ 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]
Greg Ward
largefiles: test lfconvert error handling; remove redundant code
r15339 $ hg lfconvert nosuchrepo foo
abort: repository nosuchrepo not found!
[255]
$ hg share -q -U bigfile-repo shared
Matt Mackall
tests: fix check-code detection of anchored expressions, fix echo -n usage
r15364 $ printf 'bogus' > shared/.hg/sharedpath
Greg Ward
largefiles: test lfconvert error handling; remove redundant code
r15339 $ hg lfconvert shared foo
Mads Kiilerich
tests: make (glob) on windows accept \ instead of /...
r15447 abort: .hg/sharedpath points to nonexistent directory $TESTTMP/bogus! (glob)
Greg Ward
largefiles: test lfconvert error handling; remove redundant code
r15339 [255]
$ hg lfconvert bigfile-repo largefiles-repo
initializing destination largefiles-repo
abort: repository largefiles-repo already exists!
[255]
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338
Greg Ward
largefiles: test "lfconvert --to-normal" with rename/remove/merge...
r15343 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
Greg Ward
largefiles: test lfconvert error handling; remove redundant code
r15339 $ cd largefiles-repo
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 $ hg lfconvert --to-normal . ../normal-repo
initializing destination ../normal-repo
$ cd ../normal-repo
$ cat >> .hg/hgrc <<EOF
> [extensions]
> largefiles = !
> EOF
Greg Ward
largefiles: test "lfconvert --to-normal" with rename/remove/merge...
r15343
# 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
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
Greg Ward
largefiles: test "lfconvert --to-normal" with rename/remove/merge...
r15343 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
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 $ hg update
Greg Ward
largefiles: test "lfconvert --to-normal" with rename/remove/merge...
r15343 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 $ hg locate
Greg Ward
largefiles: beef up test-lfconvert.t so it's more thorough...
r15341 anotherlarge
normal1
Greg Ward
largefiles: test "lfconvert --to-normal" with rename/remove/merge...
r15343 stuff/maybelarge.dat
stuff/normal2
Greg Ward
largefiles: extract test-lfconvert.t from test-largefiles.t...
r15338 $ [ -d .hg/largefiles ] && echo fail || echo pass
pass
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..
Matt Harbison
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)...
r17823
Matt Harbison
largefiles: don't copy largefiles from working dir to the store while converting...
r17878 Clearing the usercache ensures that commitctx doesn't try to cache largefiles
from the working dir on a convert.
$ rm "${USERCACHE}"/*
Matt Harbison
largefiles: respect the rev when reading standins in copytostore() (issue3630)...
r17877 $ 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)
Martin Geisler
tests: don't load unnecessary graphlog extension...
r20117 $ hg -R largefiles-repo-hg log -G --template "{rev}:{node|short} {desc|firstline}\n"
Matt Harbison
largefiles: respect the rev when reading standins in copytostore() (issue3630)...
r17877 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
Matt Harbison
largefiles: don't copy largefiles from working dir to the store while converting...
r17878 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.
Matt Harbison
largefiles: respect the rev when reading standins in copytostore() (issue3630)...
r17877 $ 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
Mads Kiilerich
tests: fix windows test failure with largefiles
r18557 changeset 0:d4892ec57ce2: large references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/2e000fa7e85759c7f4c254d4d9c33ef481e459a7 (glob)
changeset 1:334e5237836d: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
changeset 2:261ad3f3f037: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/34e163be8e43c5631d8b92e9c43ab0bf0fa62b9c (glob)
changeset 3:55759520c76f: sub/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
changeset 5:9cc5aa7204f0: stuff/maybelarge.dat references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/76236b6a2c6102826c61af4297dd738fb3b1de38 (glob)
changeset 6:17126745edfd: anotherlarge references missing $TESTTMP/largefiles-repo-hg/.hg/largefiles/3b71f43ff30f4b15b5cd85dd9e95ebc7e84eb5a3 (glob)
Matt Harbison
largefiles: respect the rev when reading standins in copytostore() (issue3630)...
r17877 verified existence of 6 revisions of 4 largefiles
Matt Harbison
largefiles: don't copy largefiles from working dir to the store while converting...
r17878 [1]
Matt Harbison
largefiles: respect the rev when reading standins in copytostore() (issue3630)...
r17877 $ hg -R largefiles-repo-hg showconfig paths
Aaron Kushner
config: exit non zero on non-existent config option (issue4247)...
r22316 [1]
Matt Harbison
largefiles: respect the rev when reading standins in copytostore() (issue3630)...
r17877
Matt Harbison
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)...
r17823 Avoid a traceback if a largefile isn't available (issue3519)
Matt Harbison
largefiles: always create the cache and standin directories when cloning...
r17824 Ensure the largefile can be cached in the source if necessary
Matt Harbison
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)...
r17823 $ hg clone -U largefiles-repo issue3519
Matt Harbison
largefiles: don't copy largefiles from working dir to the store while converting...
r17878 $ rm -f "${USERCACHE}"/*
Matt Harbison
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)...
r17823 $ hg lfconvert --to-normal issue3519 normalized3519
initializing destination normalized3519
Matt Harbison
largefiles: always create the cache and standin directories when cloning...
r17824
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
Simon Heimberg
tests: lines with largefile .* file://$TESTTMP also match on windows...
r20471 large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:/*/$TESTTMP/largefiles-repo (glob)
Matt Harbison
largefiles: fix a traceback in lfconvert if a largefile is missing (issue3519)...
r17823 abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad
[255]