This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1243

overlayworkingctx: add `_compact()`
ClosedPublic

Authored by phillco on Oct 26 2017, 12:48 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGdc9da4f4f363: overlayworkingctx: add `_compact()`
Summary

Alas, presence of a key in the cache isn't sufficient evidence that the file
is actually dirty.

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.

Event Timeline

phillco updated this revision to Diff 4189.Dec 7 2017, 4:22 PM
phillco updated this revision to Diff 4208.Dec 7 2017, 4:44 PM
phillco updated this revision to Diff 4216.Dec 7 2017, 4:52 PM
durin42 added a subscriber: durin42.Dec 7 2017, 4:56 PM
durin42 added inline comments.
mercurial/context.py
2230

typo: s/underlting/underlying/

durin42 requested changes to this revision.Dec 7 2017, 4:56 PM
This revision now requires changes to proceed.Dec 7 2017, 4:56 PM
phillco marked an inline comment as done.Dec 7 2017, 7:00 PM
phillco updated this revision to Diff 4235.Dec 8 2017, 1:38 AM
phillco updated this revision to Diff 4249.Dec 8 2017, 2:31 AM
Closed by commit rHGdc9da4f4f363: overlayworkingctx: add `_compact()` (authored by phillco). · Explain WhyDec 8 2017, 3:39 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (23 lines)

Diff 4272

mercurial/context.py

# We need to discard any keys that are actually clean before the empty # We need to discard any keys that are actually clean before the empty
# commit check. # commit check.
self._compact() self._compact()
return len(self._cache) == 0 return len(self._cache) == 0
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.
durin42Unsubmitted
Done

typo: s/underlting/underlying/

durin42: typo: s/underlting/underlying/
This can occur during the merge process, e.g. by passing --tool :local
to resolve a conflict.
"""
keys = []
for path in self._cache.keys():
cache = self._cache[path]
try:
underlying = self._wrappedctx[path]
if (underlying.data() == cache['data'] and
underlying.flags() == cache['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(self, path, exists, data=None, date=None, flags=''): def _markdirty(self, path, exists, data=None, date=None, flags=''):
self._cache[path] = { self._cache[path] = {
'exists': exists, 'exists': exists,
'data': data, 'data': data,
'date': date, 'date': date,
'flags': flags, 'flags': flags,
'copied': None, 'copied': None,
} }