This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4715

filelog: store filename directly on revlog instance
ClosedPublic

Authored by indygreg on Sep 24 2018, 12:12 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG96838b620b9c: filelog: store filename directly on revlog instance
Summary

This attribute is only used by LFS. It is used by one of the revlog
flag processor functions, which gets an instance of the revlog - not
the file storage type. So, it makes sense to store this attribute on
the revlog instead of the filelog.

With this change, I'm pretty confident that LFS is no longer directly
accessing file storage interface members that are revlog centric. i.e.
it gets us one step closer to eliminating revlog-centric APIs from the
file storage interface!

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.

Revision Contents
Changeset List

PathPackages
Mhgext/lfs/wrapper.py (2 lines)
Mmercurial/filelog.py (11 lines)

Diff 11387

hgext/lfs/wrapper.py

if lfstrack: if lfstrack:
textlen = len(text) textlen = len(text)
# exclude hg rename meta from file size # exclude hg rename meta from file size
meta, offset = revlog.parsemeta(text) meta, offset = revlog.parsemeta(text)
if offset: if offset:
textlen -= offset textlen -= offset
if lfstrack(self.filename, textlen): if lfstrack(self._revlog.filename, textlen):
flags |= revlog.REVIDX_EXTSTORED flags |= revlog.REVIDX_EXTSTORED
return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta, return orig(self, text, transaction, link, p1, p2, cachedelta=cachedelta,
node=node, flags=flags, **kwds) node=node, flags=flags, **kwds)
def filelogrenamed(orig, self, node): def filelogrenamed(orig, self, node):
if _islfs(self, node): if _islfs(self, node):
rawtext = self._revlog.revision(node, raw=True) rawtext = self._revlog.revision(node, raw=True)

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. # Used by LFS.
self.filename = path self._revlog.filename = path
# Used by repo upgrade. # Used by repo upgrade.
self.index = self._revlog.index self.index = self._revlog.index
# Used by changegroup generation. # 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)
return True return True
def verifyintegrity(self, state): def verifyintegrity(self, state):
return self._revlog.verifyintegrity(state) return self._revlog.verifyintegrity(state)
# TODO these aren't part of the interface and aren't internal methods. # TODO these aren't part of the interface and aren't internal methods.
# Callers should be fixed to not use them. # Callers should be fixed to not use them.
# Used by LFS.
@property
def filename(self):
return self._revlog.filename
@filename.setter
def filename(self, value):
self._revlog.filename = value
# Used by bundlefilelog, unionfilelog. # Used by bundlefilelog, unionfilelog.
@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