Mercurial > hg
changeset 33713:888f24810ea2
obsutil: defend against succsmarkers() returning None
I'm not sure if this is a realistic problem, but doing this avoids
some pretty awful test failures on Python 3, and it looks like it
should be harmless.
Differential Revision: https://phab.mercurial-scm.org/D274
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Mon, 24 Jul 2017 11:29:51 -0400 |
| parents | 672ad4f3bb84 |
| children | d880a6bcef2f |
| files | mercurial/obsutil.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/obsutil.py Mon Jul 24 11:28:59 2017 -0400 +++ b/mercurial/obsutil.py Mon Jul 24 11:29:51 2017 -0400 @@ -307,7 +307,7 @@ seenrevs.add(rev) if phase(repo, rev) == public: continue - if set(succsmarkers(node)).issubset(addedmarkers): + if set(succsmarkers(node) or []).issubset(addedmarkers): obsoleted.add(rev) return obsoleted