Show More
@@ -338,19 +338,7 b' def checkheads(repo, remote, outgoing, r' | |||||
338 |
|
338 | |||
339 | def visibleheads(repo): |
|
339 | def visibleheads(repo): | |
340 | """return the set of visible head of this repo""" |
|
340 | """return the set of visible head of this repo""" | |
341 | # XXX we want a cache on this |
|
341 | return repo.filtered('unserved').heads() | |
342 | sroots = repo._phasecache.phaseroots[phases.secret] |
|
|||
343 | if sroots or repo.obsstore: |
|
|||
344 | # XXX very slow revset. storing heads or secret "boundary" |
|
|||
345 | # would help. |
|
|||
346 | revset = repo.set('heads(not (%ln:: + extinct()))', sroots) |
|
|||
347 |
|
||||
348 | vheads = [ctx.node() for ctx in revset] |
|
|||
349 | if not vheads: |
|
|||
350 | vheads.append(nullid) |
|
|||
351 | else: |
|
|||
352 | vheads = repo.heads() |
|
|||
353 | return vheads |
|
|||
354 |
|
342 | |||
355 |
|
343 | |||
356 | def visiblebranchmap(repo): |
|
344 | def visiblebranchmap(repo): |
@@ -91,7 +91,7 b' check that mercurial refuse to push' | |||||
91 | $ hg push ../other |
|
91 | $ hg push ../other | |
92 | pushing to ../other |
|
92 | pushing to ../other | |
93 | searching for changes |
|
93 | searching for changes | |
94 |
abort: push includes divergent changeset: |
|
94 | abort: push includes divergent changeset: 392fd25390da! | |
95 | [255] |
|
95 | [255] | |
96 |
|
96 | |||
97 | $ cd .. |
|
97 | $ cd .. |
@@ -176,6 +176,7 b" And that we can't push bumped changeset" | |||||
176 | $ hg push ../tmpa -r 0 --force #(make repo related) |
|
176 | $ hg push ../tmpa -r 0 --force #(make repo related) | |
177 | pushing to ../tmpa |
|
177 | pushing to ../tmpa | |
178 | searching for changes |
|
178 | searching for changes | |
|
179 | warning: repository is unrelated | |||
179 | adding changesets |
|
180 | adding changesets | |
180 | adding manifests |
|
181 | adding manifests | |
181 | adding file changes |
|
182 | adding file changes |
General Comments 0
You need to be logged in to leave comments.
Login now