# HG changeset patch # User Martin von Zweigbergk # Date 2018-08-28 22:09:18 # Node ID 93175cba7edd50dfebac308f5f158c5dbcfc2395 # Parent b902b177901d433682c7b88f4b0e8a817b089933 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 diff --git a/mercurial/obsutil.py b/mercurial/obsutil.py --- a/mercurial/obsutil.py +++ b/mercurial/obsutil.py @@ -464,7 +464,7 @@ def getobsoleted(repo, tr): phase = repo._phasecache.phase succsmarkers = repo.obsstore.successors.get public = phases.public - addedmarkers = tr.changes.get('obsmarkers') + addedmarkers = tr.changes['obsmarkers'] origrepolen = tr.changes['origrepolen'] seenrevs = set() obsoleted = set()