Mercurial > public > mercurial-scm > hg

comparison mercurial/localrepo.py @ 40424:7caf632e30c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filecache: unimplement __set__() and __delete__() (API) Implementing __set__() implies that the descriptor can't be overridden by obj.__dict__, which means any property access involves slow function call. "Data descriptors with __set__() and __get__() defined always override a redefinition in an instance dictionary. In contrast, non-data descriptors can be overridden by instances." https://docs.python.org/2.7/reference/datamodel.html#invoking-descriptors This patch basically backs out 236bb604dc39, "scmutil: update cached copy when filecached attribute is assigned (issue3263)." The problem described in issue3263 (which is #3264 in Bugzilla) should no longer happen since repo._bookmarkcurrent has been moved to repo._bookmarks.active. We still have a risk of introducing similar bugs, but I think that's the cost we have to pay. $ hg perfrevset 'branch(tip)' -R mercurial (orig) wall 0.139511 comb 0.140000 user 0.140000 sys 0.000000 (best of 66) (prev) wall 0.114195 comb 0.110000 user 0.110000 sys 0.000000 (best of 81) (this) wall 0.099038 comb 0.110000 user 0.100000 sys 0.010000 (best of 93)
author Yuya Nishihara <yuya@tcha.org>
date Sat, 20 Oct 2018 17:56:00 +0900
parents 597bb5a6867f
children 473510bf0575
comparison
equal deleted inserted replaced
40423:597bb5a6867f 40424:7caf632e30c3
89 """All filecache usage on repo are done for logic that should be unfiltered 89 """All filecache usage on repo are done for logic that should be unfiltered
90 """ 90 """
91 def __get__(self, repo, type=None): 91 def __get__(self, repo, type=None):
92 if repo is None: 92 if repo is None:
93 return self 93 return self
94 # inlined the fast path as the cost of function call matters 94 # proxy to unfiltered __dict__ since filtered repo has no entry
95 unfi = repo.unfiltered() 95 unfi = repo.unfiltered()
96 try: 96 try:
97 return unfi.__dict__[self.sname] 97 return unfi.__dict__[self.sname]
98 except KeyError: 98 except KeyError:
99 pass 99 pass
100 return super(_basefilecache, self).__get__(unfi, type) 100 return super(_basefilecache, self).__get__(unfi, type)
101 def __set__(self, repo, value): 101
102 return super(_basefilecache, self).__set__(repo.unfiltered(), value) 102 def set(self, repo, value):
103 def __delete__(self, repo): 103 return super(_basefilecache, self).set(repo.unfiltered(), value)
104 return super(_basefilecache, self).__delete__(repo.unfiltered())
105 104
106 class repofilecache(_basefilecache): 105 class repofilecache(_basefilecache):
107 """filecache for files in .hg but outside of .hg/store""" 106 """filecache for files in .hg but outside of .hg/store"""
108 def __init__(self, *paths): 107 def __init__(self, *paths):
109 super(repofilecache, self).__init__(*paths) 108 super(repofilecache, self).__init__(*paths)