This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6144

discovery: prevent recomputing info about server and outgoing changesets
ClosedPublic

Authored by pulkit on Mar 17 2019, 11:48 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG98908e36d58a: discovery: prevent recomputing info about server and outgoing changesets
Summary

We already iterate over the outgoing.missing above and lookup repo for them. So
let's reuse info calculated at that time instead of recomputing that again.

Also we calculate the set of remotebranches by doing set(remotemap), so let's
reuse that again.

Upcoming patches will clean things a bit more.

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

pulkit created this revision.Mar 17 2019, 11:48 AM
Closed by commit rHG98908e36d58a: discovery: prevent recomputing info about server and outgoing changesets (authored by pulkit). · Explain WhyMar 27 2019, 3:36 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/discovery.py (21 lines)

Diff 14599

mercurial/discovery.py

- unsyncedheads: the list of remote heads unknown locally, - unsyncedheads: the list of remote heads unknown locally,
- discardedheads: the list of heads made obsolete by the push. - discardedheads: the list of heads made obsolete by the push.
""" """
repo = pushop.repo.unfiltered() repo = pushop.repo.unfiltered()
remote = pushop.remote remote = pushop.remote
outgoing = pushop.outgoing outgoing = pushop.outgoing
cl = repo.changelog cl = repo.changelog
headssum = {} headssum = {}
missingctx = set()
# 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()
for n in outgoing.missing:
ctx = repo[n]
missingctx.add(ctx)
branches.add(ctx.branch())
nbranches = branches.copy()
with remote.commandexecutor() as e: with remote.commandexecutor() as e:
remotemap = e.callcommand('branchmap', {}).result() remotemap = e.callcommand('branchmap', {}).result()
newbranches = branches - set(remotemap) remotebranches = set(remotemap)
newbranches = branches - remotebranches
branches.difference_update(newbranches) branches.difference_update(newbranches)
# A. register remote heads # A. register remote heads
remotebranches = set()
for branch, heads in remotemap.iteritems(): for branch, heads in remotemap.iteritems():
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:
unsynced.append(h) unsynced.append(h)
headssum[branch] = (known, list(known), unsynced) headssum[branch] = (known, list(known), unsynced)
# B. add new branch data # B. add new branch data
missingctx = list(repo[n] for n in outgoing.missing) for branch in nbranches:
touchedbranches = set()
for ctx in missingctx:
branch = ctx.branch()
touchedbranches.add(branch)
if branch not in headssum: if branch not in headssum:
headssum[branch] = (None, [], []) headssum[branch] = (None, [], [])
# C drop data about untouched branches: # C drop data about untouched branches:
for branch in remotebranches - touchedbranches: for branch in remotebranches - nbranches:
del headssum[branch] del headssum[branch]
# D. Update newmap with outgoing changes. # D. Update newmap with outgoing changes.
# This will possibly add new heads and remove existing ones. # This will possibly add new heads and remove existing ones.
newmap = branchmap.remotebranchcache((branch, heads[1]) newmap = branchmap.remotebranchcache((branch, heads[1])
for branch, heads in headssum.iteritems() for branch, heads in headssum.iteritems()
if heads[0] is not None) if heads[0] is not None)
newmap.update(repo, (ctx.rev() for ctx in missingctx)) newmap.update(repo, (ctx.rev() for ctx in missingctx))