hgext/evolve.py
changeset 612 15299bfd0813
parent 604 d43e80504e55
child 618 c39afce52e31
equal deleted inserted replaced
610:4a27cba047f5 612:15299bfd0813
  1029             for book in oldbookmarks:
  1029             for book in oldbookmarks:
  1030                 repo._bookmarks[book] = dest.node()
  1030                 repo._bookmarks[book] = dest.node()
  1031         for book in destbookmarks: # restore bookmark that rebase move
  1031         for book in destbookmarks: # restore bookmark that rebase move
  1032             repo._bookmarks[book] = dest.node()
  1032             repo._bookmarks[book] = dest.node()
  1033         if oldbookmarks or destbookmarks:
  1033         if oldbookmarks or destbookmarks:
  1034             bookmarks.write(repo)
  1034             repo._bookmarks.write()
  1035         return nodenew
  1035         return nodenew
  1036     except util.Abort:
  1036     except util.Abort:
  1037         # Invalidate the previous setparents
  1037         # Invalidate the previous setparents
  1038         repo.dirstate.invalidate()
  1038         repo.dirstate.invalidate()
  1039         raise
  1039         raise
  1052         if oldbookmarks:
  1052         if oldbookmarks:
  1053             for b in oldbookmarks:
  1053             for b in oldbookmarks:
  1054                 repo._bookmarks[b] = newid
  1054                 repo._bookmarks[b] = newid
  1055             dirty = True
  1055             dirty = True
  1056         if dirty:
  1056         if dirty:
  1057             bookmarks.write(repo)
  1057             repo._bookmarks.write()
  1058     return updatebookmarks
  1058     return updatebookmarks
  1059 
  1059 
  1060 ### new command
  1060 ### new command
  1061 #############################
  1061 #############################
  1062 cmdtable = {}
  1062 cmdtable = {}
  1755             if markers:
  1755             if markers:
  1756                 createmarkers(repo, markers)
  1756                 createmarkers(repo, markers)
  1757             for book in oldbookmarks:
  1757             for book in oldbookmarks:
  1758                 repo._bookmarks[book] = new.node()
  1758                 repo._bookmarks[book] = new.node()
  1759             if oldbookmarks:
  1759             if oldbookmarks:
  1760                 bookmarks.write(repo)
  1760                 repo._bookmarks.write()
  1761         return result
  1761         return result
  1762     finally:
  1762     finally:
  1763         if lock is not None:
  1763         if lock is not None:
  1764             lock.release()
  1764             lock.release()
  1765 
  1765