| Submitter | Katsunori FUJIWARA |
|---|---|
| Date | Sept. 16, 2016, 8:51 p.m. |
| Message ID | <2033102d2ea9b32e88b5.1474059069@feefifofum> |
| Download | mbox | patch |
| Permalink | /patch/16658/ |
| State | Changes Requested |
| Headers | show |
Comments
Patch
diff --git a/mercurial/changelog.py b/mercurial/changelog.py --- a/mercurial/changelog.py +++ b/mercurial/changelog.py @@ -382,9 +382,9 @@ class changelog(revlog.revlog): tmpname = self.indexfile + ".a" nfile = self.opener.open(tmpname) nfile.close() - self.opener.rename(tmpname, self.indexfile) + self.opener.rename(tmpname, self.indexfile, checkambig=True) elif self._delaybuf: - fp = self.opener(self.indexfile, 'a') + fp = self.opener(self.indexfile, 'a', checkambig=True) fp.write("".join(self._delaybuf)) fp.close() self._delaybuf = None
# HG changeset patch # User FUJIWARA Katsunori <foozy@lares.dti.ne.jp> # Date 1474057497 -32400 # Sat Sep 17 05:24:57 2016 +0900 # Node ID 2033102d2ea9b32e88b5289b4ad359b4e3e7b400 # Parent 55bd90d63ad3a76fd4d27d5eabb3fe9a7fa0642b changelog: specify checkambig=True to avoid ambiguity around truncation 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 00changelog.i (and close transaction) 2. discard appended data by truncation (strip or rollback) 3. append same size but different data to 00changelog.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 for renaming or opening to write changes out at finalization. Even after this patch, avoiding file stat ambiguity of 00changelog.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