# HG changeset patch # User Pierre-Yves David # Date 1488288534 -3600 # Node ID 545761a5a5b31011c0cf06bf5fc7b952e3a6dbac # Parent 41b531dab3ad9965f0b45d322f4e578c9405ee50 compat: always use the strip revset from core We only support versions that defines it. diff -r 41b531dab3ad -r 545761a5a5b3 hgext3rd/evolve/__init__.py --- a/hgext3rd/evolve/__init__.py Tue Feb 28 14:28:23 2017 +0100 +++ b/hgext3rd/evolve/__init__.py Tue Feb 28 14:28:54 2017 +0100 @@ -2370,14 +2370,7 @@ nodetobookmarks.setdefault(node, []).append(mark) for marks in nodetobookmarks.values(): if bookmarks.issuperset(marks): - if util.safehasattr(repair, 'stripbmrevset'): - rsrevs = repair.stripbmrevset(repo, marks[0]) - else: - rsrevs = repo.revs("ancestors(bookmark(%s)) - " - "ancestors(head() and not bookmark(%s)) - " - "ancestors(bookmark() and not bookmark(%s)) - " - "obsolete()", - marks[0], marks[0], marks[0]) + rsrevs = repair.stripbmrevset(repo, marks[0]) revs = set(revs) revs.update(set(rsrevs)) revs = sorted(revs)