mercurial/bookmarks.py
branchstable
changeset 21843 92666a869ea4
parent 20352 58300f61b139
child 22364 5c153c69fdb2
equal deleted inserted replaced
21842:fd2527d9b995 21843:92666a869ea4
   162     Return True if at least one bookmark was deleted, False otherwise.'''
   162     Return True if at least one bookmark was deleted, False otherwise.'''
   163     deleted = False
   163     deleted = False
   164     marks = repo._bookmarks
   164     marks = repo._bookmarks
   165     divergent = [b for b in marks if b.split('@', 1)[0] == bm.split('@', 1)[0]]
   165     divergent = [b for b in marks if b.split('@', 1)[0] == bm.split('@', 1)[0]]
   166     for mark in divergent:
   166     for mark in divergent:
       
   167         if mark == '@' or '@' not in mark:
       
   168             # can't be divergent by definition
       
   169             continue
   167         if mark and marks[mark] in deletefrom:
   170         if mark and marks[mark] in deletefrom:
   168             if mark != bm:
   171             if mark != bm:
   169                 del marks[mark]
   172                 del marks[mark]
   170                 deleted = True
   173                 deleted = True
   171     return deleted
   174     return deleted