This is an archive of the discontinued Mercurial Phabricator instance.

fold: use scmutil.cleanupnodes()
ClosedPublic

Authored by pulkit on Oct 12 2017, 5:59 PM.

Reviewers

None

Group Reviewers

Restricted Project

Commits

rFBHGX93ce565a9edb: fold: use scmutil.cleanupnodes()

Summary

Repository

rFBHGX Facebook Mercurial Extensions

Lint

Lint Skipped

Unit

Unit Tests Skipped

This revision was automatically updated to reflect the committed changes.

Pushed the first two. Thanks!

hgext3rd/fbamend/fold.py
19	Removed this line to make `test-check-code-hg.t` happy.

			Path	Packages
M			hgext3rd/fbamend/fold.py (4 lines)

Status	Author	Revision
Closed	pulkit	D1041 fold: add support to get json output for node changes
Closed	pulkit	D1040 fold: start using formatter to print output
Closed	pulkit	D1039 fold: use scmutil.cleanupnodes()
Closed	pulkit	D1038 tweakdefaults: add capability to skip some commands in cleanupnodes wrapper
Closed	pulkit	D1174 fold: use context manager for locks and transaction


	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,			obsolete,
				quarkUnsubmitted Not Done Removed this line to make `test-check-code-hg.t` happy. quark: Removed this line to make `test-check-code-hg.t` happy.
	phases,			phases,
	registrar,			registrar,
	scmutil,			scmutil,
	)			)
	from mercurial.i18n import _			from mercurial.i18n import _

	from . import common			from . import common

	commitopts['edit'] = True			commitopts['edit'] = True

	newid, unusedvariable = common.rewrite(repo, root, allctx, head,			newid, unusedvariable = common.rewrite(repo, root, allctx, head,
	[root.p1().node(),			[root.p1().node(),
	root.p2().node()],			root.p2().node()],
	commitopts=commitopts)			commitopts=commitopts)
	phases.retractboundary(repo, tr, targetphase, [newid])			phases.retractboundary(repo, tr, targetphase, [newid])

	obsolete.createmarkers(repo, [(ctx, (repo[newid],))			replacements = {ctx.node(): (newid,) for ctx in allctx}
	for ctx in allctx], operation='fold')			scmutil.cleanupnodes(repo, replacements, 'fold')

	ui.status(_('%i changesets folded\n') % len(revs))			ui.status(_('%i changesets folded\n') % len(revs))
	if repo['.'].rev() in revs:			if repo['.'].rev() in revs:
	hg.update(repo, newid)			hg.update(repo, newid)

	if torebase:			if torebase:
	folded = repo.revs('allsuccessors(%ld)', revs).last()			folded = repo.revs('allsuccessors(%ld)', revs).last()
	common.restackonce(ui, repo, folded)			common.restackonce(ui, repo, folded)