mercurial/commands.py

28960:14e683d6b273

                                 'values for --type'))

    # Packed bundles are a pseudo bundle format for now.
    if cgversion == 's1':
        raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
                          hint=_('use "hg debugcreatestreamclonebundle"'))

    if opts.get('all'):
        if dest:
            raise error.Abort(_("--all is incompatible with specifying "
                                "a destination"))

                    extra += ' --user %s' % opts['user']
                if opts.get('date'):
                    extra += ' --date %s' % opts['date']
                if opts.get('log'):
                    extra += ' --log'
                hint=_('use hg resolve and hg graft --continue%s') % extra
                raise error.Abort(
                    _("unresolved conflicts, can't continue"),
                    hint=hint)
        else:
            cont = False

    parent, p2 = repo.dirstate.parents()
    if not opts.get('rev') and p2 != nullid:
        # revert after merge is a trap for new users (issue2915)
        raise error.Abort(_('uncommitted merge with no revision specified'),
                         hint=_('use "hg update" or see "hg help revert"'))

    ctx = scmutil.revsingle(repo, opts.get('rev'))

    if (not (pats or opts.get('include') or opts.get('exclude') or
             opts.get('all') or opts.get('interactive'))):

28961:2e58dc022caa

                                 'values for --type'))

    # Packed bundles are a pseudo bundle format for now.
    if cgversion == 's1':
        raise error.Abort(_('packed bundles cannot be produced by "hg bundle"'),
                          hint=_("use 'hg debugcreatestreamclonebundle'"))

    if opts.get('all'):
        if dest:
            raise error.Abort(_("--all is incompatible with specifying "
                                "a destination"))

                    extra += ' --user %s' % opts['user']
                if opts.get('date'):
                    extra += ' --date %s' % opts['date']
                if opts.get('log'):
                    extra += ' --log'
                hint=_("use 'hg resolve' and 'hg graft --continue%s'") % extra
                raise error.Abort(
                    _("unresolved conflicts, can't continue"),
                    hint=hint)
        else:
            cont = False

    parent, p2 = repo.dirstate.parents()
    if not opts.get('rev') and p2 != nullid:
        # revert after merge is a trap for new users (issue2915)
        raise error.Abort(_('uncommitted merge with no revision specified'),
                         hint=_("use 'hg update' or see 'hg help revert'"))

    ctx = scmutil.revsingle(repo, opts.get('rev'))

    if (not (pats or opts.get('include') or opts.get('exclude') or
             opts.get('all') or opts.get('interactive'))):