comparison mercurial/commands.py @ 13366:c756e9166417

bookmarks: merge incoming/outgoing into core

13365:f1c5294e9119

from node import hex, nullid, nullrev, short
from lock import release
from i18n import _, gettext
import os, re, sys, difflib, time, tempfile
import hg, util, revlog, extensions, copies, error
import patch, help, mdiff, url, encoding, templatekw, discovery
import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
import merge as mergemod
import minirst, revset
import dagparser

    Returns 0 if there are incoming changes, 1 otherwise.
    """
    if opts.get('bundle') and opts.get('subrepos'):
        raise util.Abort(_('cannot combine --bundle and --subrepos'))

    ret = hg.incoming(ui, repo, source, opts)
    return ret

def init(ui, dest=".", **opts):
    """create a new repository in the given directory

    See pull for details of valid destination formats.

    Returns 0 if there are outgoing changes, 1 otherwise.
    """
    ret = hg.outgoing(ui, repo, dest, opts)
    return ret

def parents(ui, repo, file_=None, **opts):
    """show the parents of the working directory or revision

          ('n', 'newest-first', None, _('show newest record first')),
          ('', 'bundle', '',
           _('file to store the bundles into'), _('FILE')),
          ('r', 'rev', [],
           _('a remote changeset intended to be added'), _('REV')),
          ('b', 'branch', [],
           _('a specific branch you would like to pull'), _('BRANCH')),
         ] + logopts + remoteopts + subrepoopts,
         _('[-p] [-n] [-M] [-f] [-r REV]...'
           ' [--bundle FILENAME] [SOURCE]')),

           _('run even when the destination is unrelated')),
          ('r', 'rev', [],
           _('a changeset intended to be included in the destination'),
           _('REV')),
          ('n', 'newest-first', None, _('show newest record first')),
          ('b', 'branch', [],
           _('a specific branch you would like to push'), _('BRANCH')),
         ] + logopts + remoteopts + subrepoopts,
         _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
    "parents":

13366:c756e9166417

from node import hex, nullid, nullrev, short
from lock import release
from i18n import _, gettext
import os, re, sys, difflib, time, tempfile
import hg, util, revlog, extensions, copies, error, bookmarks
import patch, help, mdiff, url, encoding, templatekw, discovery
import archival, changegroup, cmdutil, sshserver, hbisect, hgweb, hgweb.server
import merge as mergemod
import minirst, revset
import dagparser

    Returns 0 if there are incoming changes, 1 otherwise.
    """
    if opts.get('bundle') and opts.get('subrepos'):
        raise util.Abort(_('cannot combine --bundle and --subrepos'))

    if opts.get('bookmarks'):
        source, branches = hg.parseurl(ui.expandpath(source),
                                       opts.get('branch'))
        other = hg.repository(hg.remoteui(repo, opts), source)
        ui.status(_('comparing with %s\n') % url.hidepassword(source))
        return bookmarks.diff(ui, repo, other)

    ret = hg.incoming(ui, repo, source, opts)
    return ret

def init(ui, dest=".", **opts):
    """create a new repository in the given directory

    See pull for details of valid destination formats.

    Returns 0 if there are outgoing changes, 1 otherwise.
    """

    if opts.get('bookmarks'):
        dest = ui.expandpath(dest or 'default-push', dest or 'default')
        dest, branches = hg.parseurl(dest, opts.get('branch'))
        other = hg.repository(hg.remoteui(repo, opts), dest)
        ui.status(_('comparing with %s\n') % url.hidepassword(dest))
        return bookmarks.diff(ui, other, repo)

    ret = hg.outgoing(ui, repo, dest, opts)
    return ret

def parents(ui, repo, file_=None, **opts):
    """show the parents of the working directory or revision

          ('n', 'newest-first', None, _('show newest record first')),
          ('', 'bundle', '',
           _('file to store the bundles into'), _('FILE')),
          ('r', 'rev', [],
           _('a remote changeset intended to be added'), _('REV')),
          ('B', 'bookmarks', False, _("compare bookmarks")),
          ('b', 'branch', [],
           _('a specific branch you would like to pull'), _('BRANCH')),
         ] + logopts + remoteopts + subrepoopts,
         _('[-p] [-n] [-M] [-f] [-r REV]...'
           ' [--bundle FILENAME] [SOURCE]')),

           _('run even when the destination is unrelated')),
          ('r', 'rev', [],
           _('a changeset intended to be included in the destination'),
           _('REV')),
          ('n', 'newest-first', None, _('show newest record first')),
          ('B', 'bookmarks', False, _("compare bookmarks")),
          ('b', 'branch', [],
           _('a specific branch you would like to push'), _('BRANCH')),
         ] + logopts + remoteopts + subrepoopts,
         _('[-M] [-p] [-n] [-f] [-r REV]... [DEST]')),
    "parents":