This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6148

store: error out if fncache does not ends with a newline
ClosedPublic

Authored by pulkit on Mar 18 2019, 9:57 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGa920a9e1795a: store: error out if fncache does not ends with a newline
Summary

If fncache does not ends with a newline, chunk will not be fully consumed. It
should be a bug somewhere or the fncache is corrupted if that happens. Let's
error out in such cases.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Mar 18 2019, 9:57 AM
martinvonz added a subscriber: martinvonz.Mar 18 2019, 7:20 PM
martinvonz added inline comments.
mercurial/store.py
485

I'll s/ends/end/ in flight

Closed by commit rHGa920a9e1795a: store: error out if fncache does not ends with a newline (authored by pulkit). · Explain WhyMar 18 2019, 7:35 PM
This revision was automatically updated to reflect the committed changes.
mharbison72 added a subscriber: mharbison72.Mar 18 2019, 9:40 PM

Is there something that can be done to repair this, that should be suggested in the hint? I've seen fncache errors in the context of a corrupt repo, but I'm not sure what an end user would do with this message.

martinvonz added a comment.Mar 18 2019, 10:45 PM

Good point. Isn't there a debug command for rebuilding it? We can add a
hint about that.

Revision Contents
Changeset List

PathPackages
Mmercurial/store.py (2 lines)

Diff 14543

mercurial/store.py

p = chunk.rindex(b'\n') p = chunk.rindex(b'\n')
self.entries.update(decodedir(chunk[:p + 1]).splitlines()) self.entries.update(decodedir(chunk[:p + 1]).splitlines())
chunk = chunk[p + 1:] chunk = chunk[p + 1:]
except ValueError: except ValueError:
# substring '\n' not found, maybe the entry is bigger than the # substring '\n' not found, maybe the entry is bigger than the
# chunksize, so let's keep iterating # chunksize, so let's keep iterating
pass pass
if chunk:
raise error.Abort(_("fncache does not ends with a newline"))
martinvonzUnsubmitted
Not Done

I'll s/ends/end/ in flight

martinvonz: I'll s/ends/end/ in flight
self._checkentries(fp) self._checkentries(fp)
fp.close() fp.close()
def _checkentries(self, fp): def _checkentries(self, fp):
""" make sure there is no empty string in entries """ """ make sure there is no empty string in entries """
if '' in self.entries: if '' in self.entries:
fp.seek(0) fp.seek(0)
for n, line in enumerate(util.iterfile(fp)): for n, line in enumerate(util.iterfile(fp)):