This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4789

narrow: check for servers' narrow support before doing anything (BC)
ClosedPublic

Authored by pulkit on Sep 28 2018, 4:58 PM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHG06e75fbf9d6b: narrow: check for servers' narrow support before doing anything (BC)
Summary

Recently we introduced narrow capabilities for the server. So we can check
whether a server has narrow clone support or not before doing anything. This is
BC because new clients won't be able to extend from old narrow-enabled servers.
I *think* narrow is not used much (maybe just inside Google), also it's
experimental so I think we can change this. We will need to this someday anyway.

The "doesn't" in error is changed to "does not" because I think that's we do in
core. I also changed one more instance of the error message to use 'does not'
for consistency.

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

pulkit created this revision.Sep 28 2018, 4:58 PM
martinvonz added a subscriber: martinvonz.Oct 1 2018, 3:06 AM

This is BC because new clients won't be able to extend from old narrow-enabled servers.

I think your previous patch was also BC in that sense since it started requiring the server to have the ellipses wire capability when widening with ellipsis nodes. It's not a problem for us to add that capability (we already have), but you may want to mention it there for consistency :), if I understood that right.

hgext/narrow/narrowcommands.py
137

Change "doesn't" to "does not" here too so it's consistent?

pulkit edited the summary of this revision. (Show Details)Oct 1 2018, 12:02 PM
pulkit updated this revision to Diff 11518.
pulkit added a comment.EditedOct 1 2018, 12:07 PM
In D4789#72717, @martinvonz wrote:

This is BC because new clients won't be able to extend from old narrow-enabled servers.

I think your previous patch was also BC in that sense since it started requiring the server to have the ellipses wire capability when widening with ellipsis nodes. It's not a problem for us to add that capability (we already have), but you may want to mention it there for consistency :), if I understood that right.

I am not sure whether that patch stands as a BC but yes, the whole rework and refactoring during this cycle make big BC's in how narrow extension work and I doubt that a client with hg-4.8 will be able to use narrow with server which is at hg-4.7.

martinvonz accepted this revision.Oct 2 2018, 12:19 PM
This revision is now accepted and ready to land.Oct 2 2018, 12:19 PM
Closed by commit rHG06e75fbf9d6b: narrow: check for servers' narrow support before doing anything (BC) (authored by pulkit). · Explain WhyOct 2 2018, 12:55 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11569

hgext/narrow/narrowcommands.py

return orig(ui, repo, *args, **opts) return orig(ui, repo, *args, **opts)
def pullbundle2extraprepare(orig, pullop, kwargs): def pullbundle2extraprepare(orig, pullop, kwargs):
repo = pullop.repo repo = pullop.repo
if repository.NARROW_REQUIREMENT not in repo.requirements: if repository.NARROW_REQUIREMENT not in repo.requirements:
return orig(pullop, kwargs) return orig(pullop, kwargs)
if wireprotoserver.NARROWCAP not in pullop.remote.capabilities(): if wireprotoserver.NARROWCAP not in pullop.remote.capabilities():
raise error.Abort(_("server doesn't support narrow clones")) raise error.Abort(_("server does not support narrow clones"))
martinvonzUnsubmitted
Not Done

Change "doesn't" to "does not" here too so it's consistent?

