comparison mercurial/bundle2.py @ 40147:58ebf5083843

push: add "remote" to 'repository changed while pushing' messages (issue5971)

Differential Revision: https://phab.mercurial-scm.org/D4933

40146:adfe4bb53a47

    contains binary encoded (bookmark, node) tuple. If the local state does
    not marks the one in the part, a PushRaced exception is raised
    """
    bookdata = bookmarks.binarydecode(inpart)

    msgstandard = ('repository changed while pushing - please try again '
                   '(bookmark "%s" move from %s to %s)')
    msgmissing = ('repository changed while pushing - please try again '
                  '(bookmark "%s" is missing, expected %s)')
    msgexist = ('repository changed while pushing - please try again '
                '(bookmark "%s" set on %s, expected missing)')
    for book, node in bookdata:
        currentnode = op.repo._bookmarks.get(book)
        if currentnode != node:
            if node is None:

    assert not h
    # Trigger a transaction so that we are guaranteed to have the lock now.
    if op.ui.configbool('experimental', 'bundle2lazylocking'):
        op.gettransaction()
    if sorted(heads) != sorted(op.repo.heads()):
        raise error.PushRaced('repository changed while pushing - '
                              'please try again')

@parthandler('check:updated-heads')
def handlecheckupdatedheads(op, inpart):
    """check for race on the heads touched by a push

    for ls in op.repo.branchmap().itervalues():
        currentheads.update(ls)

    for h in heads:
        if h not in currentheads:
            raise error.PushRaced('repository changed while pushing - '
                                  'please try again')

@parthandler('check:phases')
def handlecheckphases(op, inpart):
    """check that phase boundaries of the repository did not change

    """
    phasetonodes = phases.binarydecode(inpart)
    unfi = op.repo.unfiltered()
    cl = unfi.changelog
    phasecache = unfi._phasecache
    msg = ('repository changed while pushing - please try again '
           '(%s is %s expected %s)')
    for expectedphase, nodes in enumerate(phasetonodes):
        for n in nodes:
            actualphase = phasecache.phase(unfi, cl.rev(n))
            if actualphase != expectedphase:

40147:58ebf5083843

    contains binary encoded (bookmark, node) tuple. If the local state does
    not marks the one in the part, a PushRaced exception is raised
    """
    bookdata = bookmarks.binarydecode(inpart)

    msgstandard = ('remote repository changed while pushing - please try again '
                   '(bookmark "%s" move from %s to %s)')
    msgmissing = ('remote repository changed while pushing - please try again '
                  '(bookmark "%s" is missing, expected %s)')
    msgexist = ('remote repository changed while pushing - please try again '
                '(bookmark "%s" set on %s, expected missing)')
    for book, node in bookdata:
        currentnode = op.repo._bookmarks.get(book)
        if currentnode != node:
            if node is None:

    assert not h
    # Trigger a transaction so that we are guaranteed to have the lock now.
    if op.ui.configbool('experimental', 'bundle2lazylocking'):
        op.gettransaction()
    if sorted(heads) != sorted(op.repo.heads()):
        raise error.PushRaced('remote repository changed while pushing - '
                              'please try again')

@parthandler('check:updated-heads')
def handlecheckupdatedheads(op, inpart):
    """check for race on the heads touched by a push

    for ls in op.repo.branchmap().itervalues():
        currentheads.update(ls)

    for h in heads:
        if h not in currentheads:
            raise error.PushRaced('remote repository changed while pushing - '
                                  'please try again')

@parthandler('check:phases')
def handlecheckphases(op, inpart):
    """check that phase boundaries of the repository did not change

    """
    phasetonodes = phases.binarydecode(inpart)
    unfi = op.repo.unfiltered()
    cl = unfi.changelog
    phasecache = unfi._phasecache
    msg = ('remote repository changed while pushing - please try again '
           '(%s is %s expected %s)')
    for expectedphase, nodes in enumerate(phasetonodes):
        for n in nodes:
            actualphase = phasecache.phase(unfi, cl.rev(n))
            if actualphase != expectedphase: