This is an archive of the discontinued Mercurial Phabricator instance.

Differential D274

obsutil: defend against succsmarkers() returning None
ClosedPublic

Authored by durin42 on Aug 8 2017, 3:49 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHG888f24810ea2: obsutil: defend against succsmarkers() returning None
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

durin42 created this revision.Aug 8 2017, 3:49 PM
quark accepted this revision.Aug 9 2017, 1:15 AM
Closed by commit rHG888f24810ea2: obsutil: defend against succsmarkers() returning None (authored by durin42). · Explain WhyAug 9 2017, 10:18 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/obsutil.py (2 lines)

Diff 669

mercurial/obsutil.py

for mark in addedmarkers: for mark in addedmarkers:
node = mark[0] node = mark[0]
rev = torev(node) rev = torev(node)
if rev is None or rev in seenrevs: if rev is None or rev in seenrevs:
continue continue
seenrevs.add(rev) seenrevs.add(rev)
if phase(repo, rev) == public: if phase(repo, rev) == public:
continue continue
if set(succsmarkers(node)).issubset(addedmarkers): if set(succsmarkers(node) or []).issubset(addedmarkers):
obsoleted.add(rev) obsoleted.add(rev)
return obsoleted return obsoleted
def successorssets(repo, initialnode, closest=False, cache=None): def successorssets(repo, initialnode, closest=False, cache=None):
"""Return set of all latest successors of initial nodes """Return set of all latest successors of initial nodes
The successors set of a changeset A are the group of revisions that succeed The successors set of a changeset A are the group of revisions that succeed
A. It succeeds A as a consistent whole, each revision being only a partial A. It succeeds A as a consistent whole, each revision being only a partial