mirror of
https://github.com/facebook/sapling.git
synced 2024-10-12 09:48:05 +03:00
a0fdd80720
Summary: dirstate.drop() is used in two different situations. 1. To make a tracked file become untracked, and 2. To remove a file from the dirstate entirely. In the treestate case, this difference matters, so let's split drop into two functions, one to mark something as untracked, and the other to remove it entirely. In this first patch we just rename drop to untrack. The next patch will introduce the new delete function. Reviewed By: ikostia Differential Revision: D10317738 fbshipit-source-id: 85950ab1b1a10cd481edcfbba6da445b3dbf6397
59 lines
2.6 KiB
Python
59 lines
2.6 KiB
Python
# dirstatenonnormalcheck.py - extension to check the consistency of the
|
|
# dirstate's non-normal map
|
|
#
|
|
# For most operations on dirstate, this extensions checks that the nonnormalset
|
|
# contains the right entries.
|
|
# It compares the nonnormal file to a nonnormalset built from the map of all
|
|
# the files in the dirstate to check that they contain the same files.
|
|
|
|
from __future__ import absolute_import
|
|
|
|
from mercurial import dirstate, extensions
|
|
|
|
|
|
def nonnormalentries(dmap):
|
|
"""Compute nonnormal entries from dirstate's dmap"""
|
|
res = set()
|
|
for f, e in dmap.iteritems():
|
|
if e[0] != "n" or e[3] == -1:
|
|
res.add(f)
|
|
return res
|
|
|
|
|
|
def checkconsistency(ui, orig, dmap, _nonnormalset, label):
|
|
"""Compute nonnormalset from dmap, check that it matches _nonnormalset"""
|
|
nonnormalcomputedmap = nonnormalentries(dmap)
|
|
if _nonnormalset != nonnormalcomputedmap:
|
|
ui.develwarn("%s call to %s\n" % (label, orig), config="dirstate")
|
|
ui.develwarn("inconsistency in nonnormalset\n", config="dirstate")
|
|
ui.develwarn("[nonnormalset] %s\n" % _nonnormalset, config="dirstate")
|
|
ui.develwarn("[map] %s\n" % nonnormalcomputedmap, config="dirstate")
|
|
|
|
|
|
def _checkdirstate(orig, self, arg):
|
|
"""Check nonnormal set consistency before and after the call to orig"""
|
|
checkconsistency(self._ui, orig, self._map, self._map.nonnormalset, "before")
|
|
r = orig(self, arg)
|
|
checkconsistency(self._ui, orig, self._map, self._map.nonnormalset, "after")
|
|
return r
|
|
|
|
|
|
def extsetup(ui):
|
|
"""Wrap functions modifying dirstate to check nonnormalset consistency"""
|
|
dirstatecl = dirstate.dirstate
|
|
devel = ui.configbool("devel", "all-warnings")
|
|
paranoid = ui.configbool("experimental", "nonnormalparanoidcheck")
|
|
if devel:
|
|
extensions.wrapfunction(dirstatecl, "_writedirstate", _checkdirstate)
|
|
if paranoid:
|
|
# We don't do all these checks when paranoid is disable as it would
|
|
# make the extension run very slowly on large repos
|
|
extensions.wrapfunction(dirstatecl, "normallookup", _checkdirstate)
|
|
extensions.wrapfunction(dirstatecl, "otherparent", _checkdirstate)
|
|
extensions.wrapfunction(dirstatecl, "normal", _checkdirstate)
|
|
extensions.wrapfunction(dirstatecl, "write", _checkdirstate)
|
|
extensions.wrapfunction(dirstatecl, "add", _checkdirstate)
|
|
extensions.wrapfunction(dirstatecl, "remove", _checkdirstate)
|
|
extensions.wrapfunction(dirstatecl, "merge", _checkdirstate)
|
|
extensions.wrapfunction(dirstatecl, "untrack", _checkdirstate)
|