This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4686

changegroup: reintroduce some comments that have gotten lost over the years
ClosedPublic

Authored by durin42 on Sep 20 2018, 3:39 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG5adc5fe41a7d: changegroup: reintroduce some comments that have gotten lost over the years
Summary

I got concerned about the correctness of the pruning logic, but I was
misreading it. I didn't figure that out until I walked all the way
back to 0252abaafb8a from 20111, where I was finally able to see (in
the deleted side of the change!) a complete explanation from
b6d9ea0bc107 in 2005.

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

durin42 created this revision.Sep 20 2018, 3:39 PM
Closed by commit rHG5adc5fe41a7d: changegroup: reintroduce some comments that have gotten lost over the years (authored by durin42). · Explain WhySep 20 2018, 3:44 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/changegroup.py (10 lines)

Diff 11237

mercurial/changegroup.py

return clnode return clnode
return lookupmflinknode return lookupmflinknode
while tmfnodes: while tmfnodes:
tree, nodes = tmfnodes.popitem() tree, nodes = tmfnodes.popitem()
store = mfl.getstorage(tree) store = mfl.getstorage(tree)
if not self._filematcher.visitdir(store.tree[:-1] or '.'): if not self._filematcher.visitdir(store.tree[:-1] or '.'):
# No nodes to send because this directory is out of
# the client's view of the repository (probably
# because of narrow clones).
prunednodes = [] prunednodes = []
else: else:
# Avoid sending any manifest nodes we can prove the
# client already has by checking linkrevs. See the
# related comment in generatefiles().
prunednodes = self._prunemanifests(store, nodes, commonrevs) prunednodes = self._prunemanifests(store, nodes, commonrevs)
if tree and not prunednodes: if tree and not prunednodes:
continue continue
lookupfn = makelookupmflinknode(tree, nodes) lookupfn = makelookupmflinknode(tree, nodes)
deltas = deltagroup( deltas = deltagroup(
self._repo, store, prunednodes, False, lookupfn, self._repo, store, prunednodes, False, lookupfn,
linkrevnodes = linknodes(filerevlog, fname) linkrevnodes = linknodes(filerevlog, fname)
# Lookup for filenodes, we collected the linkrev nodes above in the # Lookup for filenodes, we collected the linkrev nodes above in the
# fastpath case and with lookupmf in the slowpath case. # fastpath case and with lookupmf in the slowpath case.
def lookupfilelog(x): def lookupfilelog(x):
return linkrevnodes[x] return linkrevnodes[x]
frev, flr = filerevlog.rev, filerevlog.linkrev frev, flr = filerevlog.rev, filerevlog.linkrev
# Skip sending any filenode we know the client already
# has. This avoids over-sending files relatively
# inexpensively, so it's not a problem if we under-filter
# here.
filenodes = [n for n in linkrevnodes filenodes = [n for n in linkrevnodes
if flr(frev(n)) not in commonrevs] if flr(frev(n)) not in commonrevs]
if not filenodes: if not filenodes:
continue continue
progress.update(i + 1, item=fname) progress.update(i + 1, item=fname)