This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5138

narrow: only send includepats and excludepats if they are not empty
ClosedPublic

Authored by pulkit on Oct 17 2018, 10:53 AM.

Details

Reviewers
durin42
martinvonz
Group Reviewers
hg-reviewers
Commits
rHGa2c4502e409b: narrow: only send includepats and excludepats if they are not empty
Summary

If we send an empty includepats or excludepats argument to getbundle, it's
translated to [''] on the server which causes problems because even though
it's empty, bool of that value if True and we end up creating differencematcher
with narrowspec.match() which results in unexpected behavior.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit created this revision.Oct 17 2018, 10:53 AM
pulkit updated this revision to Diff 12232.Oct 18 2018, 6:38 AM
Closed by commit rHGa2c4502e409b: narrow: only send includepats and excludepats if they are not empty (authored by pulkit). · Explain WhyNov 5 2018, 11:15 AM
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Nov 5 2018, 11:17 AM

I noticed I had an unsubmitted comment on this patch. Can be done in a follow-up (if at all).

hgext/narrow/narrowcommands.py
142–143

should these also be changed?

pulkit added inline comments.Nov 12 2018, 1:52 PM
hgext/narrow/narrowcommands.py
142–143

From these, do you mean the oldincludepats and oldexcludepats?

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowcommands.py (6 lines)
Mmercurial/bundle2.py (4 lines)

Diff 12211

hgext/narrow/narrowcommands.py

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 wireprototypes.NARROWCAP not in pullop.remote.capabilities(): if wireprototypes.NARROWCAP not in pullop.remote.capabilities():
raise error.Abort(_("server does not support narrow clones")) raise error.Abort(_("server does not support narrow clones"))
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
martinvonzUnsubmitted
Not Done

should these also be changed?

martinvonz: should these also be changed?
pulkitAuthorUnsubmitted
Not Done

From these, do you mean the oldincludepats and oldexcludepats?

pulkit: From these, do you mean the oldincludepats and oldexcludepats?
if include:
kwargs['includepats'] = include kwargs['includepats'] = include
if exclude:
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
# we have all the nodes # we have all the nodes
if wireprototypes.ELLIPSESCAP in pullop.remote.capabilities(): if wireprototypes.ELLIPSESCAP in pullop.remote.capabilities():
kwargs['known'] = [node.hex(ctx.node()) for ctx in kwargs['known'] = [node.hex(ctx.node()) for ctx in
repo.set('::%ln', pullop.common) repo.set('::%ln', pullop.common)
if ctx.node() != node.nullid] if ctx.node() != node.nullid]
if not kwargs['known']: if not kwargs['known']:
# Mercurial serializes an empty list as '' and deserializes it as # Mercurial serializes an empty list as '' and deserializes it as

mercurial/bundle2.py

'advertising it; the client may be buggy')) 'advertising it; the client may be buggy'))
# Stream clones don't compress well. And compression undermines a # Stream clones don't compress well. And compression undermines a
# goal of stream clones, which is to be fast. Communicate the desire # goal of stream clones, which is to be fast. Communicate the desire
# to avoid compression to consumers of the bundle. # to avoid compression to consumers of the bundle.
bundler.prefercompressed = False bundler.prefercompressed = False
# get the inlcudes and excludes # get the inlcudes and excludes
includepats = kwargs[r'includepats'] includepats = kwargs.get(r'includepats')
excludepats = kwargs[r'excludepats'] excludepats = kwargs.get(r'excludepats')
narrowstream = repo.ui.configbool('server', 'stream-narrow-clones') narrowstream = repo.ui.configbool('server', 'stream-narrow-clones')
if (includepats or excludepats) and not narrowstream: if (includepats or excludepats) and not narrowstream:
raise error.Abort(_('server does not support narrow stream clones')) raise error.Abort(_('server does not support narrow stream clones'))
filecount, bytecount, it = streamclone.generatev2(repo, includepats, filecount, bytecount, it = streamclone.generatev2(repo, includepats,
excludepats) excludepats)