( )⚙ D11526 dirstate: move verification code within the dirstate itself

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11526

dirstate: move verification code within the dirstate itself
ClosedPublic

Authored by marmoute on Oct 1 2021, 5:38 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGc87844960a35: dirstate: move verification code within the dirstate itself
Summary

This move implementation details further down the stack and make it the
verification code easier to discover.

Diff Detail

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

Event Timeline

marmoute created this revision.Oct 1 2021, 5:38 AM
Alphare accepted this revision.Oct 1 2021, 11:19 AM
Alphare added a subscriber: Alphare.

This would indeed have been useful to know about months (years?) ago

This revision is now accepted and ready to land.Oct 1 2021, 11:19 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/debugcommands.py (21 lines)
Mmercurial/dirstate.py (19 lines)

Diff 30526

mercurial/debugcommands.py

@command(b'debugcheckstate', [], b'') @command(b'debugcheckstate', [], b'')
def debugcheckstate(ui, repo): def debugcheckstate(ui, repo):
"""validate the correctness of the current dirstate""" """validate the correctness of the current dirstate"""
parent1, parent2 = repo.dirstate.parents() parent1, parent2 = repo.dirstate.parents()
m1 = repo[parent1].manifest() m1 = repo[parent1].manifest()
m2 = repo[parent2].manifest() m2 = repo[parent2].manifest()
errors = 0 errors = 0
for f in repo.dirstate: for err in repo.dirstate.verify(m1, m2):
state = repo.dirstate[f] ui.warn(err[0] % err[1:])
if state in b"nr" and f not in m1:
ui.warn(_(b"%s in state %s, but not in manifest1\n") % (f, state))
errors += 1
if state in b"a" and f in m1:
ui.warn(_(b"%s in state %s, but also in manifest1\n") % (f, state))
errors += 1
if state in b"m" and f not in m1 and f not in m2:
ui.warn(
_(b"%s in state %s, but not in either manifest\n") % (f, state)
)
errors += 1
for f in m1:
state = repo.dirstate[f]
if state not in b"nrm":
ui.warn(_(b"%s in manifest1, but listed as state %s") % (f, state))
errors += 1 errors += 1
if errors: if errors:
errstr = _(b".hg/dirstate inconsistent with current parent's manifest") errstr = _(b".hg/dirstate inconsistent with current parent's manifest")
raise error.Abort(errstr) raise error.Abort(errstr)
@command( @command(
b'debugcolor', b'debugcolor',
[(b'', b'style', None, _(b'show all configured styles'))], [(b'', b'style', None, _(b'show all configured styles'))],

mercurial/dirstate.py

if util.samefile(o.join(backupname), o.join(filename)): if util.samefile(o.join(backupname), o.join(filename)):
o.unlink(backupname) o.unlink(backupname)
else: else:
o.rename(backupname, filename, checkambig=True) o.rename(backupname, filename, checkambig=True)
def clearbackup(self, tr, backupname): def clearbackup(self, tr, backupname):
'''Clear backup file''' '''Clear backup file'''
self._opener.unlink(backupname) self._opener.unlink(backupname)
def verify(self, m1, m2):
"""check the dirstate content again the parent manifest and yield errors"""
missing_from_p1 = b"%s in state %s, but not in manifest1\n"
unexpected_in_p1 = b"%s in state %s, but also in manifest1\n"
missing_from_ps = b"%s in state %s, but not in either manifest\n"
missing_from_ds = b"%s in manifest1, but listed as state %s\n"
for f, entry in self.items():
state = entry.state
if state in b"nr" and f not in m1:
yield (missing_from_p1, f, state)
if state in b"a" and f in m1:
yield (unexpected_in_p1, f, state)
if state in b"m" and f not in m1 and f not in m2:
yield (missing_from_ps, f, state)
for f in m1:
state = self.get_entry(f).state
if state not in b"nrm":
yield (missing_from_ds, f, state)