( )⚙ D11351 dirstate: drop the `_merge` method

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11351

dirstate: drop the `_merge` method
ClosedPublic

Authored by marmoute on Aug 26 2021, 10:21 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG65e3d8028f2e: dirstate: drop the `_merge` method
Summary

It only has one caller that only use one of the branch, so lets inline that
branch and clean things up further.

Diff Detail

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

Event Timeline

marmoute created this revision.Aug 26 2021, 10:21 AM
Alphare accepted this revision.Aug 27 2021, 5:47 AM
This revision is now accepted and ready to land.Aug 27 2021, 5:47 AM
marmoute added a commit: rHG65e3d8028f2e: dirstate: drop the `_merge` method.Aug 27 2021, 8:40 AM
Closed by commit rHG65e3d8028f2e: dirstate: drop the `_merge` method (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (7 lines)

Diff 30067

mercurial/dirstate.py

# being removed, restore that state. # being removed, restore that state.
entry = self._map.get(f) entry = self._map.get(f)
if entry is not None: if entry is not None:
# XXX this should probably be dealt with a a lower level # XXX this should probably be dealt with a a lower level
# (see `merged_removed` and `from_p2_removed`) # (see `merged_removed` and `from_p2_removed`)
if entry.merged_removed or entry.from_p2_removed: if entry.merged_removed or entry.from_p2_removed:
source = self._map.copymap.get(f) source = self._map.copymap.get(f)
if entry.merged_removed: if entry.merged_removed:
self._merge(f) self._otherparent(f)
elif entry.from_p2_removed: elif entry.from_p2_removed:
self._otherparent(f) self._otherparent(f)
if source is not None: if source is not None:
self.copy(source, f) self.copy(source, f)
return return
elif entry.merged or entry.from_p2: elif entry.merged or entry.from_p2:
return return
self._addpath(f, possibly_dirty=True) self._addpath(f, possibly_dirty=True)
self._addpath(f, from_p2=True) self._addpath(f, from_p2=True)
self._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def _add(self, filename): def _add(self, filename):
"""internal function to mark a file as added""" """internal function to mark a file as added"""
self._addpath(filename, added=True) self._addpath(filename, added=True)
self._map.copymap.pop(filename, None) self._map.copymap.pop(filename, None)
def _merge(self, f):
if not self.in_merge:
return self._normallookup(f)
return self._otherparent(f)
def _drop(self, filename): def _drop(self, filename):
"""internal function to drop a file from the dirstate""" """internal function to drop a file from the dirstate"""
if self._map.dropfile(filename): if self._map.dropfile(filename):
self._dirty = True self._dirty = True
self._updatedfiles.add(filename) self._updatedfiles.add(filename)
self._map.copymap.pop(filename, None) self._map.copymap.pop(filename, None)
def _discoverpath(self, path, normed, ignoremissing, exists, storemap): def _discoverpath(self, path, normed, ignoremissing, exists, storemap):