This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8842

context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842
ClosedPublic

Authored by mjacob on Jul 28 2020, 2:59 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG1476ec96965f: context: re-add `overlayworkingctx._compact()` removed in 6a5dcd754842
Summary

This partially backs out 6a5dcd754842. The method was and is unused, but a call
to it is introduced in the next patch.

Diff Detail

Repository
rHG Mercurial
Branch
stable
Lint
No Linters Available
Unit
No Unit Test Coverage

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (37 lines)

Diff 22140

mercurial/context.py

) )
def isdirty(self, path): def isdirty(self, path):
return path in self._cache return path in self._cache
def clean(self): def clean(self):
self._cache = {} self._cache = {}
def _compact(self):
"""Removes keys from the cache that are actually clean, by comparing
them with the underlying context.
This can occur during the merge process, e.g. by passing --tool :local
to resolve a conflict.
"""
keys = []
# This won't be perfect, but can help performance significantly when
# using things like remotefilelog.
scmutil.prefetchfiles(
self.repo(),
[
(
self.p1().rev(),
scmutil.matchfiles(self.repo(), self._cache.keys()),
)
],
)
for path in self._cache.keys():
cache = self._cache[path]
try:
underlying = self._wrappedctx[path]
if (
underlying.data() == cache[b'data']
and underlying.flags() == cache[b'flags']
):
keys.append(path)
except error.ManifestLookupError:
# Path not in the underlying manifest (created).
continue
for path in keys:
del self._cache[path]
return keys
def _markdirty( def _markdirty(
self, path, exists, data=None, date=None, flags=b'', copied=None self, path, exists, data=None, date=None, flags=b'', copied=None
): ):
# data not provided, let's see if we already have some; if not, let's # data not provided, let's see if we already have some; if not, let's
# grab it from our underlying context, so that we always have data if # grab it from our underlying context, so that we always have data if
# the file is marked as existing. # the file is marked as existing.
if exists and data is None: if exists and data is None:
oldentry = self._cache.get(path) or {} oldentry = self._cache.get(path) or {}