This is the newer, more semantic API.
(more content end up "nonnormal", see previous commit)
Alphare | |
pulkit |
hg-reviewers |
This is the newer, more semantic API.
(more content end up "nonnormal", see previous commit)
Automatic diff as part of commit; lint not applicable. |
Automatic diff as part of commit; unit tests not applicable. |
Path | Packages | |||
---|---|---|---|---|
M | mercurial/sparse.py (2 lines) |
False, | False, | ||||
wantfiledata=False, | wantfiledata=False, | ||||
) | ) | ||||
dirstate = repo.dirstate | dirstate = repo.dirstate | ||||
for file, flags, msg in tmresult.getactions( | for file, flags, msg in tmresult.getactions( | ||||
[mergestatemod.ACTION_GET] | [mergestatemod.ACTION_GET] | ||||
): | ): | ||||
dirstate.normal(file) | dirstate.update_file(file, p1_tracked=True, wc_tracked=True) | ||||
profiles = activeconfig(repo)[2] | profiles = activeconfig(repo)[2] | ||||
changedprofiles = profiles & files | changedprofiles = profiles & files | ||||
# If an active profile changed during the update, refresh the checkout. | # If an active profile changed during the update, refresh the checkout. | ||||
# Don't do this during a branch merge, since all incoming changes should | # Don't do this during a branch merge, since all incoming changes should | ||||
# have been handled by the temporary includes above. | # have been handled by the temporary includes above. | ||||
if changedprofiles and not branchmerge: | if changedprofiles and not branchmerge: | ||||
mf = mctx.manifest() | mf = mctx.manifest() |