obsutil: make sure "addedmarkers" is not None in getobsoleted()
authorMartin von Zweigbergk <martinvonz@google.com>
Tue, 28 Aug 2018 15:09:18 -0700
changeset 39325 93175cba7edd
parent 39324 b902b177901d
child 39326 63aa928be559
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
mercurial/obsutil.py
--- a/mercurial/obsutil.py	Tue Aug 28 13:29:47 2018 -0700
+++ b/mercurial/obsutil.py	Tue Aug 28 15:09:18 2018 -0700
@@ -464,7 +464,7 @@
     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()