This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6505

dagop: fix documentation of reachableroots
ClosedPublic

Authored by valentin.gatienbaron on Jun 10 2019, 12:46 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3e42fc243741: dagop: fix documentation of reachableroots
Summary

The previous revset couldn't be correct as it is symmetric in <roots>
and <heads>, but reachableroots has no such symmetry. It makes a
difference with for instance reachableroots(2, 3) where 2 and 3 are
both children of 1.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Jun 10 2019, 7:07 PM
pulkit added inline comments.
mercurial/dagop.py
265

if this doc about includepath was correct, let's keep it.

pulkit added inline comments.Jun 10 2019, 7:14 PM
mercurial/dagop.py
265

ignore me here, now I saw the next patch.

valentin.gatienbaron added a commit: rHG3e42fc243741: dagop: fix documentation of reachableroots.Jun 12 2019, 12:44 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG3e42fc243741: dagop: fix documentation of reachableroots (authored by valentin.gatienbaron). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/dagop.py (6 lines)

Diff 15421

mercurial/dagop.py

for rev in revsfn(start=first + 1): for rev in revsfn(start=first + 1):
for prev in parentrevsfn(rev): for prev in parentrevsfn(rev):
if prev != nullrev and prev in seen: if prev != nullrev and prev in seen:
seen.add(rev) seen.add(rev)
yield rev yield rev
break break
def _reachablerootspure(repo, minroot, roots, heads, includepath): def _reachablerootspure(repo, minroot, roots, heads, includepath):
"""return (heads(::<roots> and ::<heads>)) """See reachableroots"""
If includepath is True, return (<roots>::<heads>)."""
pulkitUnsubmitted
Not Done

if this doc about includepath was correct, let's keep it.

pulkit: if this doc about `includepath` was correct, let's keep it.
pulkitUnsubmitted
Not Done

ignore me here, now I saw the next patch.

pulkit: ignore me here, now I saw the next patch.
if not roots: if not roots:
return [] return []
parentrevs = repo.changelog.parentrevs parentrevs = repo.changelog.parentrevs
roots = set(roots) roots = set(roots)
visit = list(heads) visit = list(heads)
reachable = set() reachable = set()
seen = {} seen = {}
# prefetch all the things! (because python is slow) # prefetch all the things! (because python is slow)
return reachable return reachable
for rev in sorted(seen): for rev in sorted(seen):
for parent in seen[rev]: for parent in seen[rev]:
if parent in reachable: if parent in reachable:
reached(rev) reached(rev)
return reachable return reachable
def reachableroots(repo, roots, heads, includepath=False): def reachableroots(repo, roots, heads, includepath=False):
"""return (heads(::<roots> and ::<heads>)) """return (heads(::<roots> and <roots>::<heads>))
If includepath is True, return (<roots>::<heads>).""" If includepath is True, return (<roots>::<heads>)."""
if not roots: if not roots:
return baseset() return baseset()
minroot = roots.min() minroot = roots.min()
roots = list(roots) roots = list(roots)
heads = list(heads) heads = list(heads)
try: try: