This is an archive of the discontinued Mercurial Phabricator instance.

Status	Author	Revision
Closed	indygreg	D3335 wireproto: expose repository formats via capabilities
Closed	indygreg	D3334 wireprotoframing: record when new stream is encountered
Closed	indygreg	D3333 wireprotoframing: use value passed into function
Closed	indygreg	D3332 httppeer: handle error response from client reactor
Closed	indygreg	D3299 wireproto: add media type to version 2 capabilities response
Closed	indygreg	D3298 debugcommands: use command executor for invoking commands
Closed	indygreg	D3297 httppeer: implement command executor for version 2 peer
Closed	indygreg	D3318 repository: remove ipeercommands from ipeerbase
Closed	indygreg	D3317 wireproto: properly call clonebundles command
Closed	indygreg	D3316 exchange: use command executor for getbundle
Closed	indygreg	D3315 exchange: use command executor for pushkey
Closed	indygreg	D3314 wireproto: use command executor for unbundle
Closed	indygreg	D3296 debugcommands: perform handshake when obtaining httpv2 peer
Closed	indygreg	D3295 wireproto: rename HTTPV2 so it less like HTTP/2
Closed	indygreg	D3294 bundlerepo: use command executor for wire protocol commands
Closed	indygreg	D3293 bundlerepo: rename "other" to "peer"
Closed	indygreg	D3292 bookmarks: use command executor for wire protocol commands
Closed	indygreg	D3291 hg: use command executor for wire protocol commands
Closed	indygreg	D3290 logexchange: use command executor for wire protocol commands
Closed	indygreg	D3289 streamclone: use command executor for wire protocol commands
Closed	indygreg	D3288 discovery: use command executor interface
Closed	indygreg	D3287 discovery: don't redundantly call branchmap
Closed	indygreg	D3273 wireproto: convert legacy commands to command executor
Closed	indygreg	D3272 treediscovery: switch to command executor interface
Closed	indygreg	D3271 wireproto: remove iterbatch() from peer interface (API)
Closed	indygreg	D3270 largefiles: use command executor for batch operation
Closed	indygreg	D3269 wireproto: implement batching on peer executor interface
Closed	indygreg	D3268 wireproto: implement command executor interface for version 1 peers
Closed	indygreg	D3267 repository: define new interface for running commands
Closed	indygreg	D3266 pycompat: export a handle on concurrent.futures
Closed	indygreg	D3265 setup: add packages for concurrent.futures
Closed	indygreg	D3264 futures: switch to absolute and relative imports
Closed	indygreg	D3263 tests: silence pyflakes for thirdparty/concurrent
Closed	indygreg	D3262 futures: get rid of extend_path
Closed	indygreg	D3261 thirdparty: vendor futures 3.2.0
Closed	indygreg	D3260 peer: scatter module to the wind (API)
Closed	indygreg	D3259 wireproto: move version 1 peer functionality to standalone module (API)
Closed	indygreg	D3258 wireproto: move gboptsmap to wireprototypes and rename (API)
Closed	indygreg	D3257 wireproto: move value encoding functions to wireprototypes (API)
Closed	indygreg	D3256 httppeer: basic implementation of capabilities interface
Closed	indygreg	D3255 repository: split capabilities methods into separate interface
Closed	indygreg	D3254 httppeer: implement ipeerconnection

Diff 8172

mercurial/discovery.py

	# A. Create set of branches involved in the push.			# A. Create set of branches involved in the push.
	branches = set(repo[n].branch() for n in outgoing.missing)			branches = set(repo[n].branch() for n in outgoing.missing)
	remotemap = remote.branchmap()			remotemap = remote.branchmap()
	newbranches = branches - set(remotemap)			newbranches = branches - set(remotemap)
	branches.difference_update(newbranches)			branches.difference_update(newbranches)

	# A. register remote heads			# A. register remote heads
	remotebranches = set()			remotebranches = set()
	for branch, heads in remote.branchmap().iteritems():			for branch, heads in remotemap.iteritems():
	remotebranches.add(branch)			remotebranches.add(branch)
	known = []			known = []
	unsynced = []			unsynced = []
	knownnode = cl.hasnode # do not use nodemap until it is filtered			knownnode = cl.hasnode # do not use nodemap until it is filtered
	for h in heads:			for h in heads:
	if knownnode(h):			if knownnode(h):
	known.append(h)			known.append(h)
	else:			else:

tests/test-http-bundle1.t

	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -
	"GET /?cmd=capabilities HTTP/1.1" 403 -			"GET /?cmd=capabilities HTTP/1.1" 403 -
	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -
	"GET /?cmd=capabilities HTTP/1.1" 200 -			"GET /?cmd=capabilities HTTP/1.1" 200 -
	"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524* (glob)			"POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+5eb5abfefeea63c80dd7553bcc3783f37e0c5524* (glob)
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull

	$ cd ..			$ cd ..

	clone of serve with repo in root and unserved subrepo (issue2970)			clone of serve with repo in root and unserved subrepo (issue2970)

