This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4661

filelog: record what's using attributes
ClosedPublic

Authored by indygreg on Sep 18 2018, 10:34 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG76f92d208f7a: filelog: record what's using attributes
Summary

filelog and the file storage interface have some attributes that
ideally shouldn't be there. This commit annotates some of those
attributes with their users so we know where to look when it comes
time to removing them.

This exercise exposed a theme: many attributes are used by LFS,
repo upgrade, verify, and special repo types (like bundlerepo). That
points to missing abstractions on file storage to facilitate these
special needs.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Sep 18 2018, 10:34 PM
Closed by commit rHG76f92d208f7a: filelog: record what's using attributes (authored by indygreg). · Explain WhySep 23 2018, 6:26 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/filelog.py (22 lines)

Diff 11195

mercurial/filelog.py

) )
@interfaceutil.implementer(repository.ifilestorage) @interfaceutil.implementer(repository.ifilestorage)
class filelog(object): class filelog(object):
def __init__(self, opener, path): def __init__(self, opener, path):
self._revlog = revlog.revlog(opener, self._revlog = revlog.revlog(opener,
'/'.join(('data', path + '.i')), '/'.join(('data', path + '.i')),
censorable=True) censorable=True)
# full name of the user visible file, relative to the repository root # Full name of the user visible file, relative to the repository root.
# Used by LFS.
self.filename = path self.filename = path
# Used by repo upgrade.
self.index = self._revlog.index self.index = self._revlog.index
# Used by verify.
self.version = self._revlog.version self.version = self._revlog.version
# Used by changegroup generation.
self._generaldelta = self._revlog._generaldelta self._generaldelta = self._revlog._generaldelta
def __len__(self): def __len__(self):
return len(self._revlog) return len(self._revlog)
def __iter__(self): def __iter__(self):
return self._revlog.__iter__() return self._revlog.__iter__()
return self._revlog.node(rev) return self._revlog.node(rev)
def lookup(self, node): def lookup(self, node):
return self._revlog.lookup(node) return self._revlog.lookup(node)
def linkrev(self, rev): def linkrev(self, rev):
return self._revlog.linkrev(rev) return self._revlog.linkrev(rev)
# Used by LFS, verify.
def flags(self, rev): def flags(self, rev):
return self._revlog.flags(rev) return self._revlog.flags(rev)
def commonancestorsheads(self, node1, node2): def commonancestorsheads(self, node1, node2):
return self._revlog.commonancestorsheads(node1, node2) return self._revlog.commonancestorsheads(node1, node2)
# Used by dagop.blockdescendants().
def descendants(self, revs): def descendants(self, revs):
return self._revlog.descendants(revs) return self._revlog.descendants(revs)
# Used by hgweb.
def headrevs(self): def headrevs(self):
return self._revlog.headrevs() return self._revlog.headrevs()
def heads(self, start=None, stop=None): def heads(self, start=None, stop=None):
return self._revlog.heads(start, stop) return self._revlog.heads(start, stop)
# Used by hgweb, children extension.
def children(self, node): def children(self, node):
return self._revlog.children(node) return self._revlog.children(node)
def deltaparent(self, rev): def deltaparent(self, rev):
return self._revlog.deltaparent(rev) return self._revlog.deltaparent(rev)
def iscensored(self, rev): def iscensored(self, rev):
return self._revlog.iscensored(rev) return self._revlog.iscensored(rev)
# Used by verify.
def rawsize(self, rev): def rawsize(self, rev):
return self._revlog.rawsize(rev) return self._revlog.rawsize(rev)
# Might be unused.
def checkhash(self, text, node, p1=None, p2=None, rev=None): def checkhash(self, text, node, p1=None, p2=None, rev=None):
return self._revlog.checkhash(text, node, p1=p1, p2=p2, rev=rev) return self._revlog.checkhash(text, node, p1=p1, p2=p2, rev=rev)
def revision(self, node, _df=None, raw=False): def revision(self, node, _df=None, raw=False):
return self._revlog.revision(node, _df=_df, raw=raw) return self._revlog.revision(node, _df=_df, raw=raw)
def revdiff(self, rev1, rev2): def revdiff(self, rev1, rev2):
return self._revlog.revdiff(rev1, rev2) return self._revlog.revdiff(rev1, rev2)
return self._revlog.strip(minlink, transaction) return self._revlog.strip(minlink, transaction)
def censorrevision(self, tr, node, tombstone=b''): def censorrevision(self, tr, node, tombstone=b''):
return self._revlog.censorrevision(node, tombstone=tombstone) return self._revlog.censorrevision(node, tombstone=tombstone)
def files(self): def files(self):
return self._revlog.files() return self._revlog.files()
# Used by verify.
def checksize(self): def checksize(self):
return self._revlog.checksize() return self._revlog.checksize()
def read(self, node): def read(self, node):
t = self.revision(node) t = self.revision(node)
if not t.startswith('\1\n'): if not t.startswith('\1\n'):
return t return t
s = t.index('\1\n', 2) s = t.index('\1\n', 2)
# renaming a file produces a different hash, even if the data # renaming a file produces a different hash, even if the data
# remains unchanged. Check if it's the case (slow): # remains unchanged. Check if it's the case (slow):
if self.renamed(node): if self.renamed(node):
t2 = self.read(node) t2 = self.read(node)
return t2 != text return t2 != text
return True return True
# TODO these aren't part of the interface and aren't internal methods.
# Callers should be fixed to not use them.
# Used by LFS.
@property @property
def filename(self): def filename(self):
return self._revlog.filename return self._revlog.filename
@filename.setter @filename.setter
def filename(self, value): def filename(self, value):
self._revlog.filename = value self._revlog.filename = value
# TODO these aren't part of the interface and aren't internal methods. # Used by bundlefilelog, unionfilelog.
# Callers should be fixed to not use them.
@property @property
def indexfile(self): def indexfile(self):
return self._revlog.indexfile return self._revlog.indexfile
@indexfile.setter @indexfile.setter
def indexfile(self, value): def indexfile(self, value):
self._revlog.indexfile = value self._revlog.indexfile = value
# Used by LFS, repo upgrade.
@property @property
def opener(self): def opener(self):
return self._revlog.opener return self._revlog.opener
# Used by repo upgrade.
def clone(self, tr, destrevlog, **kwargs): def clone(self, tr, destrevlog, **kwargs):
if not isinstance(destrevlog, filelog): if not isinstance(destrevlog, filelog):
raise error.ProgrammingError('expected filelog to clone()') raise error.ProgrammingError('expected filelog to clone()')
return self._revlog.clone(tr, destrevlog._revlog, **kwargs) return self._revlog.clone(tr, destrevlog._revlog, **kwargs)
class narrowfilelog(filelog): class narrowfilelog(filelog):
"""Filelog variation to be used with narrow stores.""" """Filelog variation to be used with narrow stores."""