Show More
@@ -285,8 +285,15 b' def analyzeremotephases(repo, subset, ro' | |||
|
285 | 285 | repo.ui.warn(_('ignoring unexpected root from remote: %i %s\n') |
|
286 | 286 | % (phase, nhex)) |
|
287 | 287 | # compute heads |
|
288 | revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))', | |
|
289 | subset, draftroots, draftroots, subset) | |
|
290 | publicheads = [c.node() for c in revset] | |
|
288 | publicheads = newheads(repo, subset, draftroots) | |
|
291 | 289 | return publicheads, draftroots |
|
292 | 290 | |
|
291 | def newheads(repo, heads, roots): | |
|
292 | """compute new head of a subset minus another | |
|
293 | ||
|
294 | * `heads`: define the first subset | |
|
295 | * `rroots`: define the second we substract to the first""" | |
|
296 | revset = repo.set('heads((%ln + parents(%ln)) - (%ln::%ln))', | |
|
297 | heads, roots, roots, heads) | |
|
298 | return [c.node() for c in revset] | |
|
299 |
General Comments 0
You need to be logged in to leave comments.
Login now