tests/test-http.t

	devel-peer-request: 19 bytes of commands arguments in headers			devel-peer-request: 19 bytes of commands arguments in headers
	devel-peer-request: finished in *.???? seconds (200) (glob)			devel-peer-request: finished in *.???? seconds (200) (glob)
	received listkey for "bookmarks": 0 bytes			received listkey for "bookmarks": 0 bytes
	sending branchmap command			sending branchmap command
	devel-peer-request: GET http://localhost:$HGPORT2/?cmd=branchmap			devel-peer-request: GET http://localhost:$HGPORT2/?cmd=branchmap
	devel-peer-request: Vary X-HgProto-1			devel-peer-request: Vary X-HgProto-1
	devel-peer-request: X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			devel-peer-request: X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	devel-peer-request: finished in *.???? seconds (200) (glob)			devel-peer-request: finished in *.???? seconds (200) (glob)
	sending branchmap command
	devel-peer-request: GET http://localhost:$HGPORT2/?cmd=branchmap
	devel-peer-request: Vary X-HgProto-1
	devel-peer-request: X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	devel-peer-request: finished in *.???? seconds (200) (glob)
	preparing listkeys for "bookmarks"			preparing listkeys for "bookmarks"
	sending listkeys command			sending listkeys command
	devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys			devel-peer-request: GET http://localhost:$HGPORT2/?cmd=listkeys
	devel-peer-request: Vary X-HgArg-1,X-HgProto-1			devel-peer-request: Vary X-HgArg-1,X-HgProto-1
	devel-peer-request: X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			devel-peer-request: X-hgproto-1 0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	devel-peer-request: 19 bytes of commands arguments in headers			devel-peer-request: 19 bytes of commands arguments in headers
	devel-peer-request: finished in *.???? seconds (200) (glob)			devel-peer-request: finished in *.???? seconds (200) (glob)
	received listkey for "bookmarks": 0 bytes			received listkey for "bookmarks": 0 bytes
	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -
	"GET /?cmd=capabilities HTTP/1.1" 403 -			"GET /?cmd=capabilities HTTP/1.1" 403 -
	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -
	"GET /?cmd=capabilities HTTP/1.1" 200 -			"GET /?cmd=capabilities HTTP/1.1" 200 -
	"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365* (glob)			"POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365* (glob)
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=capabilities HTTP/1.1" 401 -			"GET /?cmd=capabilities HTTP/1.1" 401 -
	"GET /?cmd=capabilities HTTP/1.1" 200 -			"GET /?cmd=capabilities HTTP/1.1" 200 -
	"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=batch HTTP/1.1" 200 - x-hgarg-1:cmds=heads+%3Bknown+nodes%3D7f4e523d01f2cc3765ac8934da3d14db775ff872 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=666f726365 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull

	$ cd ..			$ cd ..

	clone of serve with repo in root and unserved subrepo (issue2970)			clone of serve with repo in root and unserved subrepo (issue2970)

tests/test-treediscovery.t

	"GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=between HTTP/1.1" 200 - x-hgarg-1:pairs=d8f638ac69e9ae8dea4f09f11d696546a912d961-d57206cc072a18317c1e381fb60aa31bd3401785 x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=changegroupsubset HTTP/1.1" 200 - x-hgarg-1:bases=d8f638ac69e9ae8dea4f09f11d696546a912d961&heads=d8f638ac69e9ae8dea4f09f11d696546a912d961+2c8d5d5ec612be65cdfdeac78b7662ab1696324a x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=capabilities HTTP/1.1" 200 -			"GET /?cmd=capabilities HTTP/1.1" 200 -
	"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=branchmap HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=bookmarks x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob)			"POST /?cmd=unbundle HTTP/1.1" 200 - x-hgarg-1:heads=686173686564+1827a5bb63e602382eb89dd58f2ac9f3b007ad91* (glob)
	"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=listkeys HTTP/1.1" 200 - x-hgarg-1:namespace=phases x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=capabilities HTTP/1.1" 200 -			"GET /?cmd=capabilities HTTP/1.1" 200 -
	"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	"GET /?cmd=capabilities HTTP/1.1" 200 -			"GET /?cmd=capabilities HTTP/1.1" 200 -
	"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull			"GET /?cmd=heads HTTP/1.1" 200 - x-hgproto-1:0.1 0.2 comp=$USUAL_COMPRESSIONS$ partial-pull
	#else			#else

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	8080		Apr 12 2018, 3:59 PM	★	★
Diff 2	8172	rHG330ada7e8ea535353ea771f9419ee5ce10452985	Apr 11 2018, 8:24 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

discovery: don't redundantly call branchmapClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 8172

mercurial/discovery.py

tests/test-http-bundle1.t

tests/test-http.t

tests/test-treediscovery.t

discovery: don't redundantly call branchmap
ClosedPublic

Revision Contents
Changeset List