##// END OF EJS Templates
wireprotov2: implement commands as a generator of objects...
wireprotov2: implement commands as a generator of objects Previously, wire protocol version 2 inherited version 1's model of having separate types to represent the results of different wire protocol commands. As I implemented more powerful commands in future commits, I found I was using a common pattern of returning a special type to hold a generator. This meant the command function required a closure to do most of the work. That made logic flow more difficult to follow. I also noticed that many commands were effectively a sequence of objects to be CBOR encoded. I think it makes sense to define version 2 commands as generators. This way, commands can simply emit the data structures they wish to send to the client. This eliminates the need for a closure in command functions and removes encoding from the bodies of commands. As part of this commit, the handling of response objects has been moved into the serverreactor class. This puts the reactor in the driver's seat with regards to CBOR encoding and error handling. Having error handling in the function that emits frames is particularly important because exceptions in that function can lead to things getting in a bad state: I'm fairly certain that uncaught exceptions in the frame generator were causing deadlocks. I also introduced a dedicated error type for explicit error reporting in command handlers. This will be used in subsequent commits. There's still a bit of work to be done here, especially around formalizing the error handling "protocol." I've added yet another TODO to track this so we don't forget. Test output changed because we're using generators and no longer know we are at the end of the data until we hit the end of the generator. This means we can't emit the end-of-stream flag until we've exhausted the generator. Hence the introduction of 0-sized end-of-stream frames. Differential Revision: https://phab.mercurial-scm.org/D4472

File last commit:

