This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11353

dirstate: drop the `_otherparent` method
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG496a8e383aeb: dirstate: drop the `_otherparent` method
Summary

It only has one caller with a lot of the logic already implemented. So lets
inline it and cleans things up further.

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

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

Revision Contents
Changeset List

PathPackages
Mmercurial/dirstate.py (19 lines)

Diff 30111

mercurial/dirstate.py

# "merged" or coming from other parent (-2) before # "merged" or coming from other parent (-2) before
# 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: self._addpath(f, from_p2=True)
self._otherparent(f) self._map.copymap.pop(f, None)
elif entry.from_p2_removed:
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._map.copymap.pop(f, None) self._map.copymap.pop(f, None)
def _otherparent(self, f):
if not self.in_merge:
msg = _(b"setting %r to other parent only allowed in merges") % f
raise error.Abort(msg)
entry = self._map.get(f)
if entry is not None and entry.tracked:
# merge-like
self._addpath(f, merged=True)
else:
# add-like
self._addpath(f, from_p2=True)
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 _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):