##// END OF EJS Templates
sparse: apply update with in a `parentchange` context...
marmoute -
r48508:7bdfd882 default
parent child Browse files
Show More
@@ -439,13 +439,21 b' def filterupdatesactions(repo, wctx, mct'
439 message,
439 message,
440 )
440 )
441
441
442 mergemod.applyupdates(
442 with repo.dirstate.parentchange():
443 repo, tmresult, repo[None], repo[b'.'], False, wantfiledata=False
443 mergemod.applyupdates(
444 )
444 repo,
445 tmresult,
446 repo[None],
447 repo[b'.'],
448 False,
449 wantfiledata=False,
450 )
445
451
446 dirstate = repo.dirstate
452 dirstate = repo.dirstate
447 for file, flags, msg in tmresult.getactions([mergestatemod.ACTION_GET]):
453 for file, flags, msg in tmresult.getactions(
448 dirstate.normal(file)
454 [mergestatemod.ACTION_GET]
455 ):
456 dirstate.normal(file)
449
457
450 profiles = activeconfig(repo)[2]
458 profiles = activeconfig(repo)[2]
451 changedprofiles = profiles & files
459 changedprofiles = profiles & files
@@ -420,12 +420,12 b' manifest'
420 We have files in the dirstate that are included and excluded. Some are in the
420 We have files in the dirstate that are included and excluded. Some are in the
421 manifest and some are not.
421 manifest and some are not.
422 $ hg debugdirstate --no-dates
422 $ hg debugdirstate --no-dates
423 n 644 0 * excluded (glob)
423 n * excluded (glob)
424 a 0 -1 * excludednomanifest (glob)
424 a * excludednomanifest (glob)
425 n 644 0 * included (glob)
425 n * included (glob)
426 a 0 -1 * includedadded (glob)
426 a * includedadded (glob)
427 $ hg debugrebuilddirstate --minimal
427 $ hg debugrebuilddirstate --minimal
428 $ hg debugdirstate --no-dates
428 $ hg debugdirstate --no-dates
429 n 644 0 * included (glob)
429 n * included (glob)
430 a 0 -1 * includedadded (glob)
430 a * includedadded (glob)
431
431
General Comments 0
You need to be logged in to leave comments. Login now