This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1305

treemanifest: support the {manifest} template
ClosedPublic

Authored by durham on Nov 2 2017, 8:26 PM.
Tags
None
Subscribers
quark

Details

Reviewers
quark
Group Reviewers
Restricted Project
Commits
rFBHGX2dd048101c46: treemanifest: support the {manifest} template
Summary

The core Mercurial manifest template prints the rev number and the short hash.
Since treemanifest doesn't have rev numbers, this has to change. Let's just have
it print the whole hash, since manifest hashes are usually only ever used by
automation which probably wants the whole hash anyway.

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

durham created this revision.Nov 2 2017, 8:26 PM
Herald added a reviewer: Restricted Project. · View Herald TranscriptNov 2 2017, 8:26 PM
quark accepted this revision.Nov 6 2017, 4:04 PM
quark added a subscriber: quark.
quark added inline comments.
treemanifest/__init__.py
163

This breaks {manifest % "{node}"}. Maybe add a comment saying we don't care about that use-case?

This revision is now accepted and ready to land.Nov 6 2017, 4:04 PM
durham added inline comments.Nov 7 2017, 11:59 AM
treemanifest/__init__.py
163

I didn't realize that was even possible. Do we use that anywhere?

quark added inline comments.Nov 7 2017, 5:29 PM
treemanifest/__init__.py
163

I think we didn't use that. The flexibility is for people wanting {rev} or {node}. I think it's fine to not support that with a comment noting the slight difference.

Closed by commit rFBHGX2dd048101c46: treemanifest: support the {manifest} template (authored by durham). · Explain WhyNov 8 2017, 6:28 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 3352

tests/test-treemanifest-treeonly.t

subdir/x | 1 + subdir/x | 1 +
1 files changed, 1 insertions(+), 0 deletions(-) 1 files changed, 1 insertions(+), 0 deletions(-)
Test pulling new commits from a hybrid server Test pulling new commits from a hybrid server
$ cd ../master $ cd ../master
$ echo x >> subdir/x $ echo x >> subdir/x
$ hg commit -qAm 'modify subdir/x' $ hg commit -qAm 'modify subdir/x'
$ hg log -r tip -T '{manifest}' $ hg log -r tip -T '{manifest}'
1:d9920715ba88 (no-eol) d9920715ba88cbc7962c4dac9f20004aafd94ac8 (no-eol)
$ cd ../client $ cd ../client
$ hg pull $ hg pull
pulling from ssh://user@dummy/master pulling from ssh://user@dummy/master
searching for changes searching for changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
saved backup bundle to $TESTTMP/client/.hg/strip-backup/38a88da6315b-320da9c1-histedit.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/38a88da6315b-320da9c1-histedit.hg (glob)
$ hg log -l 2 -G -T '{desc}' $ hg log -l 2 -G -T '{desc}'
@ hybrid flat+tree commit @ hybrid flat+tree commit
| |
o add y o add y
| |
~ ~
Test {manifest} template
$ hg log -r . -T '{manifest}'
0ab0ab59dd6ab41bda558ad2fd4c665da69323ab (no-eol)
Test turning treeonly off and making sure we can still commit on top of treeonly Test turning treeonly off and making sure we can still commit on top of treeonly
commits commits
$ echo >> subdir/x $ echo >> subdir/x
$ hg debugindex -m --config treemanifest.treeonly=False | tail -1 $ hg debugindex -m --config treemanifest.treeonly=False | tail -1
2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000 2 102 51 -1 2 0427baa4e948 85b359fdb09e 000000000000
$ hg commit -m 'treeonly from hybrid repo' --config treemanifest.treeonly=False $ hg commit -m 'treeonly from hybrid repo' --config treemanifest.treeonly=False
$ hg log -r . -T '{desc}\n' --stat $ hg log -r . -T '{desc}\n' --stat
treeonly from hybrid repo treeonly from hybrid repo

tests/test-treemanifest.t

