Mercurial > public > mercurial-scm > hg
comparison mercurial/obsutil.py @ 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 | 68f3e819d41d |
| children | 2cb442bc1a76 |
comparison
equal
deleted
inserted
replaced
| 33712:672ad4f3bb84 | 33713:888f24810ea2 |
|---|---|
| 305 if rev is None or rev in seenrevs: | 305 if rev is None or rev in seenrevs: |
| 306 continue | 306 continue |
| 307 seenrevs.add(rev) | 307 seenrevs.add(rev) |
| 308 if phase(repo, rev) == public: | 308 if phase(repo, rev) == public: |
| 309 continue | 309 continue |
| 310 if set(succsmarkers(node)).issubset(addedmarkers): | 310 if set(succsmarkers(node) or []).issubset(addedmarkers): |
| 311 obsoleted.add(rev) | 311 obsoleted.add(rev) |
| 312 return obsoleted | 312 return obsoleted |
| 313 | 313 |
| 314 def successorssets(repo, initialnode, closest=False, cache=None): | 314 def successorssets(repo, initialnode, closest=False, cache=None): |
| 315 """Return set of all latest successors of initial nodes | 315 """Return set of all latest successors of initial nodes |