This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7099

widening: pass in matchers instead of patterns
ClosedPublic

Authored by martinvonz on Oct 14 2019, 1:57 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG63d440bef72a: widening: pass in matchers instead of patterns
rHG3239f8b76bbf: widening: pass in matchers instead of patterns
rHGc62229c8ddf6: widening: pass in matchers instead of patterns
Summary

This matches how it's done for the non-ellipsis case. The oldmatch is
not used yet, but it should be used eventually when widening no longer
resends manifests and files the client already has.

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.Oct 14 2019, 1:57 PM
pulkit accepted this revision.Oct 16 2019, 9:58 AM
pulkit added a subscriber: pulkit.

The oldmatch is not used yet, but it should be used eventually when widening no longer resends manifests and files the client already has.

You mean for ellipses case? If yes, nice!!!!

This revision is now accepted and ready to land.Oct 16 2019, 9:58 AM
martinvonz added a commit: rHGc62229c8ddf6: widening: pass in matchers instead of patterns.Oct 16 2019, 10:23 AM
Closed by commit rHGc62229c8ddf6: widening: pass in matchers instead of patterns (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.
martinvonz added a comment.Oct 16 2019, 10:33 AM
In D7099#104414, @pulkit wrote:

The oldmatch is not used yet, but it should be used eventually when widening no longer resends manifests and files the client already has.

You mean for ellipses case? If yes, nice!!!!

Yes, for the ellipses case. I think you already fixed the non-ellipses case. We should be able to unify them better. But I'll probably only get around to doing that next year.

Revision Contents
Changeset List

Diff 17218

hgext/narrow/narrowbundle2.py

part = bundler.newpart(b'changegroup', data=cgdata) part = bundler.newpart(b'changegroup', data=cgdata)
part.addparam(b'version', version) part.addparam(b'version', version)
if b'treemanifest' in repo.requirements: if b'treemanifest' in repo.requirements:
part.addparam(b'treemanifest', b'1') part.addparam(b'treemanifest', b'1')
def generate_ellipses_bundle2_for_widening( def generate_ellipses_bundle2_for_widening(
bundler, bundler, repo, oldmatch, newmatch, version, common, known,
repo,
oldinclude,
oldexclude,
newinclude,
newexclude,
version,
common,
known,
): ):
newmatch = narrowspec.match(
repo.root, include=newinclude, exclude=newexclude
)
common = set(common or [nullid]) common = set(common or [nullid])
# Steps: # Steps:
# 1. Send kill for "$known & ::common" # 1. Send kill for "$known & ::common"
# #
# 2. Send changegroup for ::common # 2. Send changegroup for ::common
# #
# 3. Proceed. # 3. Proceed.
# #

hgext/narrow/narrowwirepeer.py

known = wireprototypes.decodelist(known) known = wireprototypes.decodelist(known)
if ellipses == b'0': if ellipses == b'0':
ellipses = False ellipses = False
else: else:
ellipses = bool(ellipses) ellipses = bool(ellipses)
cgversion = cgversion cgversion = cgversion
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
if not ellipses:
newmatch = narrowspec.match( newmatch = narrowspec.match(
repo.root, include=newincludes, exclude=newexcludes repo.root, include=newincludes, exclude=newexcludes
) )
oldmatch = narrowspec.match( oldmatch = narrowspec.match(
repo.root, include=oldincludes, exclude=oldexcludes repo.root, include=oldincludes, exclude=oldexcludes
) )
if not ellipses:
bundle2.widen_bundle( bundle2.widen_bundle(
bundler, bundler,
repo, repo,
oldmatch, oldmatch,
newmatch, newmatch,
common, common,
known, known,
cgversion, cgversion,
ellipses, ellipses,
) )
else: else:
narrowbundle2.generate_ellipses_bundle2_for_widening( narrowbundle2.generate_ellipses_bundle2_for_widening(
bundler, bundler, repo, oldmatch, newmatch, cgversion, common, known,
repo,
oldincludes,
oldexcludes,
newincludes,
newexcludes,
cgversion,
common,
known,
) )
except error.Abort as exc: except error.Abort as exc:
bundler = bundle2.bundle20(repo.ui) bundler = bundle2.bundle20(repo.ui)
manargs = [(b'message', pycompat.bytestr(exc))] manargs = [(b'message', pycompat.bytestr(exc))]
advargs = [] advargs = []
if exc.hint is not None: if exc.hint is not None:
advargs.append((b'hint', exc.hint)) advargs.append((b'hint', exc.hint))
bundler.addpart(bundle2.bundlepart(b'error:abort', manargs, advargs)) bundler.addpart(bundle2.bundlepart(b'error:abort', manargs, advargs))