This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	17769		Nov 8 2019, 11:26 AM	★	★
Diff 2	17848		Nov 9 2019, 12:17 AM	★	★
Diff 3	17876	rHG0a338d8e670417e359a6035dcf72716beababd6b	Nov 8 2019, 10:00 AM	★	★

Commit	Parents	Author	Summary	Date
873e8b2574f5	8cfc0445c601	Pierre-Yves David		Nov 8 2019, 10:00 AM

Status	Author	Revision
Closed	marmoute	D7362 revlog: deprecate direct `nodemap` access
Closed	marmoute	D7361 revlog: drop special hack in the `nodemap` property
Closed	marmoute	D7360 perf: make `perfrevlogindex` use the new `index.rev` api if available
Closed	marmoute	D7331 index: use `index.has_node` in `phases.filterunknown`
Closed	marmoute	D7330 index: use `index.has_node` in `analyzeremotephases`
Closed	marmoute	D7329 index: use `index.has_node` in `repo._rollback`
Closed	marmoute	D7328 index: use `index.has_node` in `revlog.addgroup`
Closed	marmoute	D7359 perf: make `perfphasesremote` use the new `index.has_node` api
Closed	marmoute	D7358 perf: make `perfnodemap` use the new `index.get_rev` api if available
Closed	marmoute	D7357 index: use `index.get_rev` in `remotefilelog`
Closed	marmoute	D7356 index: use `index.has_node` in `infinitypush`
Closed	marmoute	D7355 index: use `index.has_node` in `phabricator.getoldnodedrevmap`
Closed	marmoute	D7354 index: use `index.get_rev` in `histedit.processreplacement`
Closed	marmoute	D7353 index: use `index.get_rev` in `histedit.adjustreplacementsfrommarkers`
Closed	marmoute	D7334 index: use `index.has_node` in `obsutil.foreground`
Closed	marmoute	D7333 index: use `index.has_node` in `obsutil.exclusivemarkers`
Closed	marmoute	D7352 index: use `index.has_node` in `histedit.cleanupnode`
Closed	marmoute	D7351 index: use `index.has_node` in `histedit._finishhistedit
Closed	marmoute	D7350 index: use `index.get_rev` in `rebase._computeobsoletenotrebased`
Closed	marmoute	D7349 index: use `index.get_rev` in `rebase.successorrevs`
Closed	marmoute	D7339 index: use `index.has_node` in `bundlerepo.bundlerevlog`
Closed	marmoute	D7338 index: use `index.get_rev` in `unionrepo.unionrevlog`
Closed	marmoute	D7340 index: use `index.rev` in `bundlerepo.bundlerevlog`
Closed	marmoute	D7342 index: use `index.has_node` in `tags.findglobaltags`
Closed	marmoute	D7348 index: use `index.has_node` in `exchangev2._pullchangesetdiscovery`
Closed	marmoute	D7347 index: use `index.get_rev` in `exchange._pullapplyphases`
Closed	marmoute	D7344 index: use `index.has_node` in `bookmarks.bmstore`
Closed	marmoute	D7346 index: use `index.has_node` in `exchange._pulldiscoverychangegroup`
Closed	marmoute	D7345 index: use `index.rev` in `exchange.fallbackheads`
Closed	marmoute	D7343 index: use `index.get_rev` in `revset._mapbynodefunc`
Closed	marmoute	D7341 index: use `index.get_rev` in `discovery._postprocessobsolete`
Closed	marmoute	D7337 index: use `index.get_rev` in `repoview.pinnedrevs`
Closed	marmoute	D7336 index: use `index.get_rev` in `obsolete._computephasedivergentset`
Closed	marmoute	D7335 index: use `index.get_rev` in `obsutil.getobsoleted`
Closed	marmoute	D7332 index: use `index.get_rev` in `phases.newheads`
Closed	marmoute	D7327 index: use `index.get_rev` in `localrepo.known`
Closed	marmoute	D7326 index: add a `get_rev` method (API)
Closed	marmoute	D7325 index: use `index.rev` in `revlog.rev`
Closed	marmoute	D7324 index: add a `rev` method (API)
Closed	marmoute	D7323 index: use `index.has_node` in `revlog.addrevision`
Closed	marmoute	D7322 index: add a `has_node` method (API)
Closed	marmoute	D7321 revlog: deal with nodemap deletion within the index
Closed	marmoute	D7320 revlog: clean up the node of all revision stripped in the C code
Closed	marmoute	D7319 revlog: move nodemap update within the index code
Closed	marmoute	D7318 revlog: deprecate the _nodecache attribute (API)
Closed	marmoute	D7317 revlog: access the nodemap through the index
Closed	marmoute	D7316 revlog: return the nodemap as the nodecache
Closed	marmoute	D7315 revlog: clarify which version use the older API in perf
Closed	marmoute	D7314 revlog: no longer return the nodemap after parsing
Closed	marmoute	D7313 revlog: move the nodemap into the index object (for pure)
Closed	marmoute	D7312 revlog: introduce an explicit NodeMap class for pure code
Closed	marmoute	D7311 utils: move the `dirs` definition in pathutil (API)

Diff 17769

mercurial/exchange.py

	"""discovery phase for the pull			"""discovery phase for the pull

	Current handle changeset discovery only, will change handle all discovery			Current handle changeset discovery only, will change handle all discovery
	at some point."""			at some point."""
	tmp = discovery.findcommonincoming(			tmp = discovery.findcommonincoming(
	pullop.repo, pullop.remote, heads=pullop.heads, force=pullop.force			pullop.repo, pullop.remote, heads=pullop.heads, force=pullop.force
	)			)
	common, fetch, rheads = tmp			common, fetch, rheads = tmp
	nm = pullop.repo.unfiltered().changelog.nodemap			has_node = pullop.repo.unfiltered().changelog.index.has_node
	if fetch and rheads:			if fetch and rheads:
	# If a remote heads is filtered locally, put in back in common.			# If a remote heads is filtered locally, put in back in common.
	#			#
	# This is a hackish solution to catch most of "common but locally			# This is a hackish solution to catch most of "common but locally
	# hidden situation". We do not performs discovery on unfiltered			# hidden situation". We do not performs discovery on unfiltered
	# repository because it end up doing a pathological amount of round			# repository because it end up doing a pathological amount of round
	# trip for w huge amount of changeset we do not care about.			# trip for w huge amount of changeset we do not care about.
	#			#
	# If a set of such "common but filtered" changeset exist on the server			# If a set of such "common but filtered" changeset exist on the server
	# but are not including a remote heads, we'll not be able to detect it,			# but are not including a remote heads, we'll not be able to detect it,
	scommon = set(common)			scommon = set(common)
	for n in rheads:			for n in rheads:
	if n in nm:			if has_node(n):
	if n not in scommon:			if n not in scommon:
	common.append(n)			common.append(n)
	if set(rheads).issubset(set(common)):			if set(rheads).issubset(set(common)):
	fetch = []			fetch = []
	pullop.common = common			pullop.common = common
	pullop.fetch = fetch			pullop.fetch = fetch
	pullop.rheads = rheads			pullop.rheads = rheads

This is an archive of the discontinued Mercurial Phabricator instance.

index: use `index.has_node` in `exchange._pulldiscoverychangegroup`ClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 17769

mercurial/exchange.py

index: use `index.has_node` in `exchange._pulldiscoverychangegroup`
ClosedPublic

Revision Contents
Changeset List