This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11209

fix: rewrite writeworkingdir() to explicitly not work with merges
ClosedPublic

Authored by martinvonz on Jul 23 2021, 3:16 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG3feda1e779d4: fix: rewrite writeworkingdir() to explicitly not work with merges
Summary

hg fix errors out early if there is an unfinished merge, so we
should have only one parent here. Making that explicit makes my next
patches simpler.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (11 lines)

Diff 29714

hgext/fix.py

import collections import collections
import itertools import itertools
import os import os
import re import re
import subprocess import subprocess
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import ( from mercurial.node import (
nullid,
nullrev, nullrev,
wdirrev, wdirrev,
) )
from mercurial.utils import procutil from mercurial.utils import procutil
from mercurial import ( from mercurial import (
cmdutil, cmdutil,
We check out a new revision if and only if we fixed something in both the We check out a new revision if and only if we fixed something in both the
working directory and its parent revision. This avoids the need for a full working directory and its parent revision. This avoids the need for a full
update/merge, and means that the working directory simply isn't affected update/merge, and means that the working directory simply isn't affected
unless the --working-dir flag is given. unless the --working-dir flag is given.
Directly updates the dirstate for the affected files. Directly updates the dirstate for the affected files.
""" """
assert repo.dirstate.p2() == nullid
for path, data in pycompat.iteritems(filedata): for path, data in pycompat.iteritems(filedata):
fctx = ctx[path] fctx = ctx[path]
fctx.write(data, fctx.flags()) fctx.write(data, fctx.flags())
if repo.dirstate[path] == b'n': if repo.dirstate[path] == b'n':
repo.dirstate.set_possibly_dirty(path) repo.dirstate.set_possibly_dirty(path)
oldparentnodes = repo.dirstate.parents() oldp1 = repo.dirstate.p1()
newparentnodes = [replacements.get(n, n) for n in oldparentnodes] newp1 = replacements.get(oldp1, oldp1)
if newparentnodes != oldparentnodes: if newp1 != oldp1:
repo.setparents(*newparentnodes) repo.setparents(newp1, nullid)
def replacerev(ui, repo, ctx, filedata, replacements): def replacerev(ui, repo, ctx, filedata, replacements):
"""Commit a new revision like the given one, but with file content changes """Commit a new revision like the given one, but with file content changes
"ctx" is the original revision to be replaced by a modified one. "ctx" is the original revision to be replaced by a modified one.
"filedata" is a dict that maps paths to their new file content. All other "filedata" is a dict that maps paths to their new file content. All other