# HG changeset patch # User FUJIWARA Katsunori # Date 1474548720 -32400 # Node ID e38d85be978f28555b4f566e9a2c1f3b23494135 # Parent 557454ce854a8bca4120becfdcc34c6f41b8a7af repair: open a file with checkambig=True to avoid file stat ambiguity Before this patch, if steps below occurs at "the same time in sec", all of mtime, ctime and size are same between (1) and (3). 1. append data to revlog-style file (and close transaction) 2. discard appended data by truncation of strip 3. append same size but different data to revlog-style file again Therefore, cache validation doesn't work after (3) as expected. To avoid such file stat ambiguity around truncation, this patch opens a file with checkambig=True. This patch also introduces "with" statement style, to ensure immediate invocation of close() after truncation, because closing file is the only trigger to check (and get rid of) file stat ambiguity. This is a part of ExactCacheValidationPlan. https://www.mercurial-scm.org/wiki/ExactCacheValidationPlan diff -r 557454ce854a -r e38d85be978f mercurial/repair.py --- a/mercurial/repair.py Thu Sep 22 21:51:59 2016 +0900 +++ b/mercurial/repair.py Thu Sep 22 21:52:00 2016 +0900 @@ -181,7 +181,8 @@ for i in xrange(offset, len(tr.entries)): file, troffset, ignore = tr.entries[i] - repo.svfs(file, 'a').truncate(troffset) + with repo.svfs(file, 'a', checkambig=True) as fp: + fp.truncate(troffset) if troffset == 0: repo.store.markremoved(file)