comparison mercurial/bookmarks.py @ 13627:71a96f6c205d stable

bookmarks: discard current bookmark if absent from the bookmarks (issue2692)

After a rollback, the current bookmark might be absent from the bookmarks
file. In that case we discard it instead of displaying a traceback during
commit.

13626:4e96a5bee10d

    mark = None
    if os.path.exists(repo.join('bookmarks.current')):
        file = repo.opener('bookmarks.current')
        # No readline() in posixfile_nt, reading everything is cheap
        mark = encoding.tolocal((file.readlines() or [''])[0])
        if mark == '':
            mark = None
        file.close()
    return mark

def write(repo):

13627:71a96f6c205d

    mark = None
    if os.path.exists(repo.join('bookmarks.current')):
        file = repo.opener('bookmarks.current')
        # No readline() in posixfile_nt, reading everything is cheap
        mark = encoding.tolocal((file.readlines() or [''])[0])
        if mark == '' or mark not in repo._bookmarks:
            mark = None
        file.close()
    return mark

def write(repo):