comparison mercurial/strip.py @ 50112:62158471d038

strip: use a `changing_parents` context for --keep update

These are now properly scoped.

note: it would be neat to reuse this in `hg rollback`.

50111:0ca8dc8a135f

                del q.applied[start:end]
                q.savedirty()

        revs = sorted(rootnodes)
        if update and opts.get(b'keep'):
            urev = _findupdatetarget(repo, revs)
            uctx = repo[urev]

            # only reset the dirstate for files that would actually change
            # between the working context and uctx
            descendantrevs = repo.revs(b"only(., %d)", uctx.rev())
            changedfiles = []
            for rev in descendantrevs:
                # blindly reset the files, regardless of what actually changed
                changedfiles.extend(repo[rev].files())

            # reset files that only changed in the dirstate too
            dirstate = repo.dirstate
            dirchanges = [
                f for f in dirstate if not dirstate.get_entry(f).maybe_clean
            ]
            changedfiles.extend(dirchanges)

            repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
            repo.dirstate.write(repo.currenttransaction())

            # clear resolve state
            mergestatemod.mergestate.clean(repo)

            update = False

        strip(
            ui,
            repo,
            revs,

50112:62158471d038

                del q.applied[start:end]
                q.savedirty()

        revs = sorted(rootnodes)
        if update and opts.get(b'keep'):
            with repo.dirstate.changing_parents(repo):
                urev = _findupdatetarget(repo, revs)
                uctx = repo[urev]

                # only reset the dirstate for files that would actually change
                # between the working context and uctx
                descendantrevs = repo.revs(b"only(., %d)", uctx.rev())
                changedfiles = []
                for rev in descendantrevs:
                    # blindly reset the files, regardless of what actually changed
                    changedfiles.extend(repo[rev].files())

                # reset files that only changed in the dirstate too
                dirstate = repo.dirstate
                dirchanges = [
                    f for f in dirstate if not dirstate.get_entry(f).maybe_clean
                ]
                changedfiles.extend(dirchanges)

                repo.dirstate.rebuild(urev, uctx.manifest(), changedfiles)
                repo.dirstate.write(repo.currenttransaction())

                # clear resolve state
                mergestatemod.mergestate.clean(repo)

                update = False

        strip(
            ui,
            repo,
            revs,