equal
deleted
inserted
replaced
463 torev = repo.unfiltered().changelog.nodemap.get |
463 torev = repo.unfiltered().changelog.nodemap.get |
464 phase = repo._phasecache.phase |
464 phase = repo._phasecache.phase |
465 succsmarkers = repo.obsstore.successors.get |
465 succsmarkers = repo.obsstore.successors.get |
466 public = phases.public |
466 public = phases.public |
467 addedmarkers = tr.changes.get('obsmarkers') |
467 addedmarkers = tr.changes.get('obsmarkers') |
468 addedrevs = tr.changes['revs'] |
468 origrepolen = tr.changes['origrepolen'] |
469 seenrevs = set() |
469 seenrevs = set() |
470 obsoleted = set() |
470 obsoleted = set() |
471 for mark in addedmarkers: |
471 for mark in addedmarkers: |
472 node = mark[0] |
472 node = mark[0] |
473 rev = torev(node) |
473 rev = torev(node) |
474 if rev is None or rev in seenrevs or rev in addedrevs: |
474 if rev is None or rev in seenrevs or rev >= origrepolen: |
475 continue |
475 continue |
476 seenrevs.add(rev) |
476 seenrevs.add(rev) |
477 if phase(repo, rev) == public: |
477 if phase(repo, rev) == public: |
478 continue |
478 continue |
479 if set(succsmarkers(node) or []).issubset(addedmarkers): |
479 if set(succsmarkers(node) or []).issubset(addedmarkers): |