This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7901

merge: introduce a revert_to() for that use-case
ClosedPublic

Authored by martinvonz on Jan 15 2020, 8:21 PM.

Details

Reviewers
marmoute
Group Reviewers
hg-reviewers
Commits
rHGc791ed6a2154: merge: introduce a revert_to() for that use-case
Summary

In the same vein as the previous patch.

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.

Event Timeline

martinvonz created this revision.Jan 15 2020, 8:21 PM
martinvonz updated this revision to Diff 19540.Jan 23 2020, 4:34 PM
marmoute requested changes to this revision.Feb 5 2020, 6:28 PM
This revision now requires changes to proceed.Feb 5 2020, 6:28 PM
martinvonz updated this revision to Diff 19930.Feb 6 2020, 2:11 AM
marmoute accepted this revision.Feb 6 2020, 3:47 AM
martinvonz added a commit: rHGc791ed6a2154: merge: introduce a revert_to() for that use-case.Feb 6 2020, 5:20 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGc791ed6a2154: merge: introduce a revert_to() for that use-case (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/fix.py (10 lines)
Mmercurial/cmdutil.py (9 lines)
Mmercurial/merge.py (21 lines)

Diff 19971

hgext/fix.py

): ):
return return
extra = ctx.extra().copy() extra = ctx.extra().copy()
extra[b'fix_source'] = ctx.hex() extra[b'fix_source'] = ctx.hex()
wctx = context.overlayworkingctx(repo) wctx = context.overlayworkingctx(repo)
wctx.setbase(repo[newp1node]) wctx.setbase(repo[newp1node])
merge.update( merge.revert_to(ctx, wc=wctx)
repo,
ctx.rev(),
branchmerge=False,
force=True,
ancestor=p1rev,
mergeancestor=False,
wc=wctx,
)
copies.graftcopies(wctx, ctx, ctx.p1()) copies.graftcopies(wctx, ctx, ctx.p1())
for path in filedata.keys(): for path in filedata.keys():
fctx = ctx[path] fctx = ctx[path]
copysource = fctx.copysource() copysource = fctx.copysource()
wctx.write(path, filedata[path], flags=fctx.flags()) wctx.write(path, filedata[path], flags=fctx.flags())
if copysource: if copysource:
wctx.markcopied(path, copysource) wctx.markcopied(path, copysource)

mercurial/cmdutil.py

) )
fp.truncate(0) fp.truncate(0)
fp.write(reviewedpatch) fp.write(reviewedpatch)
fp.seek(0) fp.seek(0)
[os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles] [os.unlink(repo.wjoin(c)) for c in newlyaddedandmodifiedfiles]
# 3a. apply filtered patch to clean repo (clean) # 3a. apply filtered patch to clean repo (clean)
if backups: if backups:
# Equivalent to hg.revert
m = scmutil.matchfiles(repo, set(backups.keys()) | alsorestore) m = scmutil.matchfiles(repo, set(backups.keys()) | alsorestore)
mergemod.update( mergemod.revert_to(repo[b'.'], matcher=m)
repo,
repo.dirstate.p1(),
branchmerge=False,
force=True,
matcher=m,
)
# 3b. (apply) # 3b. (apply)
if dopatch: if dopatch:
try: try:
ui.debug(b'applying patch\n') ui.debug(b'applying patch\n')
ui.debug(fp.getvalue()) ui.debug(fp.getvalue())
patch.internalpatch(ui, repo, fp, 1, eolmode=None) patch.internalpatch(ui, repo, fp, 1, eolmode=None)
except error.PatchError as err: except error.PatchError as err:

mercurial/merge.py

node, node,
branchmerge, branchmerge,
force, force,
ancestor=None, ancestor=None,
mergeancestor=False, mergeancestor=False,
labels=None, labels=None,
matcher=None, matcher=None,
mergeforce=False, mergeforce=False,
updatedirstate=True,
updatecheck=None, updatecheck=None,
wc=None, wc=None,
): ):
""" """
Perform a merge between the working directory and the given node Perform a merge between the working directory and the given node
node = the node to update to node = the node to update to
branchmerge = whether to merge between branches branchmerge = whether to merge between branches
repo.ui.warn(b" %s\n" % nf) repo.ui.warn(b" %s\n" % nf)
### apply phase ### apply phase
if not branchmerge: # just jump to the new rev if not branchmerge: # just jump to the new rev
fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b'' fp1, fp2, xp1, xp2 = fp2, nullid, xp2, b''
# If we're doing a partial update, we need to skip updating # If we're doing a partial update, we need to skip updating
# the dirstate. # the dirstate.
always = matcher is None or matcher.always() always = matcher is None or matcher.always()
updatedirstate = always and not wc.isinmemory() updatedirstate = updatedirstate and always and not wc.isinmemory()
if updatedirstate: if updatedirstate:
repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2) repo.hook(b'preupdate', throw=True, parent1=xp1, parent2=xp2)
# note that we're in the middle of an update # note that we're in the middle of an update
repo.vfs.write(b'updatestate', p2.hex()) repo.vfs.write(b'updatestate', p2.hex())
# Advertise fsmonitor when its presence could be useful. # Advertise fsmonitor when its presence could be useful.
# #
# We only advertise when performing an update from an empty working # We only advertise when performing an update from an empty working
"""Do a clean update to the given commit. """Do a clean update to the given commit.
This involves updating to the commit and discarding any changes in the This involves updating to the commit and discarding any changes in the
working copy. working copy.
""" """
return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc) return update(ctx.repo(), ctx.rev(), branchmerge=False, force=True, wc=wc)
def revert_to(ctx, matcher=None, wc=None):
"""Revert the working copy to the given commit.
The working copy will keep its current parent(s) but its content will
be the same as in the given commit.
"""
return update(
ctx.repo(),
ctx.rev(),
branchmerge=False,
force=True,
updatedirstate=False,
matcher=matcher,
wc=wc,
)
def graft( def graft(
repo, repo,
ctx, ctx,
base=None, base=None,
labels=None, labels=None,
keepparent=False, keepparent=False,
keepconflictparent=False, keepconflictparent=False,
wctx=None, wctx=None,