comparison mercurial/commands.py @ 3802:a0d0d24c4e71

Removed unused parameters/options of update command.

3801:bd7011246fab

    """
    gen = changegroup.readbundle(urllib.urlopen(fname))
    modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
    return postincoming(ui, repo, modheads, opts['update'])

def update(ui, repo, node=None, merge=False, clean=False, force=None,
           branch=None):
    """update or merge working directory

    Update the working directory to the specified revision.

    If there are no outstanding changes in the working directory and

         _('hg unbundle [-u] FILE')),
    "^update|up|checkout|co":
        (update,
         [('b', 'branch', '',
           _('checkout the head of a specific branch (DEPRECATED)')),
          ('m', 'merge', None, _('allow merging of branches (DEPRECATED)')),
          ('C', 'clean', None, _('overwrite locally modified files')),
          ('f', 'force', None, _('force a merge with outstanding changes'))],
         _('hg update [-C] [-f] [REV]')),
    "verify": (verify, [], _('hg verify')),
    "version": (version_, [], _('hg version')),
}

norepo = ("clone init version help debugancestor debugcomplete debugdata"

3802:a0d0d24c4e71

    """
    gen = changegroup.readbundle(urllib.urlopen(fname))
    modheads = repo.addchangegroup(gen, 'unbundle', 'bundle:' + fname)
    return postincoming(ui, repo, modheads, opts['update'])

def update(ui, repo, node=None, clean=False, branch=None):
    """update or merge working directory

    Update the working directory to the specified revision.

    If there are no outstanding changes in the working directory and

         _('hg unbundle [-u] FILE')),
    "^update|up|checkout|co":
        (update,
         [('b', 'branch', '',
           _('checkout the head of a specific branch (DEPRECATED)')),
          ('C', 'clean', None, _('overwrite locally modified files'))],
         _('hg update [-C] [REV]')),
    "verify": (verify, [], _('hg verify')),
    "version": (version_, [], _('hg version')),
}

norepo = ("clone init version help debugancestor debugcomplete debugdata"