Mercurial > evolve

changeset 1833:545761a5a5b3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
compat: always use the strip revset from core We only support versions that defines it.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 28 Feb 2017 14:28:54 +0100
parents 41b531dab3ad
children f23a97d14895
files hgext3rd/evolve/__init__.py
diffstat 1 files changed, 1 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- 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)