Show More
@@ -256,7 +256,7 b' def validdest(repo, old, new):' | |||||
256 | elif repo.obsstore: |
|
256 | elif repo.obsstore: | |
257 | # We only need this complicated logic if there is obsolescence |
|
257 | # We only need this complicated logic if there is obsolescence | |
258 | # XXX will probably deserve an optimised revset. |
|
258 | # XXX will probably deserve an optimised revset. | |
259 |
|
259 | nm = repo.changelog.nodemap | ||
260 | validdests = set([old]) |
|
260 | validdests = set([old]) | |
261 | plen = -1 |
|
261 | plen = -1 | |
262 | # compute the whole set of successors or descendants |
|
262 | # compute the whole set of successors or descendants | |
@@ -268,7 +268,8 b' def validdest(repo, old, new):' | |||||
268 | # obsolescence marker does not apply to public changeset |
|
268 | # obsolescence marker does not apply to public changeset | |
269 | succs.update(obsolete.allsuccessors(repo.obsstore, |
|
269 | succs.update(obsolete.allsuccessors(repo.obsstore, | |
270 | [c.node()])) |
|
270 | [c.node()])) | |
271 | validdests = set(repo.set('%ln::', succs)) |
|
271 | known = (n for n in succs if nm.get(n) is not None) | |
|
272 | validdests = set(repo.set('%ln::', known)) | |||
272 | validdests.remove(old) |
|
273 | validdests.remove(old) | |
273 | return new in validdests |
|
274 | return new in validdests | |
274 | else: |
|
275 | else: |
@@ -262,7 +262,8 b' Update to a successor works' | |||||
262 | 4efff6d98829d9c824c621afd6e3f01865f5439f |
|
262 | 4efff6d98829d9c824c621afd6e3f01865f5439f | |
263 | $ hg id --debug -r 5 |
|
263 | $ hg id --debug -r 5 | |
264 | c922c0139ca03858f655e4a2af4dd02796a63969 tip Y |
|
264 | c922c0139ca03858f655e4a2af4dd02796a63969 tip Y | |
265 |
$ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f |
|
265 | $ hg debugobsolete f6fc62dde3c0771e29704af56ba4d8af77abcc2f cccccccccccccccccccccccccccccccccccccccc | |
|
266 | $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc 4efff6d98829d9c824c621afd6e3f01865f5439f | |||
266 | $ hg push http://localhost:$HGPORT2/ |
|
267 | $ hg push http://localhost:$HGPORT2/ | |
267 | pushing to http://localhost:$HGPORT2/ |
|
268 | pushing to http://localhost:$HGPORT2/ | |
268 | searching for changes |
|
269 | searching for changes |
General Comments 0
You need to be logged in to leave comments.
Login now