This is an archive of the discontinued Mercurial Phabricator instance.

Differential D191

metaedit: switch to scmutil.cleanupnodes for cleanup
ClosedPublic

Authored by mitrandir on Jul 27 2017, 8:51 AM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX397926ee66b0: metaedit: switch to scmutil.cleanupnodes for cleanup
Summary

That switches us to use the higher level abstractions and allows us to
beneefit from things like showupdated (see: D173)

Test Plan

ran metaedit tests

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Branch
default
Lint
Lint OK
Unit
Unit Tests OK

Event Timeline

mitrandir created this revision.Jul 27 2017, 8:51 AM
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 27 2017, 8:51 AM
quark accepted this revision.Jul 27 2017, 1:15 PM
quark added a subscriber: quark.

And it works without obsstore now!

This revision is now accepted and ready to land.Jul 27 2017, 1:15 PM
quark added inline comments.Jul 27 2017, 1:18 PM
hgext3rd/fbamend/metaedit.py
165–167

rev needs to be changed to node to get correct bookmark movement behavior

mitrandir updated this revision to Diff 452.Jul 31 2017, 11:51 AM

changes revs to nodes in the mapping

Closed by commit rFBHGX397926ee66b0: metaedit: switch to scmutil.cleanupnodes for cleanup (authored by mitrandir). · Explain WhyJul 31 2017, 1:00 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbamend/metaedit.py (16 lines)

Diff 452

hgext3rd/fbamend/metaedit.py

from __future__ import absolute_import from __future__ import absolute_import
from mercurial import ( from mercurial import (
commands, commands,
error, error,
hg, hg,
lock as lockmod, lock as lockmod,
obsolete,
phases, phases,
registrar, registrar,
scmutil, scmutil,
) )
from mercurial.i18n import _ from mercurial.i18n import _
from . import ( from . import (
common, common,
_rewritesingle(c, commitopts) _rewritesingle(c, commitopts)
for c in newunstablectx: for c in newunstablectx:
_rewritesingle(c, _rewritesingle(c,
{'date': commitopts.get('date') or None}) {'date': commitopts.get('date') or None})
if p1.node() in replacemap: if p1.node() in replacemap:
repo.setparents(replacemap[p1.node()]) repo.setparents(replacemap[p1.node()])
if len(replacemap) > 0: if len(replacemap) > 0:
obsolete.createmarkers( mapping = dict(map(lambda oldnew: (oldnew[0], [oldnew[1]]),
repo, replacemap.iteritems()))
[(repo[old], (repo[new],)) scmutil.cleanupnodes(repo, mapping, 'metaedit')
for old, new in replacemap.iteritems()],
operation='metaedit',
)
# TODO: set poroper phase boundaries (affects secret # TODO: set poroper phase boundaries (affects secret
# phase only) # phase only)
else: else:
ui.status(_("nothing changed\n")) ui.status(_("nothing changed\n"))
return 1 return 1
else: else:
# slow path: create a new commit # slow path: create a new commit
targetphase = max(c.phase() for c in allctx) targetphase = max(c.phase() for c in allctx)
# TODO: if the author and message are the same, don't create a # TODO: if the author and message are the same, don't create a
# new hash. Right now we create a new hash because the date can # new hash. Right now we create a new hash because the date can
# be different. # be different.
newid, created = common.rewrite( newid, created = common.rewrite(
repo, root, allctx, head, repo, root, allctx, head,
[root.p1().node(), root.p2().node()], [root.p1().node(), root.p2().node()],
commitopts=commitopts) commitopts=commitopts)
if created: if created:
if p1.rev() in revs: if p1.rev() in revs:
newp1 = newid newp1 = newid
phases.retractboundary(repo, tr, targetphase, [newid]) phases.retractboundary(repo, tr, targetphase, [newid])
obsolete.createmarkers(repo, [(ctx, (repo[newid],)) mapping = dict(
for ctx in allctx], [(repo[rev].node(), [newid]) for rev in revs])
operation='metaedit') scmutil.cleanupnodes(repo, mapping, 'metaedit')
quarkUnsubmitted
Not Done

rev needs to be changed to node to get correct bookmark movement behavior

quark: `rev` needs to be changed to `node` to get correct bookmark movement behavior
else: else:
ui.status(_("nothing changed\n")) ui.status(_("nothing changed\n"))
return 1 return 1
tr.close() tr.close()
finally: finally:
tr.release() tr.release()
if opts['fold']: if opts['fold']:
ui.status(_('%i changesets folded\n') % len(revs)) ui.status(_('%i changesets folded\n') % len(revs))
if newp1 is not None: if newp1 is not None:
hg.update(repo, newp1) hg.update(repo, newp1)
finally: finally:
lockmod.release(lock, wlock) lockmod.release(lock, wlock)