Mercurial > public > mercurial-scm > hg-stable

diff mercurial/obsutil.py @ 33739:888f24810ea2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
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