This is an archive of the discontinued Mercurial Phabricator instance.

narrow: always wrap repo
ClosedPublic

Authored by martinvonz on Feb 28 2018, 3:56 PM.

Download Raw Diff

Details

Reviewers

durin42
indygreg

Group Reviewers

hg-reviewers

Commits

rHG6aae86976324: narrow: always wrap repo
rHGd0baa181342a: narrow: always wrap repo

Summary

It's simpler to always wrap the repo. This prepares for moving
narrowrepo.narrowmatch() onto localrepo by showing that it's now safe
to always wrap the repo (and thus always define narrowmatch() etc.).

Note that since narrowmatch() returns an always-matcher (rather than
None) in non-narrow repos, this may mean a performance hit when the
narrow extension is enabled because it adds a no-op filtering step in
various places against the always-matcher. I'll restore some of that
soon.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

martinvonz created this revision.Feb 28 2018, 3:56 PM

Herald added a reviewer: durin42. · View Herald TranscriptFeb 28 2018, 3:56 PM

Herald added a reviewer: hg-reviewers. · View Herald Transcript

Herald added a subscriber: mercurial-devel. · View Herald Transcript

martinvonz added a child revision: D2492: narrow: reduce depedence on narrowspec.save().Feb 28 2018, 3:56 PM

Yay for getting rid of __bases__ hackery!

This revision is now accepted and ready to land.Feb 28 2018, 9:07 PM

Closed by commit rHGd0baa181342a: narrow: always wrap repo (authored by martinvonz). · Explain WhyFeb 28 2018, 9:17 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/narrow/__init__.py (2 lines)
M			hgext/narrow/narrowcommands.py (5 lines)

Status	Author	Revision
Closed	martinvonz	D2495 narrow: drop safehasattr() checks for always-present repo.narrowmatch
Closed	martinvonz	D2494 narrow: move narrowmatch-related methods to localrepo
Closed	martinvonz	D2493 narrow: remove dependency from narrowspec module to hg module
Closed	martinvonz	D2492 narrow: reduce depedence on narrowspec.save()
Closed	martinvonz	D2491 narrow: always wrap repo
Closed	martinvonz	D2490 narrow: consider both local and remote matchers in narrowchangegroup
Closed	martinvonz	D2489 narrow: move checking for narrow requirement into _narrowmatch()
Closed	martinvonz	D2488 narrow: move changegroup.supportedoutgoingversions() override to core
Closed	martinvonz	D2487 narrow: move requirement constant to core

Diff 6191

hgext/narrow/init.py

	narrowchangegroup.setup()			narrowchangegroup.setup()
	narrowwirepeer.uisetup()			narrowwirepeer.uisetup()

	def reposetup(ui, repo):			def reposetup(ui, repo):
	"""Wraps local repositories with narrow repo support."""			"""Wraps local repositories with narrow repo support."""
	if not isinstance(repo, localrepo.localrepository):			if not isinstance(repo, localrepo.localrepository):
	return			return

	if changegroup.NARROW_REQUIREMENT in repo.requirements:
	narrowrepo.wraprepo(repo)			narrowrepo.wraprepo(repo)
				if changegroup.NARROW_REQUIREMENT in repo.requirements:
	narrowcopies.setup(repo)			narrowcopies.setup(repo)
	narrowdirstate.setup(repo)			narrowdirstate.setup(repo)
	narrowpatch.setup(repo)			narrowpatch.setup(repo)
	narrowwirepeer.reposetup(repo)			narrowwirepeer.reposetup(repo)

	def _verifierinit(orig, self, repo, matcher=None):			def _verifierinit(orig, self, repo, matcher=None):
	# The verifier's matcher argument was desgined for narrowhg, so it should			# The verifier's matcher argument was desgined for narrowhg, so it should
	# be None from core. If another extension passes a matcher (unlikely),			# be None from core. If another extension passes a matcher (unlikely),

hgext/narrow/narrowcommands.py

	registrar,			registrar,
	repair,			repair,
	repoview,			repoview,
	util,			util,
	)			)

	from . import (			from . import (
	narrowbundle2,			narrowbundle2,
	narrowrepo,
	)			)

	table = {}			table = {}
	command = registrar.command(table)			command = registrar.command(table)

	def setup():			def setup():
	"""Wraps user-facing mercurial commands with narrow-aware versions."""			"""Wraps user-facing mercurial commands with narrow-aware versions."""

	orig(pullop, kwargs)			orig(pullop, kwargs)

	if opts.get('depth'):			if opts.get('depth'):
	kwargs['depth'] = opts['depth']			kwargs['depth'] = opts['depth']
	wrappedextraprepare = extensions.wrappedfunction(exchange,			wrappedextraprepare = extensions.wrappedfunction(exchange,
	'_pullbundle2extraprepare', pullbundle2extraprepare_widen)			'_pullbundle2extraprepare', pullbundle2extraprepare_widen)

	def pullnarrow(orig, repo, args, *kwargs):			def pullnarrow(orig, repo, args, *kwargs):
	narrowrepo.wraprepo(repo.unfiltered())
	if isinstance(repo, repoview.repoview):
	repo.__class__.__bases__ = (repo.__class__.__bases__[0],
	repo.unfiltered().__class__)
	if opts_narrow:			if opts_narrow:
	repo.requirements.add(changegroup.NARROW_REQUIREMENT)			repo.requirements.add(changegroup.NARROW_REQUIREMENT)
	repo._writerequirements()			repo._writerequirements()

	return orig(repo, args, *kwargs)			return orig(repo, args, *kwargs)

	wrappedpull = extensions.wrappedfunction(exchange, 'pull', pullnarrow)			wrappedpull = extensions.wrappedfunction(exchange, 'pull', pullnarrow)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	6191		Feb 28 2018, 3:56 PM	★	★
Diff 2	6224	rHGd0baa181342a0a66ef4cbddca6e86c1a8dbbf82f	Feb 28 2018, 3:55 PM	★	★