hgext/fetch.py
changeset 32375 04baab18d60a
parent 32337 46ba2cdda476
child 33013 9c242e9fca65
equal deleted inserted replaced
32374:194b0f781132 32375:04baab18d60a
    13 from mercurial.node import (
    13 from mercurial.node import (
    14     short,
    14     short,
    15 )
    15 )
    16 from mercurial import (
    16 from mercurial import (
    17     cmdutil,
    17     cmdutil,
    18     commands,
       
    19     error,
    18     error,
    20     exchange,
    19     exchange,
    21     hg,
    20     hg,
    22     lock,
    21     lock,
    23     registrar,
    22     registrar,
    37     [('r', 'rev', [],
    36     [('r', 'rev', [],
    38      _('a specific revision you would like to pull'), _('REV')),
    37      _('a specific revision you would like to pull'), _('REV')),
    39     ('e', 'edit', None, _('invoke editor on commit messages')),
    38     ('e', 'edit', None, _('invoke editor on commit messages')),
    40     ('', 'force-editor', None, _('edit commit message (DEPRECATED)')),
    39     ('', 'force-editor', None, _('edit commit message (DEPRECATED)')),
    41     ('', 'switch-parent', None, _('switch parents when merging')),
    40     ('', 'switch-parent', None, _('switch parents when merging')),
    42     ] + commands.commitopts + commands.commitopts2 + commands.remoteopts,
    41     ] + cmdutil.commitopts + cmdutil.commitopts2 + cmdutil.remoteopts,
    43     _('hg fetch [SOURCE]'))
    42     _('hg fetch [SOURCE]'))
    44 def fetch(ui, repo, source='default', **opts):
    43 def fetch(ui, repo, source='default', **opts):
    45     '''pull changes from a remote repository, merge new changes if needed.
    44     '''pull changes from a remote repository, merge new changes if needed.
    46 
    45 
    47     This finds all changes from the repository at the specified path
    46     This finds all changes from the repository at the specified path