Show More
@@ -144,16 +144,17 b' def findcommonheads(ui, local, remote,' | |||
|
144 | 144 | cl = local.changelog |
|
145 | 145 | clnode = cl.node |
|
146 | 146 | clrev = cl.rev |
|
147 | localsubset = None | |
|
148 | 147 | |
|
149 | 148 | if ancestorsof is not None: |
|
150 |
|
|
|
151 | dag = dagutil.revlogdag(cl, localsubset=localsubset) | |
|
149 | ownheads = [clrev(n) for n in ancestorsof] | |
|
150 | else: | |
|
151 | ownheads = [rev for rev in cl.headrevs() if rev != nullrev] | |
|
152 | ||
|
153 | dag = dagutil.revlogdag(cl, localsubset=ownheads) | |
|
152 | 154 | |
|
153 | 155 | # early exit if we know all the specified remote heads already |
|
154 | 156 | ui.debug("query 1; heads\n") |
|
155 | 157 | roundtrips += 1 |
|
156 | ownheads = dag.heads() | |
|
157 | 158 | sample = _limitsample(ownheads, initialsamplesize) |
|
158 | 159 | # indices between sample and externalized version must match |
|
159 | 160 | sample = list(sample) |
General Comments 0
You need to be logged in to leave comments.
Login now