Mercurial > public > mercurial-scm > hg-stable
diff mercurial/obsutil.py @ 39352: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 |
line wrap: on
line diff
--- 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()