comparison mercurial/commands.py @ 25367:d0f1d8b4de57

pull: only list remote bookmarks if -B is used to populate pulled heads

Listing remote bookmarks results in network traffic and latency. This
should be avoided when possible.

25365:4cc3fb23881d

    other = hg.peer(repo, opts, source)
    try:
        revs, checkout = hg.addbranchrevs(repo, other, branches,
                                          opts.get('rev'))

        remotebookmarks = other.listkeys('bookmarks')

        if opts.get('bookmark'):
            if not revs:
                revs = []
            for b in opts['bookmark']:
                if b not in remotebookmarks:
                    raise util.Abort(_('remote bookmark %s not found!') % b)
                revs.append(remotebookmarks[b])

25367:d0f1d8b4de57

    other = hg.peer(repo, opts, source)
    try:
        revs, checkout = hg.addbranchrevs(repo, other, branches,
                                          opts.get('rev'))


        if opts.get('bookmark'):
            if not revs:
                revs = []
            remotebookmarks = other.listkeys('bookmarks')
            for b in opts['bookmark']:
                if b not in remotebookmarks:
                    raise util.Abort(_('remote bookmark %s not found!') % b)
                revs.append(remotebookmarks[b])