Mercurial > public > mercurial-scm > hg-stable

comparison mercurial/sparse.py @ 47709:a0e79084389d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sparse: use `update_file` instead of `normal` during `applyupdates` This is the newer, more semantic API. (more content end up "nonnormal", see previous commit) Differential Revision: https://phab.mercurial-scm.org/D11151
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Mon, 19 Jul 2021 01:58:24 +0200
parents 7bdfd88251c0
children 3148204e649e
comparison
equal deleted inserted replaced
47708:7bdfd88251c0 47709:a0e79084389d
451 451
452 dirstate = repo.dirstate 452 dirstate = repo.dirstate
453 for file, flags, msg in tmresult.getactions( 453 for file, flags, msg in tmresult.getactions(
454 [mergestatemod.ACTION_GET] 454 [mergestatemod.ACTION_GET]
455 ): 455 ):
456 dirstate.normal(file) 456 dirstate.update_file(file, p1_tracked=True, wc_tracked=True)
457 457
458 profiles = activeconfig(repo)[2] 458 profiles = activeconfig(repo)[2]
459 changedprofiles = profiles & files 459 changedprofiles = profiles & files
460 # If an active profile changed during the update, refresh the checkout. 460 # If an active profile changed during the update, refresh the checkout.
461 # Don't do this during a branch merge, since all incoming changes should 461 # Don't do this during a branch merge, since all incoming changes should