| quark |
| Restricted Project |
Computing the hidden commits was showing up as a hot spot in hg status because
hg sparse was accessing the changelog through a filtered repo. This probably
affects many other commands since sparse touches so many places. Since it has no
need to use a filtered repo, let's just have it use unfiltered.
This shaved off 25-30% of the hg status time in some circumstances.
| Lint Skipped |
| Unit Tests Skipped |
| extensions.wrapfunction(mergemod, 'update', _update) | extensions.wrapfunction(mergemod, 'update', _update) | ||||
| def _setupcommit(ui): | def _setupcommit(ui): | ||||
| def _refreshoncommit(orig, self, node): | def _refreshoncommit(orig, self, node): | ||||
| """Refresh the checkout when commits touch .hgsparse | """Refresh the checkout when commits touch .hgsparse | ||||
| """ | """ | ||||
| orig(self, node) | orig(self, node) | ||||
| repo = self._repo | |||||
| # Use unfiltered to avoid computing hidden commits | |||||
| repo = self._repo.unfiltered() | |||||
| if util.safehasattr(repo, 'getsparsepatterns'): | if util.safehasattr(repo, 'getsparsepatterns'): | ||||
| ctx = repo[node] | ctx = repo[node] | ||||
| _, _, profiles = repo.getsparsepatterns(ctx.rev()) | _, _, profiles = repo.getsparsepatterns(ctx.rev()) | ||||
| if set(profiles) & set(ctx.files()): | if set(profiles) & set(ctx.files()): | ||||
| origstatus = repo.status() | origstatus = repo.status() | ||||
| origsparsematch = repo.sparsematch() | origsparsematch = repo.sparsematch() | ||||
| _refresh(repo.ui, repo, origstatus, origsparsematch, True) | _refresh(repo.ui, repo, origstatus, origsparsematch, True) | ||||
| current.add(line) | current.add(line) | ||||
| return includes, excludes, profiles | return includes, excludes, profiles | ||||
| def getsparsepatterns(self, rev): | def getsparsepatterns(self, rev): | ||||
| """Returns the include/exclude patterns specified by the | """Returns the include/exclude patterns specified by the | ||||
| given rev. | given rev. | ||||
| """ | """ | ||||
| # Use unfiltered to avoid computing hidden commits | |||||
| repo = self.unfiltered() | |||||
| if not self.vfs.exists('sparse'): | if not self.vfs.exists('sparse'): | ||||
| return set(), set(), [] | return set(), set(), [] | ||||
| if rev is None: | if rev is None: | ||||
| raise error.Abort(_("cannot parse sparse patterns from " + | raise error.Abort(_("cannot parse sparse patterns from " + | ||||
| "working copy")) | "working copy")) | ||||
| raw = self.vfs.read('sparse') | raw = self.vfs.read('sparse') | ||||
| includes, excludes, profiles = self.readsparseconfig(raw) | includes, excludes, profiles = self.readsparseconfig(raw) | ||||
| ctx = self[rev] | ctx = repo[rev] | ||||
| if profiles: | if profiles: | ||||
| visited = set() | visited = set() | ||||
| while profiles: | while profiles: | ||||
| profile = profiles.pop() | profile = profiles.pop() | ||||
| if profile in visited: | if profile in visited: | ||||
| continue | continue | ||||
| visited.add(profile) | visited.add(profile) | ||||
| profiles = visited | profiles = visited | ||||
| if includes: | if includes: | ||||
| includes.add('.hg*') | includes.add('.hg*') | ||||
| return includes, excludes, profiles | return includes, excludes, profiles | ||||
| def getrawprofile(self, profile, changeid): | def getrawprofile(self, profile, changeid): | ||||
| repo = self.unfiltered() | |||||
| try: | try: | ||||
| simplecache = extensions.find('simplecache') | simplecache = extensions.find('simplecache') | ||||
| node = self[changeid].hex() | |||||
| # Use unfiltered to avoid computing hidden commits | |||||
| node = repo[changeid].hex() | |||||
| def func(): | def func(): | ||||
| return self.filectx(profile, changeid=changeid).data() | return repo.filectx(profile, changeid=changeid).data() | ||||
| key = 'sparseprofile:%s:%s' % (profile.replace('/', '__'), node) | key = 'sparseprofile:%s:%s' % (profile.replace('/', '__'), node) | ||||
| return simplecache.memoize(func, key, | return simplecache.memoize(func, key, | ||||
| simplecache.stringserializer, self.ui) | simplecache.stringserializer, self.ui) | ||||
| except KeyError: | except KeyError: | ||||
| return self.filectx(profile, changeid=changeid).data() | return repo.filectx(profile, changeid=changeid).data() | ||||
| def sparsechecksum(self, filepath): | def sparsechecksum(self, filepath): | ||||
| fh = open(filepath) | fh = open(filepath) | ||||
| return hashlib.sha1(fh.read()).hexdigest() | return hashlib.sha1(fh.read()).hexdigest() | ||||
| def _sparsesignature(self, includetemp=True): | def _sparsesignature(self, includetemp=True): | ||||
| """Returns the signature string representing the contents of the | """Returns the signature string representing the contents of the | ||||
| current project sparse configuration. This can be used to cache the | current project sparse configuration. This can be used to cache the | ||||
| tempincludes = self.gettemporaryincludes() | tempincludes = self.gettemporaryincludes() | ||||
| result = forceincludematcher(result, tempincludes) | result = forceincludematcher(result, tempincludes) | ||||
| self.sparsecache[key] = result | self.sparsecache[key] = result | ||||
| return result | return result | ||||
| def getactiveprofiles(self): | def getactiveprofiles(self): | ||||
| revs = [self.changelog.rev(node) for node in | # Use unfiltered to avoid computing hidden commits | ||||
| self.dirstate.parents() if node != nullid] | repo = self.unfiltered() | ||||
| revs = [repo.changelog.rev(node) for node in | |||||
| repo.dirstate.parents() if node != nullid] | |||||
| activeprofiles = set() | activeprofiles = set() | ||||
| for rev in revs: | for rev in revs: | ||||
| _, _, profiles = self.getsparsepatterns(rev) | _, _, profiles = self.getsparsepatterns(rev) | ||||
| activeprofiles.update(profiles) | activeprofiles.update(profiles) | ||||
| return activeprofiles | return activeprofiles | ||||