File: //usr/lib/python2.7/dist-packages/hgext/fetch.pyc
ó
ÛXc
@@ s( d Z d d l m Z d d l m Z d d l m Z d d l m Z m Z m
Z
m Z m Z m
Z
m Z e
j Z i Z e j e Z d Z e d d d g e d
e d f d d
d e d f d d d e d f d d d e d f g e j e j e j e d d d Z d S( s2 pull, update and merge in one command (DEPRECATED)i ( t absolute_import( t _( t short( t cmdutilt commandst errort exchanget hgt lockt utils ships-with-hg-coret fetcht rt revs* a specific revision you would like to pullt REVt et edits invoke editor on commit messagest s force-editors edit commit message (DEPRECATED)s
switch-parents switch parents when mergings hg fetch [SOURCE]t defaultc K@ sò | j d } | r+ t j | | d <n | j j \ } } | j j } y | j | } Wn t j k
r~ d } n X| | k r¯ t j
t d d t d n d } }
z$| j } | j
}
t j | | j | } g | D]( } t | | j d k r÷ | ^ q÷ } t | d k rOt j
t d n t j | | | j | }
| j t d t j | j | d } | d ry* g | d D] } |
j | ^ qŽ} Wqt j k
rt d
} t j
| qXn t j | |
d | j } | d k r0d S| j | } | j j | g | d } t | d k r€t | r€| d | k rt j | | d Sd Sn g | D] } | | k r«| ^ q«} | } | rò| d } t j | | n g | D] } | | k rù| ^ qù} t | d k rN| j t d
t | d d S| sXd St! } | r | d r| | d } } n@ | d | } } | j t d | j j" | t# | f t j | | | j t d | j j" | t# | f t j$ | | d t! } n | sØt j% | | pJd t j& |
j' } | j d ph| j d } t j( d | d d } | j) | | d | d d | } | j t d | j j" | t# | f n | SWd t* |
| Xd S( s pull changes from a remote repository, merge new changes if needed.
This finds all changes from the repository at the specified path
or URL and adds them to the local repository.
If the pulled changes add a new branch head, the head is
automatically merged, and the result of the merge is committed.
Otherwise, the working directory is updated to include the new
changes.
When a merge is needed, the working directory is first updated to
the newly pulled changes. Local changes are then merged into the
pulled changes. To switch the merge order, use --switch-parent.
See :hg:`help dates` for a list of formats valid for -d/--date.
Returns 0 on success.
t dates# working directory not at branch tipt hints' use 'hg update' to check out branch tipi i sH multiple heads in this branch (use "hg heads ." and "hg merge" to merge)s pulling from %s
R sO other repository doesn't support revision lookup, so a rev cannot be specified.t headsi s[ not merging with %d other new branch heads (use "hg heads ." and "hg merge" to merge them)
t
switch_parents updating to %d:%s
s merging with %d:%s
t reminds Automated merge with %sR t force_editort editformR
t usert editors5 new changeset %d:%s merges remote changes with local
N(+ t getR t parsedatet dirstatet parentst brancht branchtipR t RepoLookupErrort Nonet AbortR t wlockR R t
bailifchangedt branchheadst lent childrenR t peert
expandpatht statust hidepasswordt lookupt CapabilityErrorR t pullt cgresultt changelogt nodesbetweent updatet cleant FalseR R t merget
logmessaget
removeautht urlt getcommiteditort committ release( t uit repot sourcet optsR t parentt _p2R t
branchnodeR$ R t bheadst headt othert revsR t errt modheadst newheadst newchildrent nt newparentt firstparentt secondparentt messaget editoptR ( ( s/ /usr/lib/python2.7/dist-packages/hgext/fetch.pyR
# s
5
* %
%
#N( t __doc__t
__future__R t mercurial.i18nR t mercurial.nodeR t mercurialR R R R R R R R< t cmdtablet commandt
testedwithR" t
commitoptst commitopts2t
remoteoptsR
( ( ( s/ /usr/lib/python2.7/dist-packages/hgext/fetch.pyt <module> s 4
u