comparison mercurial/commands.py @ 9219:3f650f6aa130

merge with crew-stable

9218:d3db87d68337

    else:
        start = None
    closed = opts.get('closed')
    hideinactive, _heads = opts.get('active'), None
    if not branchrevs:
        # Assume we're looking repo-wide heads if no revs were specified.
        heads = repo.heads(start)
    else:
        if hideinactive:
            _heads = repo.heads(start)

    if date:
        if rev:
            raise util.Abort(_("you can't specify a revision and a date"))
        rev = cmdutil.finddate(ui, repo, date)

    if clean:
        return hg.clean(repo, rev)
    else:
        return hg.update(repo, rev)

def verify(ui, repo):

    "branches":
        (branches,
         [('a', 'active', False,
           _('show only branches that have unmerged heads')),
          ('c', 'closed', False,
           _('show normal and closed heads'))],
         _('[-a]')),
    "bundle":
        (bundle,
         [('f', 'force', None,
           _('run even when remote repository is unrelated')),

         _('[OPTION]... PATTERN [FILE]...')),
    "heads":
        (heads,
         [('r', 'rev', '', _('show only heads which are descendants of REV')),
          ('a', 'active', False,
           _('show only the active heads from open branches')),
          ('c', 'closed', False,
           _('show normal and closed heads')),
         ] + templateopts,
         _('[-r STARTREV] [REV]...')),
    "help": (help_, [], _('[TOPIC]')),
    "identify|id":
        (identify,

9219:3f650f6aa130

    else:
        start = None
    closed = opts.get('closed')
    hideinactive, _heads = opts.get('active'), None
    if not branchrevs:
        if closed:
            raise error.Abort(_('you must specify a branch to use --closed'))
        # Assume we're looking repo-wide heads if no revs were specified.
        heads = repo.heads(start)
    else:
        if hideinactive:
            _heads = repo.heads(start)

    if date:
        if rev:
            raise util.Abort(_("you can't specify a revision and a date"))
        rev = cmdutil.finddate(ui, repo, date)

    if clean or check:
        return hg.clean(repo, rev)
    else:
        return hg.update(repo, rev)

def verify(ui, repo):

    "branches":
        (branches,
         [('a', 'active', False,
           _('show only branches that have unmerged heads')),
          ('c', 'closed', False,
           _('show normal and closed branches'))],
         _('[-a]')),
    "bundle":
        (bundle,
         [('f', 'force', None,
           _('run even when remote repository is unrelated')),

         _('[OPTION]... PATTERN [FILE]...')),
    "heads":
        (heads,
         [('r', 'rev', '', _('show only heads which are descendants of REV')),
          ('a', 'active', False,
           _('show only the active branch heads from open branches')),
          ('c', 'closed', False,
           _('show normal and closed branch heads')),
         ] + templateopts,
         _('[-r STARTREV] [REV]...')),
    "help": (help_, [], _('[TOPIC]')),
    "identify|id":
        (identify,