From patchwork Thu Sep 22 12:59:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [5, of, 9, V2] manifest: specify checkambig=True to revlog.__init__, to avoid ambiguity From: Katsunori FUJIWARA X-Patchwork-Id: 16753 Message-Id: To: mercurial-devel@mercurial-scm.org Date: Thu, 22 Sep 2016 21:59:24 +0900 # HG changeset patch # User FUJIWARA Katsunori # Date 1474548718 -32400 # Thu Sep 22 21:51:58 2016 +0900 # Node ID f41572305dfab3686526fcc3a1339689542b6b53 # Parent 770044f70593a8f3932e176784ed09e33d734ddf manifest: specify checkambig=True to revlog.__init__, to avoid ambiguity 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 00manifest.i (and close transaction) 2. discard appended data by truncation (strip or rollback) 3. append same size but different data to 00manifest.i again Therefore, cache validation doesn't work after (3) as expected. To avoid such file stat ambiguity around truncation, this patch specifies checkambig=True to revlog.__init__(). This makes revlog write changes out with checkambig=True. Even after this patch, avoiding file stat ambiguity of 00manifest.i around truncation isn't yet completed, because truncation side isn't aware of this issue. This is a part of ExactCacheValidationPlan. https://www.mercurial-scm.org/wiki/ExactCacheValidationPlan diff --git a/mercurial/manifest.py b/mercurial/manifest.py --- a/mercurial/manifest.py +++ b/mercurial/manifest.py @@ -927,7 +927,8 @@ class manifestrevlog(revlog.revlog): else: self._dirlogcache = {'': self} - super(manifestrevlog, self).__init__(opener, indexfile) + super(manifestrevlog, self).__init__(opener, indexfile, + checkambig=bool(dir)) @property def fulltextcache(self):