comparison mercurial/bookmarks.py @ 48033:62f325f9b347

bookmarks: add an option to make pull mirror remote bookmarks

For backups for instance. Merging bookmarks is not a useful behavior
in that case.

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

48032:12966768595a

            node = None
        books.append((bookmark, node))
    return books


def updatefromremote(ui, repo, remotemarks, path, trfunc, explicit=()):
    ui.debug(b"checking for updated bookmarks\n")
    localmarks = repo._bookmarks
    (
        addsrc,
        adddst,
        advsrc,

            explicit.remove(b)
            ui.warn(
                _(b"remote bookmark %s points to locally missing %s\n")
                % (b, hex(scid)[:12])
            )

    if changed:
        tr = trfunc()
        changes = []
        key = lambda t: (t[0], t[1] or b'')
        for b, node, writer, msg in sorted(changed, key=key):
            changes.append((b, node))
            writer(msg)
        localmarks.applychanges(repo, tr, changes)


def incoming(ui, repo, peer):
    """Show bookmarks incoming from other to repo"""
    ui.status(_(b"searching for changed bookmarks\n"))

48033:62f325f9b347

            node = None
        books.append((bookmark, node))
    return books


def mirroring_remote(ui, repo, remotemarks):
    """computes the bookmark changes that set the local bookmarks to
    remotemarks"""
    changed = []
    localmarks = repo._bookmarks
    for (b, id) in pycompat.iteritems(remotemarks):
        if id != localmarks.get(b, None) and id in repo:
            changed.append((b, id, ui.debug, _(b"updating bookmark %s\n") % b))
    for b in localmarks:
        if b not in remotemarks:
            changed.append(
                (b, None, ui.debug, _(b"removing bookmark %s\n") % b)
            )
    return changed


def merging_from_remote(ui, repo, remotemarks, path, explicit=()):
    """computes the bookmark changes that merge remote bookmarks into the
    local bookmarks, based on comparebookmarks"""
    localmarks = repo._bookmarks
    (
        addsrc,
        adddst,
        advsrc,

            explicit.remove(b)
            ui.warn(
                _(b"remote bookmark %s points to locally missing %s\n")
                % (b, hex(scid)[:12])
            )
    return changed


def updatefromremote(ui, repo, remotemarks, path, trfunc, explicit=()):
    ui.debug(b"checking for updated bookmarks\n")
    if ui.configbool(b'bookmarks', b'mirror'):
        changed = mirroring_remote(ui, repo, remotemarks)
    else:
        changed = merging_from_remote(ui, repo, remotemarks, path, explicit)

    if changed:
        tr = trfunc()
        changes = []
        key = lambda t: (t[0], t[1] or b'')
        for b, node, writer, msg in sorted(changed, key=key):
            changes.append((b, node))
            writer(msg)
        repo._bookmarks.applychanges(repo, tr, changes)


def incoming(ui, repo, peer):
    """Show bookmarks incoming from other to repo"""
    ui.status(_(b"searching for changed bookmarks\n"))