martinvonz: Change "doesn't" to "does not" here too so it's consistent?
orig(pullop, kwargs) orig(pullop, kwargs)
kwargs['narrow'] = True kwargs['narrow'] = True
include, exclude = repo.narrowpats include, exclude = repo.narrowpats
kwargs['oldincludepats'] = include kwargs['oldincludepats'] = include
kwargs['oldexcludepats'] = exclude kwargs['oldexcludepats'] = exclude
kwargs['includepats'] = include kwargs['includepats'] = include
kwargs['excludepats'] = exclude kwargs['excludepats'] = exclude
# calculate known nodes only in ellipses cases because in non-ellipses cases # calculate known nodes only in ellipses cases because in non-ellipses cases
# Find the revisions we have in common with the remote. These will # Find the revisions we have in common with the remote. These will
# be used for finding local-only changes for narrowing. They will # be used for finding local-only changes for narrowing. They will
# also define the set of revisions to update for widening. # also define the set of revisions to update for widening.
remotepath = ui.expandpath(remotepath or 'default') remotepath = ui.expandpath(remotepath or 'default')
url, branches = hg.parseurl(remotepath) url, branches = hg.parseurl(remotepath)
ui.status(_('comparing with %s\n') % util.hidepassword(url)) ui.status(_('comparing with %s\n') % util.hidepassword(url))
remote = hg.peer(repo, opts, url) remote = hg.peer(repo, opts, url)
# check narrow support before doing anything if widening needs to be
# performed. In future we should also abort if client is ellipses and
# server does not support ellipses
if widening and wireprotoserver.NARROWCAP not in remote.capabilities():
raise error.Abort(_("server does not support narrow clones"))
commoninc = discovery.findcommonincoming(repo, remote) commoninc = discovery.findcommonincoming(repo, remote)
oldincludes, oldexcludes = repo.narrowpats oldincludes, oldexcludes = repo.narrowpats
if narrowing: if narrowing:
newincludes = oldincludes - removedincludes newincludes = oldincludes - removedincludes
newexcludes = oldexcludes | addedexcludes newexcludes = oldexcludes | addedexcludes
_narrow(ui, repo, remote, commoninc, oldincludes, oldexcludes, _narrow(ui, repo, remote, commoninc, oldincludes, oldexcludes,
newincludes, newexcludes, newincludes, newexcludes,

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

> "$PYTHON" unquote.py | tr ' ' '\n' | grep narrow > "$PYTHON" unquote.py | tr ' ' '\n' | grep narrow
narrow=v0 narrow=v0
exp-narrow-1 exp-narrow-1
$ 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 does not support narrow clones
[255] [255]
Make a narrow clone (via HGPORT2), then try to narrow and widen Make a narrow clone (via HGPORT2), then try to narrow and widen
into it (from HGPORT1) to prove that narrowing is fine and widening fails into it (from HGPORT1) to prove that narrowing is fine and widening fails
gracefully: gracefully:
$ hg clone -r 0 --narrow --include f1 http://localhost:$HGPORT2/ narrowclone $ hg clone -r 0 --narrow --include f1 http://localhost:$HGPORT2/ narrowclone
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 1 changes to 1 files added 1 changesets with 1 changes to 1 files
new changesets * (glob) new changesets * (glob)
updating to branch default updating to branch default
1 files updated, 0 files merged, 0 files removed, 0 files unresolved 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd narrowclone $ cd narrowclone
$ hg tracked --addexclude f2 http://localhost:$HGPORT1/ $ hg tracked --addexclude f2 http://localhost:$HGPORT1/
comparing with http://localhost:$HGPORT1/ comparing with http://localhost:$HGPORT1/
searching for changes searching for changes
looking for local changes to affected paths looking for local changes to affected paths
$ hg tracked --addinclude f1 http://localhost:$HGPORT1/ $ hg tracked --addinclude f1 http://localhost:$HGPORT1/
comparing with http://localhost:$HGPORT1/ comparing with http://localhost:$HGPORT1/
searching for changes abort: server does not support narrow clones
no changes found
abort: server doesn't support narrow clones
[255] [255]

tests/test-narrow-clone.t

10 10
$ cd .. $ cd ..
BUG: local-to-local narrow clones should work, but don't. BUG: local-to-local narrow clones should work, but don't.
$ hg clone --narrow master narrow-via-localpeer --noupdate --include "dir/src/f10" $ hg clone --narrow master narrow-via-localpeer --noupdate --include "dir/src/f10"
requesting all changes requesting all changes
abort: server doesn't support narrow clones abort: server does not support narrow clones
[255] [255]
$ hg tracked -R narrow-via-localpeer $ hg tracked -R narrow-via-localpeer
abort: repository narrow-via-localpeer not found! abort: repository narrow-via-localpeer not found!
[255] [255]
$ rm -Rf narrow-via-localpeer $ rm -Rf narrow-via-localpeer
narrow clone with a newline should fail narrow clone with a newline should fail