|
Server : Apache System : Linux cs317.bluehost.com 4.19.286-203.ELK.el7.x86_64 #1 SMP Wed Jun 14 04:33:55 CDT 2023 x86_64 User : andertr9 ( 1047) PHP Version : 8.2.18 Disable Function : NONE Directory : /lib64/python2.7/site-packages/hgext/ |
Upload File : |
�
Hq�Qc
@ s d Z d d l m Z d d l m Z m Z d d l m Z m Z m Z m
Z
m Z d d l m
Z
d Z d d � Z i e 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 � f d 6Z d S( s2 pull, update and merge in one command (DEPRECATED)i����( t _( t nullidt short( t commandst cmdutilt hgt utilt error( t releaset internalt defaultc K sX | 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 � � � n | t k r� t j
t d � � � n d } }
zr| j
� } | j � }
| j � d \ } } }
} | s| s|
r2t j
t d � � � n | rPt j
t d � � � n | j | � } g | D]( } t | | j � � d k rf| ^ qf} t | � d k r�t j
t d � � � n t j | | | j | � � } | j t d
� t j | j | � � � d } | d rty* g | d D] } | j | � ^ q#} Wqtt j k
rpt d � } t j
| � � qtXn | j | d
| �} | d k r�d 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 rb| ^ qb} t | � d k r�| j t d � t | � d � d S| s�d 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# | | � p�d t j$ | j% � � } t" j& } | j d � s�| j d � r�t" j' } n | 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 datesG working dir not at branch tip (use "hg update" to check out branch tip)s outstanding uncommitted mergei s outstanding uncommitted changess' working directory is missing some filesi i sH multiple heads in this branch (use "hg heads ." and "hg merge" to merge)s pulling from %s
t revsO 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 %st force_editort editt usert editors5 new changeset %d:%s merges remote changes with local
N(* t getR t parsedatet dirstatet parentst brancht branchtipR t RepoLookupErrort Nonet AbortR R t wlockt lockt statust branchheadst lent childrenR t peert
expandpatht hidepasswordt lookupt CapabilityErrort pullt changelogt nodesbetweent updatet cleant FalseR R t mergeR t
logmessaget
removeautht urlt commiteditort commitforceeditort commitR ( t uit repot sourcet optsR t parentt p2R t
branchnodeR R t modt addt remt del_t bheadst headt othert revsR t errt modheadst newheadst newchildrent nt newparentt firstparentt secondparentt messageR ( ( s1 /usr/lib64/python2.7/site-packages/hgext/fetch.pyt fetch s�
5
* %
%
#t rR s* a specific revision you would like to pullt REVt eR s edit commit messaget s force-editors edit commit message (DEPRECATED)s
switch-parents switch parents when mergings hg fetch [SOURCE]RM N( t __doc__t mercurial.i18nR t mercurial.nodeR R t mercurialR R R R R t mercurial.lockR t
testedwithRM R t
commitoptst commitopts2t
remoteoptst cmdtable( ( ( s1 /usr/lib64/python2.7/site-packages/hgext/fetch.pyt <module> s ( �u