This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1040

fold: start using formatter to print output
ClosedPublic

Authored by pulkit on Oct 12 2017, 5:59 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
durham
Group Reviewers
Restricted Project
Commits
rFBHGX2b1e066479ba: fold: start using formatter to print output
Summary

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 12 2017, 5:59 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptOct 12 2017, 5:59 PM
quark requested changes to this revision.Oct 16 2017, 6:24 PM
quark added a subscriber: quark.

Could you use with fm? That will ensure fm.end() gets called.

You can also modernize the code so lock and transaction are in a same with:

with repo.wlock(), repo.lock(), repo.transaction('fold') as tr, ui.formatter(...) as fm:
This revision now requires changes to proceed.Oct 16 2017, 6:24 PM
pulkit updated this revision to Diff 2960.Oct 17 2017, 8:14 PM
pulkit updated this revision to Diff 3139.Oct 27 2017, 6:04 PM
durham accepted this revision.Oct 31 2017, 1:03 PM
Closed by commit rFBHGX2b1e066479ba: fold: start using formatter to print output (authored by pulkit). · Explain WhyOct 31 2017, 4:23 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbamend/fold.py (12 lines)

Diff 2960

hgext3rd/fbamend/fold.py

cmdtable = {} cmdtable = {}
command = registrar.command(cmdtable) command = registrar.command(cmdtable)
@command('^fold|squash', @command('^fold|squash',
[('r', 'rev', [], _("revision to fold")), [('r', 'rev', [], _("revision to fold")),
('', 'exact', None, _("only fold specified revisions")), ('', 'exact', None, _("only fold specified revisions")),
('', 'from', None, _("fold linearly to working copy parent")), ('', 'from', None, _("fold linearly to working copy parent")),
('', 'no-rebase', False, _("don't rebase descendants after split")), ('', 'no-rebase', False, _("don't rebase descendants after split")),
] + commands.commitopts + commands.commitopts2, ] + (commands.commitopts + commands.commitopts2 +
commands.formatteropts),
_('hg fold [OPTION]... [-r] REV')) _('hg fold [OPTION]... [-r] REV'))
def fold(ui, repo, *revs, **opts): def fold(ui, repo, *revs, **opts):
"""fold multiple revisions into a single one """fold multiple revisions into a single one
With --from, folds all the revisions linearly between the given revisions With --from, folds all the revisions linearly between the given revisions
and the parent of the working directory. and the parent of the working directory.
With --exact, folds only the specified revisions while ignoring the With --exact, folds only the specified revisions while ignoring the
if not revs: if not revs:
raise error.Abort(_('specified revisions evaluate to an empty set'), raise error.Abort(_('specified revisions evaluate to an empty set'),
hint=_('use different revision arguments')) hint=_('use different revision arguments'))
elif len(revs) == 1: elif len(revs) == 1:
ui.write_err(_('single revision specified, nothing to fold\n')) ui.write_err(_('single revision specified, nothing to fold\n'))
return 1 return 1
with repo.wlock(), repo.lock(), repo.transaction('fold') as tr: with repo.wlock(), repo.lock(), repo.transaction('fold') as tr,\
ui.formatter('fold', opts) as fm:
fm.startitem()
root, head = _foldcheck(repo, revs) root, head = _foldcheck(repo, revs)
commitopts = opts.copy() commitopts = opts.copy()
allctx = [repo[r] for r in revs] allctx = [repo[r] for r in revs]
targetphase = max(c.phase() for c in allctx) targetphase = max(c.phase() for c in allctx)
if commitopts.get('message') or commitopts.get('logfile'): if commitopts.get('message') or commitopts.get('logfile'):
commitopts['edit'] = False commitopts['edit'] = False
else: else:
msgs = ["HG: This is a fold of %d changesets." % len(allctx)] msgs = ["HG: This is a fold of %d changesets." % len(allctx)]
msgs += ["HG: Commit message of changeset %s.\n\n%s\n" % msgs += ["HG: Commit message of changeset %s.\n\n%s\n" %
(c.rev(), c.description()) for c in allctx] (c.rev(), c.description()) for c in allctx]
commitopts['message'] = "\n".join(msgs) commitopts['message'] = "\n".join(msgs)
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])
replacements = {ctx.node(): (newid,) for ctx in allctx} replacements = {ctx.node(): (newid,) for ctx in allctx}
scmutil.cleanupnodes(repo, replacements, 'fold') scmutil.cleanupnodes(repo, replacements, 'fold')
fm.condwrite(not ui.quiet, 'count',
ui.status(_('%i changesets folded\n') % len(revs)) '%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)
def _foldcheck(repo, revs): def _foldcheck(repo, revs):