This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7143

largefiles: avoid dynamically subclassing context instances
ClosedPublic

Authored by martinvonz on Oct 19 2019, 3:38 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG7f4d58c21aec: largefiles: avoid dynamically subclassing context instances
Summary

E.g. copies.pathcopies() compares context objects for equality and
basectx.eq compares the type. But since largefiles was dynamically
creating classes, they would all be unequal. That led pathcopies(),
after some changes I made, to not short-circuit to get copy info only
from the dirstate. This patch fixes that short-circuiting (and other
places where context are being compared for equality).

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/largefiles/reposetup.py (70 lines)

Diff 18008

hgext/largefiles/reposetup.py

from __future__ import absolute_import from __future__ import absolute_import
import copy import copy
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial import ( from mercurial import (
error, error,
extensions,
localrepo, localrepo,
match as matchmod, match as matchmod,
scmutil, scmutil,
util, util,
) )
from . import ( from . import (
lfcommands, lfcommands,
# When lfstatus is set, return a context that gives the names # When lfstatus is set, return a context that gives the names
# of largefiles instead of their corresponding standins and # of largefiles instead of their corresponding standins and
# identifies the largefiles as always binary, regardless of # identifies the largefiles as always binary, regardless of
# their actual contents. # their actual contents.
def __getitem__(self, changeid): def __getitem__(self, changeid):
ctx = super(lfilesrepo, self).__getitem__(changeid) ctx = super(lfilesrepo, self).__getitem__(changeid)
if self.lfstatus: if self.lfstatus:
class lfilesctx(ctx.__class__): def files(orig):
def files(self): filenames = orig()
filenames = super(lfilesctx, self).files()
return [lfutil.splitstandin(f) or f for f in filenames] return [lfutil.splitstandin(f) or f for f in filenames]
def manifest(self): extensions.wrapfunction(ctx, 'files', files)
man1 = super(lfilesctx, self).manifest()
def manifest(orig):
man1 = orig()
class lfilesmanifest(man1.__class__): class lfilesmanifest(man1.__class__):
def __contains__(self, filename): def __contains__(self, filename):
orig = super(lfilesmanifest, self).__contains__ orig = super(lfilesmanifest, self).__contains__
return orig(filename) or orig( return orig(filename) or orig(
lfutil.standin(filename) lfutil.standin(filename)
) )
man1.__class__ = lfilesmanifest man1.__class__ = lfilesmanifest
return man1 return man1
def filectx(self, path, fileid=None, filelog=None): extensions.wrapfunction(ctx, 'manifest', manifest)
orig = super(lfilesctx, self).filectx
def filectx(orig, path, fileid=None, filelog=None):
try: try:
if filelog is not None: if filelog is not None:
result = orig(path, fileid, filelog) result = orig(path, fileid, filelog)
else: else:
result = orig(path, fileid) result = orig(path, fileid)
except error.LookupError: except error.LookupError:
# Adding a null character will cause Mercurial to # Adding a null character will cause Mercurial to
# identify this as a binary file. # identify this as a binary file.
if filelog is not None: if filelog is not None:
result = orig( result = orig(lfutil.standin(path), fileid, filelog)
lfutil.standin(path), fileid, filelog
)
else: else:
result = orig(lfutil.standin(path), fileid) result = orig(lfutil.standin(path), fileid)
olddata = result.data olddata = result.data
result.data = lambda: olddata() + b'\0' result.data = lambda: olddata() + b'\0'
return result return result
ctx.__class__ = lfilesctx extensions.wrapfunction(ctx, 'filectx', filectx)
return ctx return ctx
# Figure out the status of big files and insert them into the # Figure out the status of big files and insert them into the
# appropriate list in the result. Also removes standin files # appropriate list in the result. Also removes standin files
# from the listing. Revert to the original status if # from the listing. Revert to the original status if
# self.lfstatus is False. # self.lfstatus is False.
# XXX large file status is buggy when used on repo proxy. # XXX large file status is buggy when used on repo proxy.
# XXX this needs to be investigated. # XXX this needs to be investigated.