comparison mercurial/bookmarks.py @ 20027:4b06b2a445a1

bookmarks: rewrite pushing bookmarks in "localrepository.push()" by "compare()"

This patch adds "updateremote()", which uses "compare()" to compare
bookmarks between the local and the remote repositories, to replace
pushing local bookmarks in "localrepository.push()".

20026:84905561ad41

        for b, node, writer, msg in sorted(changed):
            localmarks[b] = node
            writer(msg)
        localmarks.write()

def pushtoremote(ui, repo, remote, targets):
    (addsrc, adddst, advsrc, advdst, diverge, differ, invalid
     ) = compare(repo, repo._bookmarks, remote.listkeys('bookmarks'),
                 srchex=hex, targets=targets)
    if invalid:

20027:4b06b2a445a1

        for b, node, writer, msg in sorted(changed):
            localmarks[b] = node
            writer(msg)
        localmarks.write()

def updateremote(ui, repo, remote, revs):
    ui.debug("checking for updated bookmarks\n")
    revnums = map(repo.changelog.rev, revs or [])
    ancestors = [a for a in repo.changelog.ancestors(revnums, inclusive=True)]
    (addsrc, adddst, advsrc, advdst, diverge, differ, invalid
     ) = compare(repo, repo._bookmarks, remote.listkeys('bookmarks'),
                 srchex=hex)

    for b, scid, dcid in advsrc:
        if ancestors and repo[scid].rev() not in ancestors:
            continue
        if remote.pushkey('bookmarks', b, dcid, scid):
            ui.status(_("updating bookmark %s\n") % b)
        else:
            ui.warn(_('updating bookmark %s failed!\n') % b)

def pushtoremote(ui, repo, remote, targets):
    (addsrc, adddst, advsrc, advdst, diverge, differ, invalid
     ) = compare(repo, repo._bookmarks, remote.listkeys('bookmarks'),
                 srchex=hex, targets=targets)
    if invalid: