comparison mercurial/exchange.py @ 42924:e0bf41b83cef

exchange: avoid unnecessary conversion of bookmark nodes to hex (API)

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

42923:a7abc6081bc5

import collections
import hashlib

from .i18n import _
from .node import (
    bin,
    hex,
    nullid,
    nullrev,
)
from .thirdparty import (

        self.outdatedphases = None
        # phases changes that must be pushed if changeset push fails
        self.fallbackoutdatedphases = None
        # outgoing obsmarkers
        self.outobsmarkers = set()
        # outgoing bookmarks
        self.outbookmarks = []
        # transaction manager
        self.trmanager = None
        # map { pushkey partid -> callback handling failure}
        # used to handle exception from mandatory pushkey part failure

    explicit = {repo._bookmarks.expandname(bookmark)
                for bookmark in pushop.bookmarks}

    remotebookmark = bookmod.unhexlifybookmarks(remotebookmark)
    comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark)

    def safehex(x):
        if x is None:
            return x
        return hex(x)

    def hexifycompbookmarks(bookmarks):
        return [(b, safehex(scid), safehex(dcid))
                for (b, scid, dcid) in bookmarks]

    comp = [hexifycompbookmarks(marks) for marks in comp]
    return _processcompared(pushop, ancestors, explicit, remotebookmark, comp)

def _processcompared(pushop, pushed, explicit, remotebms, comp):
    """take decision on bookmarks to push to the remote repo

    hasbookmarkcheck = 'bookmarks' in b2caps
    if not (pushop.outbookmarks and hasbookmarkcheck):
        return
    data = []
    for book, old, new in pushop.outbookmarks:
        old = bin(old)
        data.append((book, old))
    checkdata = bookmod.binaryencode(data)
    bundler.newpart('check:bookmarks', data=checkdata)

@b2partsgenerator('check-phases')

    allactions = []
    data = []
    for book, old, new in pushop.outbookmarks:
        _abortonsecretctx(pushop, new, book)
        new = bin(new)
        data.append((book, new))
        allactions.append((book, _bmaction(old, new)))
    checkdata = bookmod.binaryencode(data)
    bundler.newpart('bookmarks', data=checkdata)

    for book, old, new in pushop.outbookmarks:
        _abortonsecretctx(pushop, new, book)
        part = bundler.newpart('pushkey')
        part.addparam('namespace', enc('bookmarks'))
        part.addparam('key', enc(book))
        part.addparam('old', enc(old))
        part.addparam('new', enc(new))
        action = 'update'
        if not old:
            action = 'export'
        elif not new:
            action = 'delete'

        with remote.commandexecutor() as e:
            r = e.callcommand('pushkey', {
                'namespace': 'bookmarks',
                'key': b,
                'old': old,
                'new': new,
            }).result()

        if r:
            ui.status(bookmsgmap[action][0] % b)
        else:

42924:e0bf41b83cef

import collections
import hashlib

from .i18n import _
from .node import (
    hex,
    nullid,
    nullrev,
)
from .thirdparty import (

        self.outdatedphases = None
        # phases changes that must be pushed if changeset push fails
        self.fallbackoutdatedphases = None
        # outgoing obsmarkers
        self.outobsmarkers = set()
        # outgoing bookmarks, list of (bm, oldnode | '', newnode | '')
        self.outbookmarks = []
        # transaction manager
        self.trmanager = None
        # map { pushkey partid -> callback handling failure}
        # used to handle exception from mandatory pushkey part failure

    explicit = {repo._bookmarks.expandname(bookmark)
                for bookmark in pushop.bookmarks}

    remotebookmark = bookmod.unhexlifybookmarks(remotebookmark)
    comp = bookmod.comparebookmarks(repo, repo._bookmarks, remotebookmark)
    return _processcompared(pushop, ancestors, explicit, remotebookmark, comp)

def _processcompared(pushop, pushed, explicit, remotebms, comp):
    """take decision on bookmarks to push to the remote repo

    hasbookmarkcheck = 'bookmarks' in b2caps
    if not (pushop.outbookmarks and hasbookmarkcheck):
        return
    data = []
    for book, old, new in pushop.outbookmarks:
        data.append((book, old))
    checkdata = bookmod.binaryencode(data)
    bundler.newpart('check:bookmarks', data=checkdata)

@b2partsgenerator('check-phases')

    allactions = []
    data = []
    for book, old, new in pushop.outbookmarks:
        _abortonsecretctx(pushop, new, book)
        data.append((book, new))
        allactions.append((book, _bmaction(old, new)))
    checkdata = bookmod.binaryencode(data)
    bundler.newpart('bookmarks', data=checkdata)

    for book, old, new in pushop.outbookmarks:
        _abortonsecretctx(pushop, new, book)
        part = bundler.newpart('pushkey')
        part.addparam('namespace', enc('bookmarks'))
        part.addparam('key', enc(book))
        part.addparam('old', enc(hex(old)))
        part.addparam('new', enc(hex(new)))
        action = 'update'
        if not old:
            action = 'export'
        elif not new:
            action = 'delete'

        with remote.commandexecutor() as e:
            r = e.callcommand('pushkey', {
                'namespace': 'bookmarks',
                'key': b,
                'old': hex(old),
                'new': hex(new),
            }).result()

        if r:
            ui.status(bookmsgmap[action][0] % b)
        else: