This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1418

treemanifest: support "{manifest % '{node}'}" template
ClosedPublic

Authored by durham on Nov 14 2017, 6:53 PM.
Tags
None
Subscribers
None

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGXee265d85cead: treemanifest: support "{manifest % '{node}'}" template
Summary

When we changed the treemanifest {manifest} template output it broke the ability
to specifically ask for the node. This is important for tools migrating between
the old and new format. Let's add that back in.

Let's also make tweakdefaults change the '{manifest}' default template for all
repo's, not just tree repos.

Diff Detail

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

Event Timeline

durham created this revision.Nov 14 2017, 6:53 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 14 2017, 6:53 PM
quark accepted this revision.Nov 14 2017, 6:55 PM
This revision is now accepted and ready to land.Nov 14 2017, 6:55 PM
Closed by commit rFBHGXee265d85cead: treemanifest: support "{manifest % '{node}'}" template (authored by durham). · Explain WhyNov 16 2017, 2:06 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/tweakdefaults.py (4 lines)
Mtreemanifest/__init__.py (21 lines)

Diff 3499

hgext3rd/tweakdefaults.py

encoding, encoding,
extensions, extensions,
hg, hg,
obsolete, obsolete,
patch, patch,
registrar, registrar,
revsetlang, revsetlang,
scmutil, scmutil,
templatekw,
templater, templater,
util, util,
) )
from hgext import rebase from hgext import rebase
import inspect import inspect
import json import json
import re import re
options.append( options.append(
('', 'per-file-stat-json', None, ('', 'per-file-stat-json', None,
_('show diff stat per file in json (ADVANCED)'))) _('show diff stat per file in json (ADVANCED)')))
# Tweak Behavior # Tweak Behavior
tweakbehaviors(ui) tweakbehaviors(ui)
_fixpager(ui) _fixpager(ui)
# Change manifest template output
templatekw.defaulttempl['manifest'] = '{node}'
def reposetup(ui, repo): def reposetup(ui, repo):
_fixpager(ui) _fixpager(ui)
# Allow uncommit on dirty working directory # Allow uncommit on dirty working directory
repo.ui.setconfig('experimental', 'uncommitondirtywdir', True) repo.ui.setconfig('experimental', 'uncommitondirtywdir', True)
# Allow unbundling of pushvars on server # Allow unbundling of pushvars on server
repo.ui.setconfig('push', 'pushvars.server', True) repo.ui.setconfig('push', 'pushvars.server', True)
def tweakorder(): def tweakorder():

treemanifest/__init__.py

extensions.wrapfunction(bundlerepo.bundlerepository, '_handlebundle2part', extensions.wrapfunction(bundlerepo.bundlerepository, '_handlebundle2part',
_handlebundle2part) _handlebundle2part)
extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps) extensions.wrapfunction(bundle2, 'getrepocaps', getrepocaps)
_registerbundle2parts() _registerbundle2parts()
extensions.wrapfunction(templatekw, 'showmanifest', showmanifest) extensions.wrapfunction(templatekw, 'showmanifest', showmanifest)
templatekw.keywords['manifest'] = templatekw.showmanifest templatekw.keywords['manifest'] = templatekw.showmanifest
# Change manifest template output
templatekw.defaulttempl['manifest'] = '{node}'
def showmanifest(orig, **args): def showmanifest(orig, **args):
# The normal manifest template shows a rev number, which we don't have. """Same implementation as the upstream showmanifest, but without the 'rev'
# Let's just print the node. Note, this breaks the ability for us to do field."""
# '{manifest % "{node} {rev}"}' but that's fine, since we can only show ctx, templ = args[r'ctx'], args[r'templ']
# the node now anyway. mnode = ctx.manifestnode()
return hex(args[r'ctx'].manifestnode()) if mnode is None:
# just avoid crash, we might want to use the 'ff...' hash in future
return
mhex = hex(mnode)
args = args.copy()
args.update({r'node': mhex})
f = templ('manifest', **args)
return templatekw._mappable(f, None, f, lambda x: { 'node': mhex})
def getrepocaps(orig, repo, *args, **kwargs): def getrepocaps(orig, repo, *args, **kwargs):
caps = orig(repo, *args, **kwargs) caps = orig(repo, *args, **kwargs)
if treeenabled(repo.ui): if treeenabled(repo.ui):
caps['treemanifest'] = ('True',) caps['treemanifest'] = ('True',)
return caps return caps
def _collectmanifest(orig, repo, striprev): def _collectmanifest(orig, repo, striprev):