largefiles: prevent committing a missing largefile

Previously, if the largefile was deleted at the time of a commit, the standin
was silently not updated and its current state (possibly garbage) was recorded.
The test makes it look like this is somewhat of an edge case, but the same thing
happens when an `hg revert` followed by `rm` changes the standin.

Aside from the second invocation of this in lfutil.updatestandinsbymatch()
(which is what triggers this test case), the three other uses are guarded by
dirstate checks for added or modified, or an existence check in the filesystem.
So aborting in lfutil.updatestandins() should be safe, and will avoid silent
skips in the future if this is used elsewhere.
This commit is contained in:
Matt Harbison 2016-01-24 00:10:19 -05:00
parent db82034373
commit 6d46368119
2 changed files with 8 additions and 0 deletions

View File

@ -319,6 +319,8 @@ def updatestandin(repo, standin):
hash = hashfile(file)
executable = getexecutable(file)
writestandin(repo, standin, hash, executable)
else:
raise error.Abort(_('%s: file not found!') % splitstandin(standin))
def readstandin(repo, filename, node=None):
'''read hex hash from standin for filename at given node, or working

View File

@ -19,6 +19,12 @@ Create source repo, and commit adding largefile.
$ hg rm large
$ hg commit -m 'branchhead without largefile' large
$ hg up -qr 0
$ rm large
$ echo "0000000000000000000000000000000000000000" > .hglf/large
$ hg commit -m 'commit missing file with corrupt standin' large
abort: large: file not found!
[255]
$ hg up -Cqr 0
$ cd ..
Discard all cached largefiles in USERCACHE