/usr/web/sources/contrib/jas/root/sys/lib/python2.7/site-packages/hgext/fetch.pyc

Plan 9 from Bell Labs’s /usr/web/sources/contrib/jas/root/sys/lib/python2.7/site-packages/hgext/fetch.pyc

��Pc
@sdZddlmZddlmZmZddlmZmZm	Z	m
Z
mZddlm
Z
dZdd�Zied	d
ged�ed�fd
dded�fddded�fddded�fgejejejed�fd6ZdS(s2pull, update and merge in one command (DEPRECATED)i�(t_(tnullidtshort(tcommandstcmdutilthgtutilterror(treleasetinternaltdefaultcKsX|jd�}|r+tj|�|d<n|jj�\}}|jj�}y|j|�}Wntjk
r~d}nX||kr�tj
td���n|tkr�tj
td���nd}	}
zr|j
�}	|j�}
|j�d \}}}
}|s|s|
r2tj
td���n|rPtj
td���n|j|�}g|D](}t||j��dkrf|^qf}t|�dkr�tj
td	���ntj|||j|��}|jtd
�tj|j|���d}|drty*g|dD]}|j|�^q#}Wqttjk
rptd�}tj
|��qtXn|j|d
|�}|dkr�dS|j|�}|jj|g|�d}t|�dkr
t|�r
|d|krtj||d�SdSng|D]}||kr|^q}|}|r[|d}tj||�ng|D]}||krb|^qb}t|�dkr�|jtd�t|�d�dS|s�dSt}|r�|dr�|d}}n@|d|}}|jtd�|jj|�t |�f�tj||�|jtd�|jj|�t |�f�tj!||dt�}n|s>t"j#||�p�dtj$|j%��}t"j&}|jd�s�|jd�r�"j'}n|j(||d|dd|�}|jtd�|jj|�t |�f�n|SWdt)|
|	�XdS(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.
    tdatesGworking dir not at branch tip (use "hg update" to check out branch tip)soutstanding uncommitted mergeisoutstanding uncommitted changess'working directory is missing some filesiisHmultiple heads in this branch (use "hg heads ." and "hg merge" to merge)spulling from %s
trevsOother repository doesn't support revision lookup, so a rev cannot be specified.theadsis[not merging with %d other new branch heads (use "hg heads ." and "hg merge" to merge them)
t
switch_parentsupdating to %d:%s
smerging with %d:%s
tremindsAutomated merge with %stforce_editortedittuserteditors5new changeset %d:%s merges remote changes with local
N(*tgetRt	parsedatetdirstatetparentstbrancht	branchtipRtRepoLookupErrortNonetAbortRRtwlocktlocktstatustbranchheadstlentchildrenRtpeert
expandpaththidepasswordtlookuptCapabilityErrortpullt	changelogtnodesbetweentupdatetcleantFalseRRtmergeRt
logmessaget
removeauthturltcommiteditortcommitforceeditortcommitR(tuitrepotsourcetoptsRtparenttp2Rt
branchnodeRRtmodtaddtremtdel_tbheadstheadtothertrevsRterrtmodheadstnewheadstnewchildrentnt	newparenttfirstparenttsecondparenttmessageR((s//sys/lib/python2.7/site-packages/hgext/fetch.pytfetchs�

5
*%
%
 	#trRs*a specific revision you would like to pulltREVteRsedit commit messagetsforce-editors edit commit message (DEPRECATED)s
switch-parentsswitch parents when mergingshg fetch [SOURCE]RMN(t__doc__tmercurial.i18nRtmercurial.nodeRRt	mercurialRRRRRtmercurial.lockRt
testedwithRMRt
commitoptstcommitopts2t
remoteoptstcmdtable(((s//sys/lib/python2.7/site-packages/hgext/fetch.pyt<module>s(�u
(Return to Plan 9 Home Page)