Mercurial > evolve

comparison hgext3rd/topic/__init__.py @ 2905:610d06bcd714

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convertbookmark: properly exclude public changeset Public changeset are immutable and cannot have a topic anyway.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Sep 2017 17:04:21 +0200
parents 1928e9c802dd
children 92566275be77
comparison
equal deleted inserted replaced
2904:4ae89b5834e6 2905:610d06bcd714
523 523
524 rev is the revision on which bookmark bmark is and tr is transaction object. 524 rev is the revision on which bookmark bmark is and tr is transaction object.
525 """ 525 """
526 526
527 # copied from mercurial.repair.stripbmrevset 527 # copied from mercurial.repair.stripbmrevset
528 bookrevset = ("ancestors(bookmark(%s)) - ancestors(head() and not " 528 bookrevset = ("not public() and (ancestors(bookmark(%s)) - ancestors(head()"
529 "bookmark(%s)) - ancestors(bookmark() and not " 529 "and not bookmark(%s)) - ancestors(bookmark()"
530 "bookmark(%s))") 530 "and not bookmark(%s)))")
531 touchedrevs = repo.revs(bookrevset, bmark, bmark, bmark) 531 touchedrevs = repo.revs(bookrevset, bmark, bmark, bmark)
532 rewrote = _changetopics(ui, repo, touchedrevs, bmark) 532 rewrote = _changetopics(ui, repo, touchedrevs, bmark)
533 # We didn't changed topic to any changesets because the revset 533 # We didn't changed topic to any changesets because the revset
534 # returned an empty set of revisions, so let's skip deleting the 534 # returned an empty set of revisions, so let's skip deleting the
535 # bookmark corresponding to which we didn't put a topic on any 535 # bookmark corresponding to which we didn't put a topic on any