( )⚙ D6119 uncommit: move _movedirstate() to scmutil for reuse

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6119

uncommit: move _movedirstate() to scmutil for reuse
ClosedPublic

Authored by martinvonz on Mar 11 2019, 2:19 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG232d4b9d391a: uncommit: move _movedirstate() to scmutil for reuse
Summary

The function should be applicable generically when moving from one
commit to another. I'll try to add more callers when I find time.

I'm not convinced it's handling all the cases correctly, but we should
have a generic function for this kind of operation, so I think it
belongs somewhere in core (not in the uncommit extension).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 11 2019, 2:19 PM
pulkit accepted this revision.Mar 11 2019, 6:42 PM
Closed by commit rHG232d4b9d391a: uncommit: move _movedirstate() to scmutil for reuse (authored by martinvonz). · Explain WhyMar 11 2019, 7:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/uncommit.py (42 lines)
Mmercurial/scmutil.py (39 lines)

Diff 14468

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 _movedirstate(repo, newctx, match=None):
"""Move the dirstate to newctx and adjust it as necessary."""
oldctx = repo['.']
ds = repo.dirstate
ds.setparents(newctx.node(), node.nullid)
copies = dict(ds.copies())
s = newctx.status(oldctx, match=match)
for f in s.modified:
if ds[f] == 'r':
# modified + removed -> removed
continue
ds.normallookup(f)
for f in s.added:
if ds[f] == 'r':
# added + removed -> unknown
ds.drop(f)
elif ds[f] != 'a':
ds.add(f)
for f in s.removed:
if ds[f] == 'a':
# removed + added -> normal
ds.normallookup(f)
elif ds[f] != 'r':
ds.remove(f)
# Merge old parent and old working dir copies
oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
oldcopies.update(copies)
copies = dict((dst, oldcopies.get(src, src))
for dst, src in oldcopies.iteritems())
# Adjust the dirstate copies
for dst, src in copies.iteritems():
if (src not in newctx or dst in newctx or ds[dst] != 'a'):
src = None
ds.copy(src, dst)
@command('uncommit', @command('uncommit',
[('', 'keep', None, _('allow an empty commit after uncommiting')), [('', 'keep', None, _('allow an empty commit after uncommiting')),
('', 'allow-dirty-working-copy', False, ('', 'allow-dirty-working-copy', False,
_('allow uncommit with outstanding changes')) _('allow uncommit with outstanding changes'))
] + commands.walkopts, ] + commands.walkopts,
_('[OPTION]... [FILE]...'), _('[OPTION]... [FILE]...'),
helpcategory=command.CATEGORY_CHANGE_MANAGEMENT) helpcategory=command.CATEGORY_CHANGE_MANAGEMENT)
def uncommit(ui, repo, *pats, **opts): def uncommit(ui, repo, *pats, **opts):
if newid != old.p1().node(): if newid != old.p1().node():
# 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():
_movedirstate(repo, repo[newid], match) scmutil.movedirstate(repo, repo[newid], match)
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)
user=predctx.user(), user=predctx.user(),
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():
_movedirstate(repo, newpredctx) scmutil.movedirstate(repo, newpredctx)
mapping = {curctx.node(): (newprednode,)} mapping = {curctx.node(): (newprednode,)}
scmutil.cleanupnodes(repo, mapping, 'unamend', fixphase=True) scmutil.cleanupnodes(repo, mapping, 'unamend', fixphase=True)

mercurial/scmutil.py

nullid, nullid,
nullrev, nullrev,
short, short,
wdirid, wdirid,
wdirrev, wdirrev,
) )
from . import ( from . import (
copies as copiesmod,
encoding, encoding,
error, error,
match as matchmod, match as matchmod,
obsolete, obsolete,
obsutil, obsutil,
pathutil, pathutil,
phases, phases,
policy, policy,
ui.warn(_("%s has not been committed yet, so no copy " ui.warn(_("%s has not been committed yet, so no copy "
"data will be stored for %s.\n") "data will be stored for %s.\n")
% (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd))) % (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)))
if repo.dirstate[dst] in '?r' and not dryrun: if repo.dirstate[dst] in '?r' and not dryrun:
wctx.add([dst]) wctx.add([dst])
elif not dryrun: elif not dryrun:
wctx.copy(origsrc, dst) wctx.copy(origsrc, dst)
def movedirstate(repo, newctx, match=None):
"""Move the dirstate to newctx and adjust it as necessary."""
oldctx = repo['.']
ds = repo.dirstate
ds.setparents(newctx.node(), nullid)
copies = dict(ds.copies())
s = newctx.status(oldctx, match=match)
for f in s.modified:
if ds[f] == 'r':
# modified + removed -> removed
continue
ds.normallookup(f)
for f in s.added:
if ds[f] == 'r':
# added + removed -> unknown
ds.drop(f)
elif ds[f] != 'a':
ds.add(f)
for f in s.removed:
if ds[f] == 'a':
# removed + added -> normal
ds.normallookup(f)
elif ds[f] != 'r':
ds.remove(f)
# Merge old parent and old working dir copies
oldcopies = copiesmod.pathcopies(newctx, oldctx, match)
oldcopies.update(copies)
copies = dict((dst, oldcopies.get(src, src))
for dst, src in oldcopies.iteritems())
# Adjust the dirstate copies
for dst, src in copies.iteritems():
if (src not in newctx or dst in newctx or ds[dst] != 'a'):
src = None
ds.copy(src, dst)
def writerequires(opener, requirements): def writerequires(opener, requirements):
with opener('requires', 'w', atomictemp=True) as fp: with opener('requires', 'w', atomictemp=True) as fp:
for r in sorted(requirements): for r in sorted(requirements):
fp.write("%s\n" % r) fp.write("%s\n" % r)
class filecachesubentry(object): class filecachesubentry(object):
def __init__(self, path, stat): def __init__(self, path, stat):
self.path = path self.path = path