Mercurial > hg
comparison mercurial/obsutil.py @ 39325:93175cba7edd
obsutil: make sure "addedmarkers" is not None in getobsoleted()
Similar reasoning as in 52e6171ec822 (obsutil: make sure "addedrevs"
is not None in getobsoleted(), 2018-08-25).
Differential Revision: https://phab.mercurial-scm.org/D4411
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 28 Aug 2018 15:09:18 -0700 |
parents | 5763216ba311 |
children | bae6f1418a95 |
comparison
equal
deleted
inserted
replaced
39324:b902b177901d | 39325:93175cba7edd |
---|---|
462 """return the set of pre-existing revisions obsoleted by a transaction""" | 462 """return the set of pre-existing revisions obsoleted by a transaction""" |
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['obsmarkers'] |
468 origrepolen = tr.changes['origrepolen'] | 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] |