This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1038

tweakdefaults: add capability to skip some commands in cleanupnodes wrapper
ClosedPublic

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

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX89258752dd1d: tweakdefaults: add capability to skip some commands in cleanupnodes wrapper
Summary

The goal to show hash changes is to add support for json output printing full
hashes to increase support for automation and Nuclide. To achieve the goal in
best and clean way, we must use formatter. So support of using formatter and
having json output for commands will be added to commands. Since for those
commands we don't need this wrapper, lets add a functionality to skip the
wrapper for some commands.

We need to update the set introduced in this patch for each command we add
support to show hash changes.

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

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 accepted this revision.Oct 16 2017, 6:26 PM
quark added a subscriber: quark.
quark added inline comments.
hgext3rd/tweakdefaults.py
754

I have changed args[0] to operation.

This revision is now accepted and ready to land.Oct 16 2017, 6:26 PM
Closed by commit rFBHGX89258752dd1d: tweakdefaults: add capability to skip some commands in cleanupnodes wrapper (authored by pulkit). · Explain WhyOct 16 2017, 6:26 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/tweakdefaults.py (10 lines)

Diff 2846

hgext3rd/tweakdefaults.py

result = hg.update(repo, dest.node()) result = hg.update(repo, dest.node())
if bmactive(repo): if bmactive(repo):
with repo.wlock(): with repo.wlock():
bookmarks.update(repo, [prev.node()], dest.node()) bookmarks.update(repo, [prev.node()], dest.node())
return result return result
return orig(ui, repo, **opts) return orig(ui, repo, **opts)
def cleanupnodeswrapper(orig, repo, mapping, *args, **kwargs): # set of commands which define their own formatter and prints the hash changes
if repo.ui.configbool('tweakdefaults', 'showupdated', False): formattercommands = set()
quarkUnsubmitted
Not Done

I have changed args[0] to operation.

quark: I have changed `args[0]` to `operation`.
def cleanupnodeswrapper(orig, repo, mapping, operation, *args, **kwargs):
if (repo.ui.configbool('tweakdefaults', 'showupdated', False) and
operation not in formattercommands):
maxoutput = 10 maxoutput = 10
oldnodes = sorted(mapping.keys()) oldnodes = sorted(mapping.keys())
for i in range(0, min(len(oldnodes), maxoutput)): for i in range(0, min(len(oldnodes), maxoutput)):
oldnode = oldnodes[i] oldnode = oldnodes[i]
newnodes = mapping[oldnode] newnodes = mapping[oldnode]
_printupdatednode(repo, oldnode, newnodes) _printupdatednode(repo, oldnode, newnodes)
if len(oldnodes) > maxoutput + 1: if len(oldnodes) > maxoutput + 1:
repo.ui.status(_("...\n")) repo.ui.status(_("...\n"))
lastoldnode = oldnodes[-1] lastoldnode = oldnodes[-1]
lastnewnodes = mapping[lastoldnode] lastnewnodes = mapping[lastoldnode]
_printupdatednode(repo, lastoldnode, lastnewnodes) _printupdatednode(repo, lastoldnode, lastnewnodes)
return orig(repo, mapping, *args, **kwargs) return orig(repo, mapping, operation, *args, **kwargs)
def _printupdatednode(repo, oldnode, newnodes): def _printupdatednode(repo, oldnode, newnodes):
# oldnode was not updated if newnodes is an iterable # oldnode was not updated if newnodes is an iterable
if len(newnodes) == 1: if len(newnodes) == 1:
newnode = newnodes[0] newnode = newnodes[0]
firstline = encoding.trim( firstline = encoding.trim(
repo[newnode].description().split("\n")[0], 50, '...') repo[newnode].description().split("\n")[0], 50, '...')
repo.ui.status(_("%s -> %s \"%s\"\n") % ( repo.ui.status(_("%s -> %s \"%s\"\n") % (