This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3049

bundle: consistently keep a list of stringified revisions in "revs"
ClosedPublic

Authored by martinvonz on Apr 3 2018, 6:08 PM.

Download Raw Diff

Details

Reviewers

indygreg

Group Reviewers

hg-reviewers

Commits

rHG88a056437061: bundle: consistently keep a list of stringified revisions in "revs"

Summary

Before this patch, "revs", in the "not base" branch, would be a list
of mixed integral revnums, hex nodeids, and branch names. After this
patch, they're all strings. They can still be a mix of hex nodeids and
branch names, but the important thing for my future patches is that
they're consistently in string form.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

martinvonz created this revision.Apr 3 2018, 6:08 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptApr 3 2018, 6:08 PM

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

martinvonz added a child revision: D3050: tests: avoid repo.lookup() for converting revnum to nodeid.Apr 3 2018, 6:08 PM

indygreg accepted this revision.Apr 3 2018, 7:12 PM

This revision is now accepted and ready to land.Apr 3 2018, 7:12 PM

Closed by commit rHG88a056437061: bundle: consistently keep a list of stringified revisions in "revs" (authored by martinvonz). · Explain WhyApr 3 2018, 7:24 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/commands.py (1 line)

Status	Author	Revision
Closed	martinvonz	D3055 localrepo: use revsymbol() in lookup()
Closed	martinvonz	D3054 histedit: avoid repo.lookup() for converting revnum to nodeid
Closed	martinvonz	D3053 outgoing: avoid repo.lookup() for converting revnum to nodeid
Closed	martinvonz	D3052 bisect: avoid repo.lookup() for converting revnum to nodeid
Closed	martinvonz	D3051 transplant: avoid repo.lookup() for converting revnum to nodeid
Closed	martinvonz	D3050 tests: avoid repo.lookup() for converting revnum to nodeid
Closed	martinvonz	D3049 bundle: consistently keep a list of stringified revisions in "revs"
Closed	martinvonz	D3048 bundle: avoid repo.lookup() for converting revnum to nodeid
Closed	martinvonz	D3047 push: avoid using repo.lookup() for converting to nodeid

Diff 7580

mercurial/commands.py

	"a destination"))			"a destination"))
	common = [repo[rev].node() for rev in base]			common = [repo[rev].node() for rev in base]
	heads = [repo[r].node() for r in revs] if revs else None			heads = [repo[r].node() for r in revs] if revs else None
	outgoing = discovery.outgoing(repo, common, heads)			outgoing = discovery.outgoing(repo, common, heads)
	else:			else:
	dest = ui.expandpath(dest or 'default-push', dest or 'default')			dest = ui.expandpath(dest or 'default-push', dest or 'default')
	dest, branches = hg.parseurl(dest, opts.get('branch'))			dest, branches = hg.parseurl(dest, opts.get('branch'))
	other = hg.peer(repo, opts, dest)			other = hg.peer(repo, opts, dest)
				revs = [repo[r].hex() for r in revs]
	revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)			revs, checkout = hg.addbranchrevs(repo, repo, branches, revs)
	heads = revs and map(repo.lookup, revs) or revs			heads = revs and map(repo.lookup, revs) or revs
	outgoing = discovery.findcommonoutgoing(repo, other,			outgoing = discovery.findcommonoutgoing(repo, other,
	onlyheads=heads,			onlyheads=heads,
	force=opts.get('force'),			force=opts.get('force'),
	portable=True)			portable=True)

	if not outgoing.missing:			if not outgoing.missing:

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	7580		Apr 3 2018, 6:08 PM	★	★
Diff 2	7589	rHG88a0564370610dd7979c5cd14d190403aafde410	Apr 2 2018, 6:14 PM	★	★