comparison mercurial/bookmarks.py @ 14268:a55a0045704c

merge with stable

14267:6332c02b3d68

    We also store a backup of the previous state in undo.bookmarks that
    can be copied back on rollback.
    '''
    refs = repo._bookmarks

    try:
        bms = repo.opener.read('bookmarks')
    except IOError, inst:
        if inst.errno != errno.ENOENT:
            raise
        bms = ''
    repo.opener.write('undo.bookmarks', bms)

    if repo._bookmarkcurrent not in refs:
        setcurrent(repo, None)
    for mark in refs.keys():
        if not valid(mark):

14268:a55a0045704c

    We also store a backup of the previous state in undo.bookmarks that
    can be copied back on rollback.
    '''
    refs = repo._bookmarks

    if repo._bookmarkcurrent not in refs:
        setcurrent(repo, None)
    for mark in refs.keys():
        if not valid(mark):