equal
deleted
inserted
replaced
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) |