Commit 9f237647 authored by Pierre-Yves David's avatar Pierre-Yves David 🐙
Browse files

dirstate: replace `update_parent_file_data` with simpler `update_parent` call

This make the dirstate API simpler.
parent 8bb74fbd3312
Pipeline #24778 failed with stages
in 28 minutes and 11 seconds
......@@ -602,14 +602,6 @@
parentfiledata=parentfiledata,
)
@requires_parents_change
def update_parent_file_data(self, f, filedata):
"""update the information about the content of a file
This function should be called within a `dirstate.parentchange` context.
"""
self.normal(f, parentfiledata=filedata)
def _addpath(
self,
f,
......
......@@ -801,7 +801,12 @@
)
else:
parentfiledata = getfiledata[f] if getfiledata else None
repo.dirstate.update_parent_file_data(f, parentfiledata)
repo.dirstate.update_file(
f,
p1_tracked=True,
wc_tracked=True,
parentfiledata=parentfiledata,
)
# merge
for f, args, msg in actions.get(ACTION_MERGE, []):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment