This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9986

bundle2: pass the operation source down to the changegroup
ClosedPublic

Authored by Alphare on Feb 12 2021, 4:26 AM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG83ac7c91e172: bundle2: pass the operation source down to the changegroup

Summary

This is currently not used by anything in core (and redundant with the url), the
real source information is much more useful. This is going to be used in
sidedata exchange patches coming soon.

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

Alphare created this revision.Feb 12 2021, 4:26 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptFeb 12 2021, 4:26 AM

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

Alphare edited the summary of this revision. (Show Details)Feb 12 2021, 9:04 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

pulkit accepted this revision.Feb 14 2021, 10:17 AM

This revision is now accepted and ready to land.Feb 14 2021, 10:17 AM

Alphare added a commit: rHG83ac7c91e172: bundle2: pass the operation source down to the changegroup.Feb 14 2021, 11:05 AM

Closed by commit rHG83ac7c91e172: bundle2: pass the operation source down to the changegroup (authored by Alphare). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/bundle2.py (4 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	25601		Feb 12 2021, 4:26 AM	★	★
Diff 2	25614		Feb 12 2021, 6:51 PM	★	★
Diff 3	25624	rHG83ac7c91e17283c1fe9d455793837bbef8bc4ccd	Feb 12 2021, 3:53 AM	★	★

Diff 25624

mercurial/bundle2.py

	extrakwargs = {}			extrakwargs = {}
	targetphase = inpart.params.get(b'targetphase')			targetphase = inpart.params.get(b'targetphase')
	if targetphase is not None:			if targetphase is not None:
	extrakwargs['targetphase'] = int(targetphase)			extrakwargs['targetphase'] = int(targetphase)
	ret = _processchangegroup(			ret = _processchangegroup(
	op,			op,
	cg,			cg,
	tr,			tr,
	b'bundle2',			op.source,
	b'bundle2',			b'bundle2',
	expectedtotal=nbchangesets,			expectedtotal=nbchangesets,
	**extrakwargs			**extrakwargs
	)			)
	if op.reply is not None:			if op.reply is not None:
	# This is definitely not the final form of this			# This is definitely not the final form of this
	# return. But one need to start somewhere.			# return. But one need to start somewhere.
	part = op.reply.newpart(b'reply:changegroup', mandatory=False)			part = op.reply.newpart(b'reply:changegroup', mandatory=False)
	tr = op.gettransaction()			tr = op.gettransaction()
	from . import exchange			from . import exchange

	cg = exchange.readbundle(op.repo.ui, real_part, raw_url)			cg = exchange.readbundle(op.repo.ui, real_part, raw_url)
	if not isinstance(cg, changegroup.cg1unpacker):			if not isinstance(cg, changegroup.cg1unpacker):
	raise error.Abort(			raise error.Abort(
	_(b'%s: not a bundle version 1.0') % util.hidepassword(raw_url)			_(b'%s: not a bundle version 1.0') % util.hidepassword(raw_url)
	)			)
	ret = _processchangegroup(op, cg, tr, b'bundle2', b'bundle2')			ret = _processchangegroup(op, cg, tr, op.source, b'bundle2')
	if op.reply is not None:			if op.reply is not None:
	# This is definitely not the final form of this			# This is definitely not the final form of this
	# return. But one need to start somewhere.			# return. But one need to start somewhere.
	part = op.reply.newpart(b'reply:changegroup')			part = op.reply.newpart(b'reply:changegroup')
	part.addparam(			part.addparam(
	b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False			b'in-reply-to', pycompat.bytestr(inpart.id), mandatory=False
	)			)
	part.addparam(b'return', b'%i' % ret, mandatory=False)			part.addparam(b'return', b'%i' % ret, mandatory=False)