##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

wireprotov2: define and implement "manifestdata" command...
wireprotov2: define and implement "manifestdata" command The added command can be used for obtaining manifest data. Given a manifest path and set of manifest nodes, data about manifests can be retrieved. Unlike changeset data, we wish to emit deltas to describe manifest revisions. So the command uses the relatively new API for building delta requests and emitting them. The code calls into deltaparent(), which I'm not very keen of. There's still work to be done in delta generation land so implementation details of storage (e.g. exactly one delta is stored/available) don't creep into higher levels. But we can worry about this later (there is already a TODO on imanifestorage tracking this). On the subject of parent deltas, the server assumes parent revisions exist on the receiving end. This is obviously wrong for shallow clone. I've added TODOs to add a mechanism to the command to allow clients to specify desired behavior. This shouldn't be too difficult to implement. Another big change is that the client must explicitly request manifest nodes to retrieve. This is a major departure from "getbundle," where the server derives relevant manifests as it iterates changesets and sends them automatically. As implemented, the client must transmit each requested node to the server. At 20 bytes per node, we're looking at 2 MB per 100,000 nodes. Plus wire encoding overhead. This isn't ideal for clients with limited upload bandwidth. I plan to address this in the future by allowing alternate mechanisms for defining the revisions to retrieve. One idea is to define a range of changeset revisions whose manifest revisions to retrieve (similar to how "changesetdata" works). We almost certainly want an API to look up an individual manifest by node. And that's where I've chosen to start with the implementation. Again, a theme of this early exchangev2 work is I want to start by building primitives for accessing raw repository data first and see how far we can get with those before we need more complexity. Differential Revision: https://phab.mercurial-scm.org/D4488
Phil Cohen - - Load All Authors

File last commit:

r34124:c0ce6045 default
r39673:c7a7c7e8 default
Show More
failfilemerge.py
19 lines | 518 B | text/x-python | PythonLexer
/ tests / failfilemerge.py
History | Source | Raw |Copy content |Copy permalink
Mads Kiilerich
spelling: fixes of non-dictionary words
 r30332 # extension to emulate interrupting filemerge._filemerge
timeless
rebase: update working directory when aborting (issue5084)
 r27988
from __future__ import absolute_import
from mercurial import (
Yuya Nishihara
tests: sort import lines in failfilemerge.py
 r28772 error,
timeless
rebase: update working directory when aborting (issue5084)
 r27988 extensions,
Yuya Nishihara
tests: sort import lines in failfilemerge.py
 r28772 filemerge,
timeless
rebase: update working directory when aborting (issue5084)
 r27988 )
def failfilemerge(filemergefn,
Phil Cohen
merge: pass wctx to premerge, filemerge...
 r34124 premerge, repo, wctx, mynode, orig, fcd, fco, fca,
labels=None):
timeless
rebase: update working directory when aborting (issue5084)
 r27988 raise error.Abort("^C")
return filemergefn(premerge, repo, mynode, orig, fcd, fco, fca, labels)
def extsetup(ui):
extensions.wrapfunction(filemerge, '_filemerge',
failfilemerge)