$ hg commit -qAm 'modify subdir/y' $ hg commit -qAm 'modify subdir/y'
$ echo >> subdir/y $ echo >> subdir/y
$ hg commit -Am 'modify subdir/y again' $ hg commit -Am 'modify subdir/y again'
$ hg rebase -d 0 -s '.^' $ hg rebase -d 0 -s '.^'
rebasing 3:6a2476258ba5 "modify subdir/y" rebasing 3:6a2476258ba5 "modify subdir/y"
rebasing 4:f096b21e165f "modify subdir/y again" (tip) rebasing 4:f096b21e165f "modify subdir/y again" (tip)
saved backup bundle to $TESTTMP/client/.hg/strip-backup/6a2476258ba5-a90056a1-rebase.hg (glob) saved backup bundle to $TESTTMP/client/.hg/strip-backup/6a2476258ba5-a90056a1-rebase.hg (glob)
$ hg log -r '.^::.' -T '{manifest}\n' $ hg log -r '.^::.' -T '{manifest}\n'
3:0d05c20bb7eb 0d05c20bb7eb53dbfe91f834ed3f0c26ca6ca655
4:8289b85c6a30 8289b85c6a307a5a64ffe3bd80bd7998775c787a
$ hg debugdatapack .hg/store/packs/manifests/5a5fb42e99986c90ac86b57d184561c44238b7b7.datapack $ hg debugdatapack .hg/store/packs/manifests/5a5fb42e99986c90ac86b57d184561c44238b7b7.datapack
.hg/store/packs/manifests/5a5fb42e99986c90ac86b57d184561c44238b7b7: .hg/store/packs/manifests/5a5fb42e99986c90ac86b57d184561c44238b7b7:
subdir: subdir:
Node Delta Base Delta Length Blob Size Node Delta Base Delta Length Blob Size
a4e2f032ee0f 000000000000 43 (missing) a4e2f032ee0f 000000000000 43 (missing)
(empty name): (empty name):
Node Delta Base Delta Length Blob Size Node Delta Base Delta Length Blob Size

treemanifest/__init__.py

localrepo, localrepo,
manifest, manifest,
mdiff, mdiff,
phases, phases,
registrar, registrar,
repair, repair,
revlog, revlog,
sshserver, sshserver,
templatekw,
util, util,
wireproto, wireproto,
) )
from mercurial.i18n import _ from mercurial.i18n import _
from mercurial.node import bin, hex, nullid from mercurial.node import bin, hex, nullid
from remotefilelog.contentstore import ( from remotefilelog.contentstore import (
manifestrevlogstore, manifestrevlogstore,
extensions.wrapfunction(repair, '_collectmanifest', _collectmanifest) extensions.wrapfunction(repair, '_collectmanifest', _collectmanifest)
extensions.wrapfunction(repair, 'stripmanifest', stripmanifest) extensions.wrapfunction(repair, 'stripmanifest', stripmanifest)
extensions.wrapfunction(bundle2, '_addpartsfromopts', _addpartsfromopts) extensions.wrapfunction(bundle2, '_addpartsfromopts', _addpartsfromopts)
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)
templatekw.keywords['manifest'] = templatekw.showmanifest
def showmanifest(orig, **args):
# The normal manifest template shows a rev number, which we don't have.
# Let's just print the node. Note, this breaks the ability for us to do
# '{manifest % "{node} {rev}"}' but that's fine, since we can only show
quarkUnsubmitted
Not Done

This breaks {manifest % "{node}"}. Maybe add a comment saying we don't care about that use-case?

quark: This breaks `{manifest % "{node}"}`. Maybe add a comment saying we don't care about that use…
durhamAuthorUnsubmitted
Not Done

I didn't realize that was even possible. Do we use that anywhere?

durham: I didn't realize that was even possible. Do we use that anywhere?
quarkUnsubmitted
Not Done

I think we didn't use that. The flexibility is for people wanting {rev} or {node}. I think it's fine to not support that with a comment noting the slight difference.

quark: I think we didn't use that. The flexibility is for people wanting `{rev}` or `{node}`. I think…
# the node now anyway.
return hex(args[r'ctx'].manifestnode())
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):
if repo.ui.configbool("treemanifest", "treeonly"): if repo.ui.configbool("treemanifest", "treeonly"):