# HG changeset patch # User Matt Harbison # Date 2016-01-24 05:10:19 # Node ID 571ba161f6be9ad696efcdbcf8bdf0a8a6ba0766 # Parent ca8d2b73155d30d7402391cb48ab6727cd33f9e7 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. diff --git a/hgext/largefiles/lfutil.py b/hgext/largefiles/lfutil.py --- a/hgext/largefiles/lfutil.py +++ b/hgext/largefiles/lfutil.py @@ -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 diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t --- a/tests/test-largefiles-cache.t +++ b/tests/test-largefiles-cache.t @@ -19,6 +19,12 @@ Create source repo, and commit adding la $ 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