Show More
@@ -24,7 +24,6 b' from . import (' | |||
|
24 | 24 | bookmarks as bookmod, |
|
25 | 25 | bundle2, |
|
26 | 26 | changegroup, |
|
27 | dagutil, | |
|
28 | 27 | discovery, |
|
29 | 28 | error, |
|
30 | 29 | lock as lockmod, |
@@ -1906,10 +1905,11 b' def _computeellipsis(repo, common, heads' | |||
|
1906 | 1905 | cl = repo.changelog |
|
1907 | 1906 | mfl = repo.manifestlog |
|
1908 | 1907 | |
|
1909 | cldag = dagutil.revlogdag(cl) | |
|
1910 | # dagutil does not like nullid/nullrev | |
|
1911 | commonrevs = cldag.internalizeall(common - set([nullid])) | set([nullrev]) | |
|
1912 | headsrevs = cldag.internalizeall(heads) | |
|
1908 | clrev = cl.rev | |
|
1909 | ||
|
1910 | commonrevs = {clrev(n) for n in common} | {nullrev} | |
|
1911 | headsrevs = {clrev(n) for n in heads} | |
|
1912 | ||
|
1913 | 1913 | if depth: |
|
1914 | 1914 | revdepth = {h: 0 for h in headsrevs} |
|
1915 | 1915 | |
@@ -1954,7 +1954,7 b' def _computeellipsis(repo, common, heads' | |||
|
1954 | 1954 | required = set(headsrevs) | known |
|
1955 | 1955 | for rev in visit: |
|
1956 | 1956 | clrev = cl.changelogrevision(rev) |
|
1957 | ps = cldag.parents(rev) | |
|
1957 | ps = [prev for prev in cl.parentrevs(rev) if prev != nullrev] | |
|
1958 | 1958 | if depth is not None: |
|
1959 | 1959 | curdepth = revdepth[rev] |
|
1960 | 1960 | for p in ps: |
General Comments 0
You need to be logged in to leave comments.
Login now