This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4529

narrow: mark wire proto capability names experimental and versioned
ClosedPublic

Authored by martinvonz on Sep 11 2018, 5:56 PM.

Details

Reviewers
durin42
indygreg
Group Reviewers
hg-reviewers
Commits
rHG576b92928cc7: narrow: mark wire proto capability names experimental and versioned
Summary

We already plan to add a "widen" wire protocol command to the "narrow"
capability, so let's version the capabilities as "exp-narrow-1" and
"exp-ellipses-1". When we add the "widen" command, we will then add a
"exp-narrow-2" capability to indicate support for that command.

Diff Detail

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

Event Timeline

martinvonz created this revision.Sep 11 2018, 5:56 PM
indygreg accepted this revision.Sep 11 2018, 6:16 PM
indygreg added a subscriber: indygreg.

Unfortunately we likely can never ship either the narrow or ellipsis capability as stable because it would confuse 4.7 clients, which will presumably have a different understanding of what narrow and ellipsis mean. But at least now it is clear from the strings that the feature is experimental and we have a way of versioning its semantics until it stabilizes.

This revision is now accepted and ready to land.Sep 11 2018, 6:16 PM
Closed by commit rHG576b92928cc7: narrow: mark wire proto capability names experimental and versioned (authored by martinvonz). · Explain WhySep 11 2018, 6:18 PM
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Sep 11 2018, 6:20 PM
In D4529#69177, @indygreg wrote:

Unfortunately we likely can never ship either the narrow or ellipsis capability as stable because it would confuse 4.7 clients, which will presumably have a different understanding of what narrow and ellipsis mean. But at least now it is clear from the strings that the feature is experimental and we have a way of versioning its semantics until it stabilizes.

Note that the "narrow" and "ellipses" wire protocol capabilities were introduced earlier today (D4521), so no released version has them.

indygreg added a comment.Sep 11 2018, 6:33 PM
In D4529#69189, @martinvonz wrote:
In D4529#69177, @indygreg wrote:

Unfortunately we likely can never ship either the narrow or ellipsis capability as stable because it would confuse 4.7 clients, which will presumably have a different understanding of what narrow and ellipsis mean. But at least now it is clear from the strings that the feature is experimental and we have a way of versioning its semantics until it stabilizes.

Note that the "narrow" and "ellipses" wire protocol capabilities were introduced earlier today (D4521), so no released version has them.

Then there's nothing to worry about. Yay!

Revision Contents
Changeset List

Diff 10895

hgext/narrow/narrowwirepeer.py

error, error,
extensions, extensions,
hg, hg,
narrowspec, narrowspec,
node, node,
wireprotov1server, wireprotov1server,
) )
NARROWCAP = 'narrow' NARROWCAP = 'exp-narrow-1'
ELLIPSESCAP = 'ellipses' ELLIPSESCAP = 'exp-ellipses-1'
def uisetup(): def uisetup():
def peersetup(ui, peer): def peersetup(ui, peer):
# We must set up the expansion before reposetup below, since it's used # We must set up the expansion before reposetup below, since it's used
# at clone time before we have a repo. # at clone time before we have a repo.
class expandingpeer(peer.__class__): class expandingpeer(peer.__class__):
def expandnarrow(self, narrow_include, narrow_exclude, nodes): def expandnarrow(self, narrow_include, narrow_exclude, nodes):
ui.status(_("expanding narrowspec\n")) ui.status(_("expanding narrowspec\n"))

tests/test-narrow-clone-non-narrow-server.t

> else: > else:
> import urllib > import urllib
> unquote = urllib.unquote_plus > unquote = urllib.unquote_plus
> print(unquote(list(sys.stdin)[1])) > print(unquote(list(sys.stdin)[1]))
> EOF > EOF
$ echo hello | hg -R . serve --stdio | \ $ echo hello | hg -R . serve --stdio | \
> $PYTHON unquote.py | grep narrow > $PYTHON unquote.py | grep narrow
narrow=v0 narrow=v0
rev-branch-cache changegroupsubset getbundle known lookup narrow protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash rev-branch-cache changegroupsubset exp-narrow-1 getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash
$ cd .. $ cd ..
$ hg clone --narrow --include f1 http://localhost:$HGPORT1/ narrowclone $ hg clone --narrow --include f1 http://localhost:$HGPORT1/ narrowclone
requesting all changes requesting all changes
abort: server doesn't support narrow clones abort: server doesn't support narrow clones
[255] [255]