This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8579

context: avoid computing status twice when comparing among revisions
Needs RevisionPublic

Authored by rom1dep on May 25 2020, 2:48 AM.

Details

Reviewers
marmoute
durin42
Group Reviewers
hg-reviewers

Diff Detail

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

Event Timeline

rom1dep created this revision.May 25 2020, 2:48 AM
rom1dep added a comment.May 25 2020, 2:51 AM

No real justification for, only found it weird, and since we have to do that test anyway I didn't think it would make perfs worse,
Didn't run tests on it, though.

marmoute accepted this revision.May 26 2020, 9:45 AM
marmoute added a subscriber: marmoute.

This looks fine.

durin42 requested changes to this revision.May 26 2020, 12:37 PM
durin42 added a subscriber: durin42.

Breaks many tests for status code, sadly.

(Regrettably, I've already lost that output, and I need to go get lunch with family.)

This revision now requires changes to proceed.May 26 2020, 12:37 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/context.py (13 lines)

Diff 21466

mercurial/context.py

): ):
"""build a status with respect to another context """build a status with respect to another context
This includes logic for maintaining the fast path of status when This includes logic for maintaining the fast path of status when
comparing the working directory against its parent, which is to skip comparing the working directory against its parent, which is to skip
building a new manifest if self (working directory) is not comparing building a new manifest if self (working directory) is not comparing
against its parent (repo['.']). against its parent (repo['.']).
""" """
if other == self._repo[b'.']:
s = self._dirstatestatus(match, listignored, listclean, listunknown) s = self._dirstatestatus(match, listignored, listclean, listunknown)
# Filter out symlinks that, in the case of FAT32 and NTFS filesystems, # Filter out symlinks that, in the case of FAT32 and NTFS filesystems,
# might have accidentally ended up with the entire contents of the file # might have accidentally ended up with the entire contents of the file
# they are supposed to be linking to. # they are supposed to be linking to.
s.modified[:] = self._filtersuspectsymlink(s.modified) s.modified[:] = self._filtersuspectsymlink(s.modified)
if other != self._repo[b'.']: else:
s = super(workingctx, self)._buildstatus( s = super(workingctx, self)._buildstatus(
other, s, match, listignored, listclean, listunknown other, s, match, listignored, listclean, listunknown
) )
return s return s
def _matchstatus(self, other, match): def _matchstatus(self, other, match):
"""override the match method with a filter for directory patterns """override the match method with a filter for directory patterns