Skip to content
Snippets Groups Projects
Commit 65e3d802 authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

dirstate: drop the `_merge` method

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

Differential Revision: https://phab.mercurial-scm.org/D11351
parent 51cd60c0
No related branches found
No related tags found
No related merge requests found
......@@ -733,7 +733,7 @@
if entry.merged_removed or entry.from_p2_removed:
source = self._map.copymap.get(f)
if entry.merged_removed:
self._merge(f)
self._otherparent(f)
elif entry.from_p2_removed:
self._otherparent(f)
if source is not None:
......@@ -762,11 +762,6 @@
self._addpath(filename, added=True)
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):
"""internal function to drop a file from the dirstate"""
if self._map.dropfile(filename):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment