This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5661

unamend: fix unamending of renamed rename
ClosedPublic

Authored by martinvonz on Jan 23 2019, 1:37 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG19c590ce8661: unamend: fix unamending of renamed rename
Summary

Before this patch, we were passing in the result of a status call for
a different set of commits than what we calculated copies for, which
seemed suspicous to me. The rewritten version gets status and copy
information from the same sets of commits.

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

Diff 13409

hgext/uncommit.py

text=ctx.description(), text=ctx.description(),
files=files, files=files,
filectxfn=filectxfn, filectxfn=filectxfn,
user=ctx.user(), user=ctx.user(),
date=ctx.date(), date=ctx.date(),
extra=ctx.extra()) extra=ctx.extra())
return repo.commitctx(new) return repo.commitctx(new)
def _fixdirstate(repo, oldctx, newctx, status): def _fixdirstate(repo, oldctx, newctx, match=None):
""" fix the dirstate after switching the working directory from oldctx to """ fix the dirstate after switching the working directory from oldctx to
newctx which can be result of either unamend or uncommit. newctx which can be result of either unamend or uncommit.
""" """
ds = repo.dirstate ds = repo.dirstate
copies = dict(ds.copies()) copies = dict(ds.copies())
s = status s = newctx.status(oldctx, match=match)
for f in s.modified: for f in s.modified:
if ds[f] == 'r': if ds[f] == 'r':
# modified + removed -> removed # modified + removed -> removed
continue continue
ds.normallookup(f) ds.normallookup(f)
for f in s.added: for f in s.added:
if ds[f] == 'r': if ds[f] == 'r':
# added + removed -> unknown # added + removed -> unknown
ds.drop(f) ds.drop(f)
elif ds[f] != 'a': elif ds[f] != 'a':
ds.add(f) ds.add(f)
for f in s.removed: for f in s.removed:
if ds[f] == 'a': if ds[f] == 'a':
# removed + added -> normal # removed + added -> normal
ds.normallookup(f) ds.normallookup(f)
elif ds[f] != 'r': elif ds[f] != 'r':
ds.remove(f) ds.remove(f)
# Merge old parent and old working dir copies # Merge old parent and old working dir copies
oldcopies = {} oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
for f in (s.modified + s.added):
src = oldctx[f].renamed()
if src:
oldcopies[f] = src[0]
oldcopies.update(copies) oldcopies.update(copies)
copies = dict((dst, oldcopies.get(src, src)) copies = dict((dst, oldcopies.get(src, src))
for dst, src in oldcopies.iteritems()) for dst, src in oldcopies.iteritems())
# Adjust the dirstate copies # Adjust the dirstate copies
for dst, src in copies.iteritems(): for dst, src in copies.iteritems():
if (src not in newctx or dst in newctx or ds[dst] != 'a'): if (src not in newctx or dst in newctx or ds[dst] != 'a'):
src = None src = None
ds.copy(src, dst) ds.copy(src, dst)
# Move local changes on filtered changeset # Move local changes on filtered changeset
mapping[old.node()] = (newid,) mapping[old.node()] = (newid,)
else: else:
# Fully removed the old commit # Fully removed the old commit
mapping[old.node()] = () mapping[old.node()] = ()
with repo.dirstate.parentchange(): with repo.dirstate.parentchange():
repo.dirstate.setparents(newid, node.nullid) repo.dirstate.setparents(newid, node.nullid)
s = old.p1().status(old, match=match) _fixdirstate(repo, old, repo[newid], match)
_fixdirstate(repo, old, repo[newid], s)
scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True) scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True)
def predecessormarkers(ctx): def predecessormarkers(ctx):
"""yields the obsolete markers marking the given changeset as a successor""" """yields the obsolete markers marking the given changeset as a successor"""
for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()): for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):
yield obsutil.marker(ctx.repo(), data) yield obsutil.marker(ctx.repo(), data)
date=predctx.date(), date=predctx.date(),
extra=extras) extra=extras)
newprednode = repo.commitctx(newctx) newprednode = repo.commitctx(newctx)
newpredctx = repo[newprednode] newpredctx = repo[newprednode]
dirstate = repo.dirstate dirstate = repo.dirstate
with dirstate.parentchange(): with dirstate.parentchange():
dirstate.setparents(newprednode, node.nullid) dirstate.setparents(newprednode, node.nullid)
s = repo.status(predctx, curctx) _fixdirstate(repo, curctx, newpredctx)
_fixdirstate(repo, curctx, newpredctx, s)
mapping = {curctx.node(): (newprednode,)} mapping = {curctx.node(): (newprednode,)}
scmutil.cleanupnodes(repo, mapping, 'unamend', fixphase=True) scmutil.cleanupnodes(repo, mapping, 'unamend', fixphase=True)

tests/test-unamend.t

$ hg ci -qm 'move to a b' $ hg ci -qm 'move to a b'
$ hg mv b c $ hg mv b c
$ hg amend $ hg amend
$ hg unamend $ hg unamend
$ hg st --copies --change . $ hg st --copies --change .
A b A b
a a
R a R a
BROKEN: should indicate that b was renamed to c
$ hg st --copies $ hg st --copies
A c A c
b
R b R b
$ hg revert -qa $ hg revert -qa
$ rm c $ rm c
Rename a->b, then amend b->c, and working copy change c->d. After unamend, should look like b->d Rename a->b, then amend b->c, and working copy change c->d. After unamend, should look like b->d
$ hg co -q 0 $ hg co -q 0
$ hg mv a b $ hg mv a b
$ hg ci -qm 'move to a b' $ hg ci -qm 'move to a b'
$ hg mv b c $ hg mv b c
$ hg amend $ hg amend
$ hg mv c d $ hg mv c d
$ hg unamend $ hg unamend
$ hg st --copies --change . $ hg st --copies --change .
A b A b
a a
R a R a
BROKEN: should indicate that b was renamed to d
$ hg st --copies $ hg st --copies
A d A d
b
R b R b