This is an archive of the discontinued Mercurial Phabricator instance.

Differential D111

undo: file corruption handling
ClosedPublic

Authored by felixmerk on Jul 17 2017, 4:01 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX6cd419e19c1f: undo: file corruption handling
Summary

Basic file corruption handling: if file is corrupted, we nuke our history.
Downside is that we won't be able to undo furter back in case of a corruption,
but considering corruption this is expected.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

felixmerk created this revision.Jul 17 2017, 4:01 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 17 2017, 4:01 PM
felixmerk updated this revision to Diff 319.Jul 19 2017, 5:31 PM
quark accepted this revision.Jul 19 2017, 6:33 PM
quark added a subscriber: quark.
quark added inline comments.
tests/test-undo.t
411

Maybe add --debug checking the debug message to make sure the code path runs.

This revision is now accepted and ready to land.Jul 19 2017, 6:33 PM
felixmerk updated this revision to Diff 327.Jul 19 2017, 8:45 PM
Closed by commit rFBHGX6cd419e19c1f: undo: file corruption handling (authored by felixmerk). · Explain WhyJul 19 2017, 10:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/undo.py (24 lines)
Mtests/test-undo.t (11 lines)

Diff 336

hgext3rd/undo.py

def _logindex(repo, tr, nodes): def _logindex(repo, tr, nodes):
revstring = "\n".join(sorted('%s %s' % (k, v) for k, v in nodes.items())) revstring = "\n".join(sorted('%s %s' % (k, v) for k, v in nodes.items()))
return writelog(repo, tr, "index.i", revstring) return writelog(repo, tr, "index.i", revstring)
def _logundoredoindex(repo, tr, reverseindex): def _logundoredoindex(repo, tr, reverseindex):
rlog = _getrevlog(repo, 'index.i') rlog = _getrevlog(repo, 'index.i')
hexnode = hex(rlog.node(_invertindex(rlog, reverseindex))) hexnode = hex(rlog.node(_invertindex(rlog, reverseindex)))
return repo.svfs.write("undolog/redonode", str(hexnode)) return repo.vfs.write("undolog/redonode", str(hexnode))
def _delundoredo(repo): def _delundoredo(repo):
path = 'undolog' + '/' + 'redonode' path = 'undolog' + '/' + 'redonode'
repo.svfs.tryunlink(path) repo.vfs.tryunlink(path)
def _recordnewgap(repo, absoluteindex=None): def _recordnewgap(repo, absoluteindex=None):
path = 'undolog' + '/' + 'gap' path = 'undolog' + '/' + 'gap'
if absoluteindex is None: if absoluteindex is None:
rlog = _getrevlog(repo, 'index.i') rlog = _getrevlog(repo, 'index.i')
repo.svfs.write(path, str(len(rlog) - 1)) repo.vfs.write(path, str(len(rlog) - 1))
else: else:
repo.svfs.write(path, str(absoluteindex)) repo.vfs.write(path, str(absoluteindex))
# Read # Read
def _readindex(repo, reverseindex, prefetchedrevlog=None): def _readindex(repo, reverseindex, prefetchedrevlog=None):
if prefetchedrevlog is None: if prefetchedrevlog is None:
rlog = _getrevlog(repo, 'index.i') rlog = _getrevlog(repo, 'index.i')
else: else:
rlog = prefetchedrevlog rlog = prefetchedrevlog
rlog = _getrevlog(repo, filename) rlog = _getrevlog(repo, filename)
return rlog.revision(bin(hexnode)) return rlog.revision(bin(hexnode))
def _gapcheck(repo, reverseindex): def _gapcheck(repo, reverseindex):
rlog = _getrevlog(repo, 'index.i') rlog = _getrevlog(repo, 'index.i')
absoluteindex = _invertindex(rlog, reverseindex) absoluteindex = _invertindex(rlog, reverseindex)
path = 'undolog' + '/' + 'gap' path = 'undolog' + '/' + 'gap'
try: try:
result = absoluteindex >= int(repo.svfs.read(path)) result = absoluteindex >= int(repo.vfs.read(path))
except IOError: except IOError:
# recreate file # recreate file
repo.ui.debug("failed to read gap file in %s, attempting recreation\n" repo.ui.debug("failed to read gap file in %s, attempting recreation\n"
% path) % path)
rlog = _getrevlog(repo, 'index.i') rlog = _getrevlog(repo, 'index.i')
i = 0 i = 0
while i < (len(rlog)): while i < (len(rlog)):
indexdict = _readindex(repo, i, rlog) indexdict = _readindex(repo, i, rlog)
reverseindex) reverseindex)
smarthide(repo, addedrevs, removedrevs) smarthide(repo, addedrevs, removedrevs)
revealcommits(repo, removedrevs) revealcommits(repo, removedrevs)
def _computerelative(repo, reverseindex): def _computerelative(repo, reverseindex):
# allows for relative undos using # allows for relative undos using
# redonode storage # redonode storage
try: try:
hexnode = repo.svfs.read("undolog/redonode") hexnode = repo.vfs.read("undolog/redonode")
rlog = _getrevlog(repo, 'index.i') rlog = _getrevlog(repo, 'index.i')
rev = rlog.rev(bin(hexnode)) rev = rlog.rev(bin(hexnode))
reverseindex = _invertindex(rlog, rev) + reverseindex reverseindex = _invertindex(rlog, rev) + reverseindex
except IOError: except IOError:
# return input index # return input index
pass pass
return reverseindex return reverseindex
# Tools # Tools
def _invertindex(rlog, indexorreverseindex): def _invertindex(rlog, indexorreverseindex):
return len(rlog) - 1 - indexorreverseindex return len(rlog) - 1 - indexorreverseindex
def _getrevlog(repo, filename): def _getrevlog(repo, filename):
path = 'undolog/' + filename path = 'undolog/' + filename
try:
return revlog.revlog(repo.vfs, path)
except error.RevlogError:
# corruption: for now, we can simply nuke all files
# TODO: log to Scuba
repo.ui.debug("caught revlog error. %s was probably corrupted\n" % path)
repo.vfs.rmtree('undolog')
repo.vfs.makedirs('undolog')
# if we get the error a second time
# then someone is actively messing with these files
return revlog.revlog(repo.vfs, path) return revlog.revlog(repo.vfs, path)

tests/test-undo.t

d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'} d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea d0fdb9510dbf78c1a7e62c3e6628ff1f978f87ea 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'}
75f63379f12bf02d40fe7444587ad67be9ae81b8 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'} 75f63379f12bf02d40fe7444587ad67be9ae81b8 75f63379f12bf02d40fe7444587ad67be9ae81b8 0 (Thu Jan 01 00:00:01 1970 +0000) {'operation': 'revive', 'user': 'test'}
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [extensions] > [extensions]
> smartlog =! > smartlog =!
> tweakdefaults =! > tweakdefaults =!
> fbamend =! > fbamend =!
> EOF > EOF
File corruption handling
$ echo 111corruptedrevlog > .hg/undolog/index.i
#if chg
(note: chg has issues with the below test)
#else
quarkUnsubmitted
Not Done

Maybe add --debug checking the debug message to make sure the code path runs.

quark: Maybe add `--debug` checking the debug message to make sure the code path runs.
$ hg st --debug
caught revlog error. undolog/index.i was probably corrupted
#endif
$ hg debugundohistory -l
0: -- gap in log --