r39525:f1186c29 default
r39595:07b58266 default
Show More
test-lfs.t
1119 lines | 37.5 KiB | text/troff | Tads3Lexer
Kyle Lippincott
tests: mark tests that fail when using chg as #require no-chg...
r38041 #require no-reposimplestore no-chg
Gregory Szorc
tests: skip largefiles and lfs tests when using simple store...
r37366
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 # Initial setup
$ cat >> $HGRCPATH << EOF
> [extensions]
> lfs=
> [lfs]
Matt Harbison
lfs: migrate most file filtering from threshold to custom filter...
r35636 > # Test deprecated config
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > threshold=1000B
> EOF
$ LONG=AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
# Prepare server and enable extension
$ hg init server
$ hg clone -q server client
$ cd client
# Commit small file
$ echo s > smallfile
Matt Harbison
lfs: always exclude '.hg*' text files...
r35666 $ echo '**.py = LF' > .hgeol
Matt Harbison
minifileset: note the unsupported file pattern when raising a parse error...
r35818 $ hg --config lfs.track='"size(\">1000B\")"' commit -Aqm "add small file"
hg: parse error: unsupported file pattern: size(">1000B")
(paths must be prefixed with "path:")
[255]
Matt Harbison
lfs: don't automatically exclude '.hg*' files from external tracking...
r35817 $ hg --config lfs.track='size(">1000B")' commit -Aqm "add small file"
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
# Commit large file
$ echo $LONG > largefile
Matt Harbison
lfs: add a repo requirement for this extension once an lfs file is committed...
r35167 $ grep lfs .hg/requires
[1]
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ hg commit --traceback -Aqm "add large file"
Matt Harbison
lfs: add a repo requirement for this extension once an lfs file is committed...
r35167 $ grep lfs .hg/requires
lfs
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
# Ensure metadata is stored
$ hg debugdata largefile 0
version https://git-lfs.github.com/spec/v1
oid sha256:f11e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b
size 1501
x-is-binary 0
# Check the blobstore is populated
$ find .hg/store/lfs/objects | sort
.hg/store/lfs/objects
.hg/store/lfs/objects/f1
.hg/store/lfs/objects/f1/1e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b
# Check the blob stored contains the actual contents of the file
$ cat .hg/store/lfs/objects/f1/1e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
# Push changes to the server
$ hg push
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pushing to $TESTTMP/server
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 searching for changes
abort: lfs.url needs to be configured
[255]
$ cat >> $HGRCPATH << EOF
> [lfs]
> url=file:$TESTTMP/dummy-remote/
> EOF
Matt Harbison
lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs...
r35520 Push to a local non-lfs repo with the extension enabled will add the
Matt Harbison
test-lfs: add tests covering local exchanges...
r35518 lfs requirement
$ grep lfs $TESTTMP/server/.hg/requires
[1]
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ hg push -v | egrep -v '^(uncompressed| )'
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pushing to $TESTTMP/server
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 searching for changes
Matt Harbison
lfs: add note messages indicating what store holds the lfs blob...
r35489 lfs: found f11e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b in the local lfs store
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 2 changesets found
adding changesets
adding manifests
adding file changes
Matt Harbison
lfs: always exclude '.hg*' text files...
r35666 added 2 changesets with 3 changes to 3 files
Matt Harbison
lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs...
r35520 calling hook pretxnchangegroup.lfs: hgext.lfs.checkrequireslfs
Matt Harbison
test-lfs: add tests covering local exchanges...
r35518 $ grep lfs $TESTTMP/server/.hg/requires
Matt Harbison
lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs...
r35520 lfs
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
# Unknown URL scheme
$ hg push --config lfs.url=ftp://foobar
abort: lfs: unknown url scheme: ftp
[255]
$ cd ../
# Initialize new client (not cloning) and setup extension
$ hg init client2
$ cd client2
$ cat >> .hg/hgrc <<EOF
> [paths]
> default = $TESTTMP/server
> EOF
# Pull from server
Matt Harbison
test-lfs: add tests covering local exchanges...
r35518
Matt Harbison
lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs...
r35520 Pulling a local lfs repo into a local non-lfs repo with the extension
enabled adds the lfs requirement
Matt Harbison
test-lfs: add tests covering local exchanges...
r35518
$ grep lfs .hg/requires $TESTTMP/server/.hg/requires
Matt Harbison
lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs...
r35520 $TESTTMP/server/.hg/requires:lfs
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ hg pull default
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pulling from $TESTTMP/server
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 requesting all changes
adding changesets
adding manifests
adding file changes
Matt Harbison
lfs: always exclude '.hg*' text files...
r35666 added 2 changesets with 3 changes to 3 files
new changesets 0ead593177f7:b88141481348
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 (run 'hg update' to get a working copy)
Matt Harbison
test-lfs: add tests covering local exchanges...
r35518 $ grep lfs .hg/requires $TESTTMP/server/.hg/requires
Matt Harbison
lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs...
r35520 .hg/requires:lfs
$TESTTMP/server/.hg/requires:lfs
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
# Check the blobstore is not yet populated
$ [ -d .hg/store/lfs/objects ]
[1]
# Update to the last revision containing the large file
$ hg update
Matt Harbison
lfs: always exclude '.hg*' text files...
r35666 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
# Check the blobstore has been populated on update
$ find .hg/store/lfs/objects | sort
.hg/store/lfs/objects
.hg/store/lfs/objects/f1
.hg/store/lfs/objects/f1/1e77c257047a398492d8d6cb9f6acf3aa7c4384bb23080b43546053e183e4b
# Check the contents of the file are fetched from blobstore when requested
$ hg cat -r . largefile
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
# Check the file has been copied in the working copy
$ cat largefile
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC
$ cd ..
# Check rename, and switch between large and small files
$ hg init repo3
$ cd repo3
$ cat >> .hg/hgrc << EOF
> [lfs]
Matt Harbison
lfs: migrate most file filtering from threshold to custom filter...
r35636 > track=size(">10B")
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > EOF
$ echo LONGER-THAN-TEN-BYTES-WILL-TRIGGER-LFS > large
$ echo SHORTER > small
$ hg add . -q
$ hg commit -m 'commit with lfs content'
Matt Harbison
lfs: add a fileset for detecting lfs files...
r36008 $ hg files -r . 'set:added()'
large
small
$ hg files -r . 'set:added() & lfs()'
large
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ hg mv large l
$ hg mv small s
Matt Harbison
lfs: teach the 'lfs()' fileset to handle removed files...
r36018 $ hg status 'set:removed()'
R large
R small
$ hg status 'set:removed() & lfs()'
R large
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ hg commit -m 'renames'
Matt Harbison
lfs: add a fileset for detecting lfs files...
r36008 $ hg files -r . 'set:copied()'
l
s
$ hg files -r . 'set:copied() & lfs()'
l
Matt Harbison
lfs: teach the 'lfs()' fileset to handle removed files...
r36018 $ hg status --change . 'set:removed()'
R large
R small
$ hg status --change . 'set:removed() & lfs()'
R large
Matt Harbison
lfs: add a fileset for detecting lfs files...
r36008
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ echo SHORT > l
$ echo BECOME-LARGER-FROM-SHORTER > s
$ hg commit -m 'large to small, small to large'
$ echo 1 >> l
$ echo 2 >> s
$ hg commit -m 'random modifications'
$ echo RESTORE-TO-BE-LARGE > l
$ echo SHORTER > s
$ hg commit -m 'switch large and small again'
# Test lfs_files template
$ hg log -r 'all()' -T '{rev} {join(lfs_files, ", ")}\n'
0 large
Matt Harbison
lfs: teach '{lfs_files}' to handle removed files
r36017 1 l, large
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 2 s
3 s
4 l
# Push and pull the above repo
$ hg --cwd .. init repo4
$ hg push ../repo4
pushing to ../repo4
searching for changes
adding changesets
adding manifests
adding file changes
added 5 changesets with 10 changes to 4 files
$ hg --cwd .. init repo5
$ hg --cwd ../repo5 pull ../repo3
pulling from ../repo3
requesting all changes
adding changesets
adding manifests
adding file changes
added 5 changesets with 10 changes to 4 files
new changesets fd47a419c4f7:5adf850972b9
(run 'hg update' to get a working copy)
$ cd ..
# Test clone
$ hg init repo6
$ cd repo6
$ cat >> .hg/hgrc << EOF
> [lfs]
Matt Harbison
lfs: migrate most file filtering from threshold to custom filter...
r35636 > track=size(">30B")
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > EOF
$ echo LARGE-BECAUSE-IT-IS-MORE-THAN-30-BYTES > large
$ echo SMALL > small
$ hg commit -Aqm 'create a lfs file' large small
$ hg debuglfsupload -r 'all()' -v
Matt Harbison
lfs: add note messages indicating what store holds the lfs blob...
r35489 lfs: found 8e92251415339ae9b148c8da89ed5ec665905166a1ab11b09dca8fad83344738 in the local lfs store
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097
$ cd ..
$ hg clone repo6 repo7
updating to branch default
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo7
Matt Harbison
lfs: enable the extension locally after cloning a repo with 'lfs' requirement...
r35214 $ hg config extensions --debug | grep lfs
$TESTTMP/repo7/.hg/hgrc:*: extensions.lfs= (glob)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ cat large
LARGE-BECAUSE-IT-IS-MORE-THAN-30-BYTES
$ cat small
SMALL
$ cd ..
Matt Harbison
lfs: enable the extension locally after sharing a repo with 'lfs' requirement...
r35215 $ hg --config extensions.share= share repo7 sharedrepo
updating working directory
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg -R sharedrepo config extensions --debug | grep lfs
$TESTTMP/sharedrepo/.hg/hgrc:*: extensions.lfs= (glob)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 # Test rename and status
$ hg init repo8
$ cd repo8
$ cat >> .hg/hgrc << EOF
> [lfs]
Matt Harbison
lfs: migrate most file filtering from threshold to custom filter...
r35636 > track=size(">10B")
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > EOF
$ echo THIS-IS-LFS-BECAUSE-10-BYTES > a1
$ echo SMALL > a2
$ hg commit -m a -A a1 a2
$ hg status
$ hg mv a1 b1
$ hg mv a2 a1
$ hg mv b1 a2
$ hg commit -m b
$ hg status
Augie Fackler
tests: use Python to write binary data in lfs test instead of shell...
r35377 >>> with open('a2', 'wb') as f:
... f.write(b'\1\nSTART-WITH-HG-FILELOG-METADATA')
>>> with open('a1', 'wb') as f:
... f.write(b'\1\nMETA\n')
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ hg commit -m meta
$ hg status
$ hg log -T '{rev}: {file_copies} | {file_dels} | {file_adds}\n'
2: | |
1: a1 (a2)a2 (a1) | |
0: | | a1 a2
$ for n in a1 a2; do
> for r in 0 1 2; do
> printf '\n%s @ %s\n' $n $r
> hg debugdata $n $r
> done
> done
a1 @ 0
version https://git-lfs.github.com/spec/v1
oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
size 29
x-is-binary 0
a1 @ 1
\x01 (esc)
copy: a2
copyrev: 50470ad23cf937b1f4b9f80bfe54df38e65b50d9
\x01 (esc)
SMALL
a1 @ 2
\x01 (esc)
\x01 (esc)
\x01 (esc)
META
a2 @ 0
SMALL
a2 @ 1
version https://git-lfs.github.com/spec/v1
oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
size 29
x-hg-copy a1
x-hg-copyrev be23af27908a582af43e5cda209a5a9b319de8d4
x-is-binary 0
a2 @ 2
version https://git-lfs.github.com/spec/v1
oid sha256:876dadc86a8542f9798048f2c47f51dbf8e4359aed883e8ec80c5db825f0d943
size 32
x-is-binary 0
# Verify commit hashes include rename metadata
$ hg log -T '{rev}:{node|short} {desc}\n'
2:0fae949de7fa meta
1:9cd6bdffdac0 b
0:7f96794915f7 a
$ cd ..
# Test bundle
$ hg init repo9
$ cd repo9
$ cat >> .hg/hgrc << EOF
> [lfs]
Matt Harbison
lfs: migrate most file filtering from threshold to custom filter...
r35636 > track=size(">10B")
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > [diff]
> git=1
> EOF
$ for i in 0 single two three 4; do
> echo 'THIS-IS-LFS-'$i > a
> hg commit -m a-$i -A a
> done
$ hg update 2 -q
$ echo 'THIS-IS-LFS-2-CHILD' > a
$ hg commit -m branching -q
$ hg bundle --base 1 bundle.hg -v
Matt Harbison
lfs: add note messages indicating what store holds the lfs blob...
r35489 lfs: found 5ab7a3739a5feec94a562d070a14f36dba7cad17e5484a4a89eea8e5f3166888 in the local lfs store
lfs: found a9c7d1cd6ce2b9bbdf46ed9a862845228717b921c089d0d42e3bcaed29eb612e in the local lfs store
lfs: found f693890c49c409ec33673b71e53f297681f76c1166daf33b2ad7ebf8b1d3237e in the local lfs store
lfs: found fda198fea753eb66a252e9856915e1f5cddbe41723bd4b695ece2604ad3c9f75 in the local lfs store
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 4 changesets found
uncompressed size of bundle content:
* (changelog) (glob)
* (manifests) (glob)
Jun Wu
changegroup: do not delta lfs revisions...
r36764 * a (glob)
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ hg --config extensions.strip= strip -r 2 --no-backup --force -q
$ hg -R bundle.hg log -p -T '{rev} {desc}\n' a
5 branching
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-two
+THIS-IS-LFS-2-CHILD
4 a-4
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-three
+THIS-IS-LFS-4
3 a-three
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-two
+THIS-IS-LFS-three
2 a-two
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-single
+THIS-IS-LFS-two
1 a-single
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-0
+THIS-IS-LFS-single
0 a-0
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,1 @@
+THIS-IS-LFS-0
$ hg bundle -R bundle.hg --base 1 bundle-again.hg -q
$ hg -R bundle-again.hg log -p -T '{rev} {desc}\n' a
5 branching
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-two
+THIS-IS-LFS-2-CHILD
4 a-4
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-three
+THIS-IS-LFS-4
3 a-three
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-two
+THIS-IS-LFS-three
2 a-two
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-single
+THIS-IS-LFS-two
1 a-single
diff --git a/a b/a
--- a/a
+++ b/a
@@ -1,1 +1,1 @@
-THIS-IS-LFS-0
+THIS-IS-LFS-single
0 a-0
diff --git a/a b/a
new file mode 100644
--- /dev/null
+++ b/a
@@ -0,0 +1,1 @@
+THIS-IS-LFS-0
$ cd ..
# Test isbinary
$ hg init repo10
$ cd repo10
$ cat >> .hg/hgrc << EOF
> [extensions]
> lfs=
> [lfs]
Matt Harbison
lfs: migrate most file filtering from threshold to custom filter...
r35636 > track=all()
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > EOF
$ $PYTHON <<'EOF'
> def write(path, content):
> with open(path, 'wb') as f:
> f.write(content)
> write('a', b'\0\0')
> write('b', b'\1\n')
> write('c', b'\1\n\0')
> write('d', b'xx')
> EOF
$ hg add a b c d
$ hg diff --stat
a | Bin
b | 1 +
c | Bin
d | 1 +
4 files changed, 2 insertions(+), 0 deletions(-)
$ hg commit -m binarytest
$ cat > $TESTTMP/dumpbinary.py << EOF
> def reposetup(ui, repo):
> for n in 'abcd':
> ui.write(('%s: binary=%s\n') % (n, repo['.'][n].isbinary()))
> EOF
$ hg --config extensions.dumpbinary=$TESTTMP/dumpbinary.py id --trace
a: binary=True
b: binary=False
c: binary=True
d: binary=False
b55353847f02 tip
Matt Harbison
fileset: use filectx.isbinary() to filter out binaries in eol()...
r38433 Binary blobs don't need to be present to be skipped in filesets. (And their
absence doesn't cause an abort.)
$ rm .hg/store/lfs/objects/96/a296d224f285c67bee93c30f8a309157f0daa35dc5b87e410b78630a09cfc7
$ rm .hg/store/lfs/objects/92/f76135a4baf4faccb8586a60faf830c2bdfce147cefa188aaf4b790bd01b7e
$ hg files --debug -r . 'set:eol("unix")' --config 'experimental.lfs.disableusercache=True'
lfs: found c04b5bb1a5b2eb3e9cd4805420dba5a9d133da5b7adeeafb5474c4adae9faa80 in the local lfs store
Yuya Nishihara
fileset: rewrite predicates to return matcher not closed to subset (API) (BC)...
r38711 2 b
Matt Harbison
fileset: use filectx.isbinary() to filter out binaries in eol()...
r38433 lfs: found 5dde896887f6754c9b15bfe3a441ae4806df2fde94001311e08bf110622e0bbe in the local lfs store
Matt Harbison
test-lfs: add coverage for the binary() fileset...
r38434 $ hg files --debug -r . 'set:binary()' --config 'experimental.lfs.disableusercache=True'
2 a
3 c
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ cd ..
# Test fctx.cmp fastpath - diff without LFS blobs
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 $ hg init repo12
$ cd repo12
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ cat >> .hg/hgrc <<EOF
> [lfs]
> threshold=1
> EOF
Matt Harbison
test-lfs: perform the `chmod +x` command in a manner compatible with Windows
r35138 $ cat > ../patch.diff <<EOF
> # HG changeset patch
> 2
>
> diff --git a/a b/a
> old mode 100644
> new mode 100755
> EOF
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ for i in 1 2 3; do
> cp ../repo10/a a
> if [ $i = 3 ]; then
> # make a content-only change
Matt Harbison
test-lfs: perform the `chmod +x` command in a manner compatible with Windows
r35138 > hg import -q --bypass ../patch.diff
> hg update -q
> rm ../patch.diff
> else
> echo $i >> a
> hg commit -m $i -A a
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > fi
> done
$ [ -d .hg/store/lfs/objects ]
$ cd ..
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 $ hg clone repo12 repo13 --noupdate
$ cd repo13
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 $ hg log --removed -p a -T '{desc}\n' --config diff.nobinary=1 --git
2
diff --git a/a b/a
old mode 100644
new mode 100755
2
diff --git a/a b/a
Binary file a has changed
1
diff --git a/a b/a
new file mode 100644
Binary file a has changed
$ [ -d .hg/store/lfs/objects ]
[1]
$ cd ..
Matt Harbison
lfs: migrate most file filtering from threshold to custom filter...
r35636 # Test filter
$ hg init repo11
$ cd repo11
$ cat >> .hg/hgrc << EOF
> [lfs]
> track=(**.a & size(">5B")) | (**.b & !size(">5B"))
> | (**.c & "path:d" & !"path:d/c.c") | size(">10B")
> EOF
$ mkdir a
$ echo aaaaaa > a/1.a
$ echo a > a/2.a
$ echo aaaaaa > 1.b
$ echo a > 2.b
$ echo a > 1.c
$ mkdir d
$ echo a > d/c.c
$ echo a > d/d.c
$ echo aaaaaaaaaaaa > x
$ hg add . -q
$ hg commit -m files
$ for p in a/1.a a/2.a 1.b 2.b 1.c d/c.c d/d.c x; do
> if hg debugdata $p 0 2>&1 | grep git-lfs >/dev/null; then
> echo "${p}: is lfs"
> else
> echo "${p}: not lfs"
> fi
> done
a/1.a: is lfs
a/2.a: not lfs
1.b: not lfs
2.b: is lfs
1.c: not lfs
d/c.c: not lfs
d/d.c: is lfs
x: is lfs
$ cd ..
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 # Verify the repos
$ cat > $TESTTMP/dumpflog.py << EOF
> # print raw revision sizes, flags, and hashes for certain files
> import hashlib
Augie Fackler
tests: fix various test-check-module-imports.t violations...
r36663 > from mercurial.node import short
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > from mercurial import revlog
> def hash(rawtext):
> h = hashlib.sha512()
> h.update(rawtext)
> return h.hexdigest()[:4]
> def reposetup(ui, repo):
> # these 2 files are interesting
> for name in ['l', 's']:
> fl = repo.file(name)
> if len(fl) == 0:
> continue
Gregory Szorc
tests: call rawsize() directly...
r37463 > sizes = [fl.rawsize(i) for i in fl]
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > texts = [fl.revision(i, raw=True) for i in fl]
Matt Harbison
test-lfs: cast the flags printed to an int...
r35100 > flags = [int(fl.flags(i)) for i in fl]
Matt Harbison
lfs: import the Facebook git-lfs client extension...
r35097 > hashes = [hash(t) for t in texts]
> print(' %s: rawsizes=%r flags=%r hashes=%r'
> % (name, sizes, flags, hashes))
> EOF
$ for i in client client2 server repo3 repo4 repo5 repo6 repo7 repo8 repo9 \
> repo10; do
> echo 'repo:' $i
> hg --cwd $i verify --config extensions.dumpflog=$TESTTMP/dumpflog.py -q
> done
repo: client
repo: client2
repo: server
repo: repo3
l: rawsizes=[211, 6, 8, 141] flags=[8192, 0, 0, 8192] hashes=['d2b8', '948c', 'cc88', '724d']
s: rawsizes=[74, 141, 141, 8] flags=[0, 8192, 8192, 0] hashes=['3c80', 'fce0', '874a', '826b']
repo: repo4
l: rawsizes=[211, 6, 8, 141] flags=[8192, 0, 0, 8192] hashes=['d2b8', '948c', 'cc88', '724d']
s: rawsizes=[74, 141, 141, 8] flags=[0, 8192, 8192, 0] hashes=['3c80', 'fce0', '874a', '826b']
repo: repo5
l: rawsizes=[211, 6, 8, 141] flags=[8192, 0, 0, 8192] hashes=['d2b8', '948c', 'cc88', '724d']
s: rawsizes=[74, 141, 141, 8] flags=[0, 8192, 8192, 0] hashes=['3c80', 'fce0', '874a', '826b']
repo: repo6
repo: repo7
repo: repo8
repo: repo9
repo: repo10
Matt Harbison
lfs: add a repo requirement for this extension when converting to lfs...
r35170
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 repo13 doesn't have any cached lfs files and its source never pushed its
Matt Harbison
lfs: introduce a user level cache for lfs files...
r35281 files. Therefore, the files don't exist in the remote store. Use the files in
the user cache.
Matt Harbison
lfs-test: note a problem with unpushed lfs files and cloning/sharing...
r35279
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 $ test -d $TESTTMP/repo13/.hg/store/lfs/objects
Matt Harbison
lfs-test: note a problem with unpushed lfs files and cloning/sharing...
r35279 [1]
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 $ hg --config extensions.share= share repo13 repo14
Matt Harbison
lfs-test: note a problem with unpushed lfs files and cloning/sharing...
r35279 updating working directory
Matt Harbison
lfs: introduce a user level cache for lfs files...
r35281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 $ hg -R repo14 -q verify
Matt Harbison
lfs: introduce a user level cache for lfs files...
r35281
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 $ hg clone repo13 repo15
Matt Harbison
lfs-test: note a problem with unpushed lfs files and cloning/sharing...
r35279 updating to branch default
Matt Harbison
lfs: introduce a user level cache for lfs files...
r35281 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 $ hg -R repo15 -q verify
Matt Harbison
lfs-test: note a problem with unpushed lfs files and cloning/sharing...
r35279
Matt Harbison
lfs: introduce a user level cache for lfs files...
r35281 If the source repo doesn't have the blob (maybe it was pulled or cloned with
--noupdate), the blob is still accessible via the global cache to send to the
remote store.
Matt Harbison
lfs-test: note a problem with unpushed lfs files and cloning/sharing...
r35279
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 $ rm -rf $TESTTMP/repo15/.hg/store/lfs
$ hg init repo16
$ hg -R repo15 push repo16
pushing to repo16
Matt Harbison
lfs-test: note a problem with unpushed lfs files and cloning/sharing...
r35279 searching for changes
Matt Harbison
lfs: introduce a user level cache for lfs files...
r35281 adding changesets
adding manifests
adding file changes
added 3 changesets with 2 changes to 1 files
Matt Harbison
test-lfs: bump the number on test repo11 and higher...
r35635 $ hg -R repo15 -q verify
Matt Harbison
lfs-test: note a problem with unpushed lfs files and cloning/sharing...
r35279
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490 Test damaged file scenarios. (This also damages the usercache because of the
hardlinks.)
$ echo 'damage' >> repo5/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
Repo with damaged lfs objects in any revision will fail verification.
$ hg -R repo5 verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0
large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 10 changes to 4 files
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490 2 integrity errors encountered!
(first damaged changeset appears to be 0)
[1]
Updates work after cloning a damaged repo, if the damaged lfs objects aren't in
the update destination. Those objects won't be added to the new repo's store
because they aren't accessed.
$ hg clone -v repo5 fromcorrupt
updating to branch default
resolving manifests
getting l
lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the usercache
getting s
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ test -f fromcorrupt/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
[1]
Verify will copy/link all lfs objects into the local store that aren't already
present. Bypass the corrupted usercache to show that verify works when fed by
the (uncorrupted) remote store.
$ hg -R fromcorrupt --config lfs.usercache=emptycache verify -v
repository uses revlog format 1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
lfs: adding 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e to the usercache
lfs: found 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e in the local lfs store
lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
lfs: found 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e in the local lfs store
lfs: adding 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 to the usercache
lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
lfs: adding b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c to the usercache
lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 10 changes to 4 files
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490
Matt Harbison
lfs: only hardlink between the usercache and local store if the blob verifies...
r35493 Verify will not copy/link a corrupted file from the usercache into the local
store, and poison it. (The verify with a good remote now works.)
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490
$ rm -r fromcorrupt/.hg/store/lfs/objects/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
$ hg -R fromcorrupt verify -v
repository uses revlog format 1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0
lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0
lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 10 changes to 4 files
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490 2 integrity errors encountered!
(first damaged changeset appears to be 0)
[1]
$ hg -R fromcorrupt --config lfs.usercache=emptycache verify -v
repository uses revlog format 1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
Matt Harbison
lfs: only hardlink between the usercache and local store if the blob verifies...
r35493 lfs: found 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e in the usercache
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490 lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
lfs: found 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e in the local lfs store
lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 10 changes to 4 files
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490
Damaging a file required by the update destination fails the update.
$ echo 'damage' >> $TESTTMP/dummy-remote/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
$ hg --config lfs.usercache=emptycache clone -v repo5 fromcorrupt2
updating to branch default
resolving manifests
Matt Harbison
lfs: use the localstore download method to transfer from remote stores...
r35566 abort: corrupt remote lfs object: 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490 [255]
Matt Harbison
lfs: verify lfs object content when transferring to and from the remote store...
r35492 A corrupted lfs blob is not transferred from a file://remotestore to the
usercache or local store.
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490
Matt Harbison
lfs: verify lfs object content when transferring to and from the remote store...
r35492 $ test -f emptycache/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
[1]
$ test -f fromcorrupt2/.hg/store/lfs/objects/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
[1]
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490
$ hg -R fromcorrupt2 verify
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0
large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 10 changes to 4 files
Matt Harbison
lfs: verify lfs object content when transferring to and from the remote store...
r35492 2 integrity errors encountered!
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490 (first damaged changeset appears to be 0)
[1]
Matt Harbison
lfs: verify lfs object content when transferring to and from the remote store...
r35492 Corrupt local files are not sent upstream. (The alternate dummy remote
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490 avoids the corrupt lfs object in the original remote.)
$ mkdir $TESTTMP/dummy-remote2
$ hg init dest
$ hg -R fromcorrupt2 --config lfs.url=file:///$TESTTMP/dummy-remote2 push -v dest
pushing to dest
searching for changes
lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
Matt Harbison
lfs: verify lfs object content when transferring to and from the remote store...
r35492 abort: detected corrupt lfs object: 66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
(run hg verify)
[255]
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490
$ hg -R fromcorrupt2 --config lfs.url=file:///$TESTTMP/dummy-remote2 verify -v
repository uses revlog format 1
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
l@1: unpacking 46a2f24864bc: integrity check failed on data/l.i:0
lfs: found 22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b in the local lfs store
large@0: unpacking 2c531e0992ff: integrity check failed on data/large.i:0
lfs: found 89b6070915a3d573ff3599d1cda305bc5e38549b15c4847ab034169da66e1ca8 in the local lfs store
lfs: found b1a6ea88da0017a0e77db139a54618986e9a2489bee24af9fe596de9daac498c in the local lfs store
Meirambek Omyrzak
verify: make output less confusing (issue5924)...
r39525 checked 5 changesets with 10 changes to 4 files
Matt Harbison
lfs: verify lfs object content when transferring to and from the remote store...
r35492 2 integrity errors encountered!
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490 (first damaged changeset appears to be 0)
[1]
$ cat $TESTTMP/dummy-remote2/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b | $TESTDIR/f --sha256
Matt Harbison
lfs: verify lfs object content when transferring to and from the remote store...
r35492 sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490 $ cat fromcorrupt2/.hg/store/lfs/objects/22/f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b | $TESTDIR/f --sha256
Matt Harbison
lfs: verify lfs object content when transferring to and from the remote store...
r35492 sha256=22f66a3fc0b9bf3f012c814303995ec07099b3a9ce02a7af84b5970811074a3b
$ test -f $TESTTMP/dummy-remote2/66/100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
[1]
Matt Harbison
test-lfs: add tests around corrupted lfs objects...
r35490
Accessing a corrupt file will complain
$ hg --cwd fromcorrupt2 cat -r 0 large
abort: integrity check failed on data/large.i:0!
[255]
Matt Harbison
test-lfs: drop an unresolved issue note, now that lfs.track=none() is a thing
r35667 lfs -> normal -> lfs round trip conversions are possible. The 'none()'
predicate on the command line will override whatever is configured globally and
locally, and ensures everything converts to a regular file. For lfs -> normal,
Matt Harbison
lfs: add a repo requirement for this extension when converting to lfs...
r35170 there's no 'lfs' destination repo requirement. For normal -> lfs, there is.
Matt Harbison
test-lfs: drop an unresolved issue note, now that lfs.track=none() is a thing
r35667 $ hg --config extensions.convert= --config 'lfs.track=none()' \
Matt Harbison
lfs: add a repo requirement for this extension when converting to lfs...
r35170 > convert repo8 convert_normal
initializing destination convert_normal repository
scanning source...
sorting...
converting...
2 a
1 b
0 meta
$ grep 'lfs' convert_normal/.hg/requires
[1]
Matt Harbison
lfs: allow the pointer file to be viewed with `hg cat -T '{rawdata}'`...
r35681 $ hg --cwd convert_normal cat a1 -r 0 -T '{rawdata}'
Matt Harbison
lfs: add a repo requirement for this extension when converting to lfs...
r35170 THIS-IS-LFS-BECAUSE-10-BYTES
$ hg --config extensions.convert= --config lfs.threshold=10B \
> convert convert_normal convert_lfs
initializing destination convert_lfs repository
scanning source...
sorting...
converting...
2 a
1 b
0 meta
Matt Harbison
lfs: allow the pointer file to be viewed with `hg cat -T '{rawdata}'`...
r35681
$ hg --cwd convert_lfs cat -r 0 a1 -T '{rawdata}'
version https://git-lfs.github.com/spec/v1
oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
size 29
x-is-binary 0
Matt Harbison
lfs: add a repo requirement for this extension when converting to lfs...
r35170 $ hg --cwd convert_lfs debugdata a1 0
version https://git-lfs.github.com/spec/v1
oid sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
size 29
x-is-binary 0
Matt Harbison
lfs: rename {pointer} to {lfspointer}...
r35815 $ hg --cwd convert_lfs log -r 0 -T "{lfs_files % '{lfspointer % '{key}={value}\n'}'}"
Matt Harbison
lfs: add the '{lfsattrs}' template keyword to '{lfs_files}'...
r35749 version=https://git-lfs.github.com/spec/v1
oid=sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
size=29
x-is-binary=0
$ hg --cwd convert_lfs log -r 0 \
Matt Harbison
lfs: rename {pointer} to {lfspointer}...
r35815 > -T '{lfs_files % "{get(lfspointer, "oid")}\n"}{lfs_files % "{lfspointer.oid}\n"}'
Matt Harbison
lfs: add the '{lfsattrs}' template keyword to '{lfs_files}'...
r35749 sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
Matt Harbison
lfs: rename {pointer} to {lfspointer}...
r35815 $ hg --cwd convert_lfs log -r 0 -T '{lfs_files % "{lfspointer}\n"}'
Matt Harbison
lfs: add the '{lfsattrs}' template keyword to '{lfs_files}'...
r35749 version=https://git-lfs.github.com/spec/v1 oid=sha256:5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024 size=29 x-is-binary=0
Matt Harbison
lfs: add the '{oid}' template keyword to '{lfs_files}'...
r35676 $ hg --cwd convert_lfs \
Matt Harbison
lfs: rename {oid} to {lfsoid}...
r35816 > log -r 'all()' -T '{rev}: {lfs_files % "{file}: {lfsoid}\n"}'
Matt Harbison
lfs: add the '{oid}' template keyword to '{lfs_files}'...
r35676 0: a1: 5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
1: a2: 5bb8341bee63b3649f222b2215bde37322bea075a30575aa685d8f8d21c77024
2: a2: 876dadc86a8542f9798048f2c47f51dbf8e4359aed883e8ec80c5db825f0d943
Matt Harbison
lfs: convert '{lfs_files}' keyword to a hybrid list...
r35675
Matt Harbison
lfs: add a repo requirement for this extension when converting to lfs...
r35170 $ grep 'lfs' convert_lfs/.hg/requires
lfs
Matt Harbison
test-lfs: add tests to show that hashes remain unchanged by conversions...
r35668 The hashes in all stages of the conversion are unchanged.
$ hg -R repo8 log -T '{node|short}\n'
0fae949de7fa
9cd6bdffdac0
7f96794915f7
$ hg -R convert_normal log -T '{node|short}\n'
0fae949de7fa
9cd6bdffdac0
7f96794915f7
$ hg -R convert_lfs log -T '{node|short}\n'
0fae949de7fa
9cd6bdffdac0
7f96794915f7
Matt Harbison
lfs: add a repo requirement for this extension when converting to lfs...
r35170 This convert is trickier, because it contains deleted files (via `hg mv`)
$ hg --config extensions.convert= --config lfs.threshold=1000M \
> convert repo3 convert_normal2
initializing destination convert_normal2 repository
scanning source...
sorting...
converting...
4 commit with lfs content
3 renames
2 large to small, small to large
1 random modifications
0 switch large and small again
$ grep 'lfs' convert_normal2/.hg/requires
[1]
$ hg --cwd convert_normal2 debugdata large 0
LONGER-THAN-TEN-BYTES-WILL-TRIGGER-LFS
$ hg --config extensions.convert= --config lfs.threshold=10B \
> convert convert_normal2 convert_lfs2
initializing destination convert_lfs2 repository
scanning source...
sorting...
converting...
4 commit with lfs content
3 renames
2 large to small, small to large
1 random modifications
0 switch large and small again
$ grep 'lfs' convert_lfs2/.hg/requires
lfs
$ hg --cwd convert_lfs2 debugdata large 0
version https://git-lfs.github.com/spec/v1
oid sha256:66100b384bf761271b407d79fc30cdd0554f3b2c5d944836e936d584b88ce88e
size 39
x-is-binary 0
Matt Harbison
lfs: enable the extension locally after converting to an 'lfs' repo...
r35216
$ hg -R convert_lfs2 config --debug extensions | grep lfs
$TESTTMP/convert_lfs2/.hg/hgrc:*: extensions.lfs= (glob)
Jun Wu
lfs: fix committing deleted files caused by e0a1b9ee93cd...
r35468
Committing deleted files works:
$ hg init $TESTTMP/repo-del
$ cd $TESTTMP/repo-del
$ echo 1 > A
$ hg commit -m 'add A' -A A
$ hg rm A
$ hg commit -m 'rm A'
Matt Harbison
lfs: control tracked file selection via a tracked file...
r35683
Bad .hglfs files will block the commit with a useful message
$ cat > .hglfs << EOF
> [track]
> **.test = size(">5B")
> bad file ... no commit
> EOF
$ echo x > file.txt
$ hg ci -Aqm 'should fail'
hg: parse error at .hglfs:3: bad file ... no commit
[255]
$ cat > .hglfs << EOF
> [track]
> **.test = size(">5B")
> ** = nonexistent()
> EOF
$ hg ci -Aqm 'should fail'
abort: parse error in .hglfs: unknown identifier: nonexistent
[255]
'**' works out to mean all files.
$ cat > .hglfs << EOF
> [track]
Matt Harbison
lfs: don't automatically exclude '.hg*' files from external tracking...
r35817 > path:.hglfs = none()
Matt Harbison
lfs: control tracked file selection via a tracked file...
r35683 > **.test = size(">5B")
> **.exclude = none()
> ** = size(">10B")
> EOF
Matt Harbison
lfs: don't require the .hglfs file to be tracked to control the policy...
r35825 The LFS policy takes effect without tracking the .hglfs file
Matt Harbison
lfs: control tracked file selection via a tracked file...
r35683
$ echo 'largefile' > lfs.test
$ echo '012345678901234567890' > nolfs.exclude
$ echo '01234567890123456' > lfs.catchall
Matt Harbison
lfs: don't require the .hglfs file to be tracked to control the policy...
r35825 $ hg add *
$ hg ci -qm 'before add .hglfs'
Matt Harbison
lfs: rename {oid} to {lfsoid}...
r35816 $ hg log -r . -T '{rev}: {lfs_files % "{file}: {lfsoid}\n"}\n'
Matt Harbison
lfs: control tracked file selection via a tracked file...
r35683 2: lfs.catchall: d4ec46c2869ba22eceb42a729377432052d9dd75d82fc40390ebaadecee87ee9
lfs.test: 5489e6ced8c36a7b267292bde9fd5242a5f80a7482e8f23fa0477393dfaa4d6c
Matt Harbison
lfs: don't require the .hglfs file to be tracked to control the policy...
r35825 The .hglfs file works when tracked
Matt Harbison
lfs: control tracked file selection via a tracked file...
r35683
$ echo 'largefile2' > lfs.test
$ echo '012345678901234567890a' > nolfs.exclude
$ echo '01234567890123456a' > lfs.catchall
Matt Harbison
lfs: don't require the .hglfs file to be tracked to control the policy...
r35825 $ hg ci -Aqm 'after adding .hglfs'
Matt Harbison
lfs: rename {oid} to {lfsoid}...
r35816 $ hg log -r . -T '{rev}: {lfs_files % "{file}: {lfsoid}\n"}\n'
Matt Harbison
lfs: control tracked file selection via a tracked file...
r35683 3: lfs.catchall: 31f43b9c62b540126b0ad5884dc013d21a61c9329b77de1fceeae2fc58511573
lfs.test: 8acd23467967bc7b8cc5a280056589b0ba0b17ff21dbd88a7b6474d6290378a6
Matt Harbison
lfs: don't require the .hglfs file to be tracked to control the policy...
r35825 The LFS policy stops when the .hglfs is gone
Matt Harbison
lfs: control tracked file selection via a tracked file...
r35683
Matt Harbison
lfs: add a fileset for detecting lfs files...
r36008 $ mv .hglfs .hglfs_
Matt Harbison
lfs: control tracked file selection via a tracked file...
r35683 $ echo 'largefile3' > lfs.test
$ echo '012345678901234567890abc' > nolfs.exclude
$ echo '01234567890123456abc' > lfs.catchall
$ hg ci -qm 'file test' -X .hglfs
Matt Harbison
lfs: rename {oid} to {lfsoid}...
r35816 $ hg log -r . -T '{rev}: {lfs_files % "{file}: {lfsoid}\n"}\n'
Matt Harbison
lfs: don't require the .hglfs file to be tracked to control the policy...
r35825 4:
Matt Harbison
lfs: control tracked file selection via a tracked file...
r35683
Matt Harbison
lfs: add a fileset for detecting lfs files...
r36008 $ mv .hglfs_ .hglfs
$ echo '012345678901234567890abc' > lfs.test
$ hg ci -m 'back to lfs'
$ hg rm lfs.test
$ hg ci -qm 'remove lfs'
Matt Harbison
lfs: teach '{lfs_files}' to handle removed files
r36017 {lfs_files} will list deleted files too
$ hg log -T "{lfs_files % '{rev} {file}: {lfspointer.oid}\n'}"
6 lfs.test:
5 lfs.test: sha256:43f8f41171b6f62a6b61ba4ce98a8a6c1649240a47ebafd43120aa215ac9e7f6
3 lfs.catchall: sha256:31f43b9c62b540126b0ad5884dc013d21a61c9329b77de1fceeae2fc58511573
3 lfs.test: sha256:8acd23467967bc7b8cc5a280056589b0ba0b17ff21dbd88a7b6474d6290378a6
2 lfs.catchall: sha256:d4ec46c2869ba22eceb42a729377432052d9dd75d82fc40390ebaadecee87ee9
2 lfs.test: sha256:5489e6ced8c36a7b267292bde9fd5242a5f80a7482e8f23fa0477393dfaa4d6c
Matt Harbison
lfs: add a fileset for detecting lfs files...
r36008 $ hg log -r 'file("set:lfs()")' -T '{rev} {join(lfs_files, ", ")}\n'
2 lfs.catchall, lfs.test
3 lfs.catchall, lfs.test
5 lfs.test
Matt Harbison
lfs: teach the 'lfs()' fileset to handle removed files...
r36018 6 lfs.test
Matt Harbison
lfs: add a fileset for detecting lfs files...
r36008
Matt Harbison
test-lfs: add tests covering local exchanges...
r35518 $ cd ..
Matt Harbison
lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs...
r35520 Unbundling adds a requirement to a non-lfs repo, if necessary.
Matt Harbison
test-lfs: add tests covering local exchanges...
r35518
$ hg bundle -R $TESTTMP/repo-del -qr 0 --base null nolfs.hg
$ hg bundle -R convert_lfs2 -qr tip --base null lfs.hg
$ hg init unbundle
$ hg pull -R unbundle -q nolfs.hg
$ grep lfs unbundle/.hg/requires
[1]
$ hg pull -R unbundle -q lfs.hg
$ grep lfs unbundle/.hg/requires
Matt Harbison
lfs: add the 'lfs' requirement in the changegroup transaction introducing lfs...
r35520 lfs
Matt Harbison
test-lfs: add tests covering local exchanges...
r35518
$ hg init no_lfs
$ cat >> no_lfs/.hg/hgrc <<EOF
> [experimental]
> changegroup3 = True
> [extensions]
> lfs=!
> EOF
$ cp -R no_lfs no_lfs2
Pushing from a local lfs repo to a local repo without an lfs requirement and
with lfs disabled, fails.
$ hg push -R convert_lfs2 no_lfs
pushing to no_lfs
abort: required features are not supported in the destination: lfs
[255]
$ grep lfs no_lfs/.hg/requires
[1]
Pulling from a local lfs repo to a local repo without an lfs requirement and
with lfs disabled, fails.
$ hg pull -R no_lfs2 convert_lfs2
pulling from convert_lfs2
abort: required features are not supported in the destination: lfs
[255]
$ grep lfs no_lfs2/.hg/requires
[1]