Details
Details
Diff Detail
Diff Detail
- Repository
- rHG Mercurial
- Lint
Lint Skipped - Unit
Unit Tests Skipped
This is an archive of the discontinued Mercurial Phabricator instance.
Differential D4368
treemanifest: avoid unnecessary copies/processing when using alwaysmatcherClosedPublic
treemanifest: avoid unnecessary copies/processing when using alwaysmatcher
ClosedPublic
Authored by spectral on Aug 24 2018, 1:36 AM.
Revision Contents
Revision Contents
Diff 10546
Diff 10546
mercurial/manifest.py
| else: | else: | ||||
| copy._copyfunc = _copyfunc | copy._copyfunc = _copyfunc | ||||
| else: | else: | ||||
| copy._copyfunc = self._copyfunc | copy._copyfunc = self._copyfunc | ||||
| return copy | return copy | ||||
| def filesnotin(self, m2, match=None): | def filesnotin(self, m2, match=None): | ||||
| '''Set of files in this manifest that are not in the other''' | '''Set of files in this manifest that are not in the other''' | ||||
| if match: | if match and not match.always(): | ||||
| m1 = self.matches(match) | m1 = self.matches(match) | ||||
| m2 = m2.matches(match) | m2 = m2.matches(match) | ||||
| return m1.filesnotin(m2) | return m1.filesnotin(m2) | ||||
| files = set() | files = set() | ||||
| def _filesnotin(t1, t2): | def _filesnotin(t1, t2): | ||||
| if t1._node == t2._node and not t1._dirty and not t2._dirty: | if t1._node == t2._node and not t1._dirty and not t2._dirty: | ||||
| return | return | ||||
| The result is returned as a dict with filename as key and | The result is returned as a dict with filename as key and | ||||
| values of the form ((n1,fl1),(n2,fl2)), where n1/n2 is the | values of the form ((n1,fl1),(n2,fl2)), where n1/n2 is the | ||||
| nodeid in the current/other manifest and fl1/fl2 is the flag | nodeid in the current/other manifest and fl1/fl2 is the flag | ||||
| in the current/other manifest. Where the file does not exist, | in the current/other manifest. Where the file does not exist, | ||||
| the nodeid will be None and the flags will be the empty | the nodeid will be None and the flags will be the empty | ||||
| string. | string. | ||||
| ''' | ''' | ||||
| if match: | if match and not match.always(): | ||||
| m1 = self.matches(match) | m1 = self.matches(match) | ||||
| m2 = m2.matches(match) | m2 = m2.matches(match) | ||||
| return m1.diff(m2, clean=clean) | return m1.diff(m2, clean=clean) | ||||
| result = {} | result = {} | ||||
| emptytree = treemanifest() | emptytree = treemanifest() | ||||
| def _diff(t1, t2): | def _diff(t1, t2): | ||||
| if t1._node == t2._node and not t1._dirty and not t2._dirty: | if t1._node == t2._node and not t1._dirty and not t2._dirty: | ||||
| return | return | ||||