Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
mercurial
mercurial-devel
Commits
9f23764747f3
Commit
9f237647
authored
Jul 15, 2021
by
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
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
mercurial/dirstate.py
View file @
9f237647
...
...
@@ -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
,
...
...
mercurial/mergestate.py
View file @
9f237647
...
...
@@ -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
,
[]):
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment