( )⚙ D10357 Add narrow capabilities for local repos, not just remote peers

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10357

Add narrow capabilities for local repos, not just remote peers
ClosedPublic

Authored by charlesetc on Apr 9 2021, 5:47 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG631001150e13: narrow: add capabilities for local repos, not just remote peers
Summary

This fixes the bug where running hg clone --narrow ./local-repo
fails with

abort: server does not support narrow clones

even when the server has narrow enabled.

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

charlesetc created this revision.Apr 9 2021, 5:47 PM
charlesetc added a comment.Apr 9 2021, 5:49 PM

Hello, I'm not sure if this change is idiomatic or in-keeping with the abstractions at play. I'm happy to rework it if there turns out to be a better way to implement. Thanks!

durin42 accepted this revision.Apr 12 2021, 2:51 PM

Thanks! This needed some tweaking on the commit message to line up with our format (which is checked by the test suite, but I've edited in-flight and am pushing now.)

This revision is now accepted and ready to land.Apr 12 2021, 2:51 PM

Revision Contents
Changeset List

PathPackages
Mmercurial/localrepo.py (3 lines)
Mtests/test-narrow-clone.t (12 lines)
Mtests/test-narrow.t (2 lines)

Diff 26829

mercurial/localrepo.py

sparse, sparse,
store as storemod, store as storemod,
subrepoutil, subrepoutil,
tags as tagsmod, tags as tagsmod,
transaction, transaction,
txnutil, txnutil,
util, util,
vfs as vfsmod, vfs as vfsmod,
wireprototypes,
) )
from .interfaces import ( from .interfaces import (
repository, repository,
util as interfaceutil, util as interfaceutil,
) )
from .utils import ( from .utils import (
def _restrictcapabilities(self, caps): def _restrictcapabilities(self, caps):
if self.ui.configbool(b'experimental', b'bundle2-advertise'): if self.ui.configbool(b'experimental', b'bundle2-advertise'):
caps = set(caps) caps = set(caps)
capsblob = bundle2.encodecaps( capsblob = bundle2.encodecaps(
bundle2.getrepocaps(self, role=b'client') bundle2.getrepocaps(self, role=b'client')
) )
caps.add(b'bundle2=' + urlreq.quote(capsblob)) caps.add(b'bundle2=' + urlreq.quote(capsblob))
if self.ui.configbool(b'experimental', b'narrow'):
caps.add(wireprototypes.NARROWCAP)
return caps return caps
# Don't cache auditor/nofsauditor, or you'll end up with reference cycle: # Don't cache auditor/nofsauditor, or you'll end up with reference cycle:
# self -> auditor -> self._checknested -> self # self -> auditor -> self._checknested -> self
@property @property
def auditor(self): def auditor(self):
# This is only used by context.workingctx.match in order to # This is only used by context.workingctx.match in order to

tests/test-narrow-clone.t

dir dir
dir/src dir/src
dir/src/f10 dir/src/f10
$ cat dir/src/f10 $ cat dir/src/f10
10 10
$ cd .. $ cd ..
BUG: local-to-local narrow clones should work, but don't. local-to-local narrow clones work
$ 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 does not support narrow clones adding changesets
[255] adding manifests
adding file changes
added 3 changesets with 1 changes to 1 files
new changesets 5d21aaea77f8:26ce255d5b5d
$ hg tracked -R narrow-via-localpeer $ hg tracked -R narrow-via-localpeer
abort: repository narrow-via-localpeer not found I path:dir/src/f10
[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
$ hg clone --narrow ssh://user@dummy/master narrow_fail --noupdate --include 'dir/src/f10 $ hg clone --narrow ssh://user@dummy/master narrow_fail --noupdate --include 'dir/src/f10
> ' > '
abort: newlines are not allowed in narrowspec paths abort: newlines are not allowed in narrowspec paths
[255] [255]

tests/test-narrow.t

$ hg clone --narrow ssh://user@dummy/master foo --include asdf/.. $ hg clone --narrow ssh://user@dummy/master foo --include asdf/..
abort: "." and ".." are not allowed in narrowspec paths abort: "." and ".." are not allowed in narrowspec paths
[255] [255]
$ hg clone --narrow ssh://user@dummy/master foo --include a/./c $ hg clone --narrow ssh://user@dummy/master foo --include a/./c
abort: "." and ".." are not allowed in narrowspec paths abort: "." and ".." are not allowed in narrowspec paths
[255] [255]
Names with '.' in them are OK. Names with '.' in them are OK.
$ hg clone --narrow ssh://user@dummy/master should-work --include a/.b/c $ hg clone --narrow ./master should-work --include a/.b/c
requesting all changes requesting all changes
adding changesets adding changesets
adding manifests adding manifests
adding file changes adding file changes
added 1 changesets with 0 changes to 0 files added 1 changesets with 0 changes to 0 files
new changesets * (glob) new changesets * (glob)
updating to branch default updating to branch default
0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved