hgext/strip.py
changeset 38131 46c2b19a1263
parent 36341 28a97cf212af
child 38574 f442c9494ec7
equal deleted inserted replaced
38130:a40cc6d7d8c3 38131:46c2b19a1263
   163             nodetobookmarks = {}
   163             nodetobookmarks = {}
   164             for mark, node in repomarks.iteritems():
   164             for mark, node in repomarks.iteritems():
   165                 nodetobookmarks.setdefault(node, []).append(mark)
   165                 nodetobookmarks.setdefault(node, []).append(mark)
   166             for marks in nodetobookmarks.values():
   166             for marks in nodetobookmarks.values():
   167                 if bookmarks.issuperset(marks):
   167                 if bookmarks.issuperset(marks):
   168                     rsrevs = repair.stripbmrevset(repo, marks[0])
   168                     rsrevs = scmutil.bookmarkrevs(repo, marks[0])
   169                     revs.update(set(rsrevs))
   169                     revs.update(set(rsrevs))
   170             if not revs:
   170             if not revs:
   171                 with repo.lock(), repo.transaction('bookmark') as tr:
   171                 with repo.lock(), repo.transaction('bookmark') as tr:
   172                     bmchanges = [(b, None) for b in bookmarks]
   172                     bmchanges = [(b, None) for b in bookmarks]
   173                     repomarks.applychanges(repo, tr, bmchanges)
   173                     repomarks.applychanges(repo, tr, bmchanges)