korsygfhrtzangaiide
Elepffwdsff
/
lib64
/
python2.7
/
site-packages
/
mercurial
/
Upload FileeE
HOME
� Hq�Qc @ sC d d l m Z m Z m Z m Z d d l m Z d d l m Z d d l Z d d l Z d d l Z d d l Z d d l Z d d l Z d d l Z d d l Z d d l Z d d l Z d e f d � � YZ d � Z d � Z d � Z d � Z e d � Z d � Z d � Z d � Z e d � Z d � Z d e d � Z! d S( i����( t nullidt nullrevt hext bin( t _( t obsoleteNt mergestatec B sk e Z d Z d � Z d d � Z d � Z d � Z d � Z d � Z d � Z d � Z d � Z d � Z RS( s+ track 3-way merge state of individual filesc C s | | _ t | _ | j � d S( N( t _repot Falset _dirtyt _read( t selft repo( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt __init__ s c C sD i | _ | r | | _ n t j | j j d � t � t | _ d S( Nt merge( t _statet _localt shutilt rmtreeR t joint TrueR R ( R t node( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt reset s c C s� i | _ y� | j j d � } xd t | � D]V \ } } | d k rY t | d � | _ q+ | d j d � } | d | j | d <q+ W| j � Wn+ t k r� } | j t j k r� � q� n Xt | _ d S( Ns merge/statei i����t i ( R R t openert enumerateR R t splitt closet IOErrort errnot ENOENTR R ( R t ft it lt bitst err( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyR s c C s� | j r� | j j d d � } | j t | j � d � x> | j j � D]- \ } } | j d j | g | � d � qH W| j � t | _ n d S( Ns merge/statet ws R ( R R R t writeR R R t iteritemsR R R ( R R t dt v( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt commit) s % c C s� t j | j � � j � } | j j j d | | j � � d | | j � | j � t | j � � | j � | j � g | j | <t | _ d S( Ns merge/t u( t utilt sha1t patht hexdigestR R R% t dataR t filenodet flagsR R R ( R t fclt fcot fcat fdt hash( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt add1 s .c C s | | j k S( N( R ( R t dfile( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt __contains__7 s c C s | j | d S( Ni ( R ( R R8 ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt __getitem__9 s c c s3 | j j � } | j � x | D] } | Vq Wd S( N( R t keyst sort( R R! R ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt __iter__; s c C s | | j | d <t | _ d S( Ni ( R R R ( R R8 t state( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt mark@ s c C s� | | d k r d S| j | \ } } } } } } } | | } | | } | j j | d | �} | j � } | j � } d | | | k r� d | | | k r� | j � t k r� | j j j t d � | � q� | | k r� | } q� n | j j d | � } | j j | | j � | � | j � t j | j | j | | | | � } | d k re| j | =n | s~| j | d � n | S( Nt ri t fileidt xR! s# warning: cannot merge flags for %s s merge/( R R t filectxR1 R R t uit warnR R t wwritet readR t filemergeR t NoneR? ( R R8 t wctxt octxR> R6 t lfilet afilet anodet ofileR1 t fcdR3 R4 t flot flaR R@ ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt resolveC s. " ( $ N( t __name__t __module__t __doc__R RI R R R) R7 R9 R: R= R? RS ( ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyR s c C s^ | j j | � o] t j j | j | � � o] | j j | � | j k o] | | j | | � S( N( t dirstatet _ignoret osR- t isfilet wjoint normalizet cmp( R RJ t mctxR ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt _checkunknownfile_ s c C s� t } xU | D]M } | | k r t | | | | � r t } | j j j t d � | � q q W| r| t j t d � � � n d S( s< check for collisions between unknown files and files in mctxs %s: untracked file differs sL untracked files in working directory differ from files in requested revisionN( R R_ R R RD RE R R+ t Abort( R RJ R^ t errorR ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt _checkunknowne s !$c C s� g } | r d p d } x< | j � D]. } | | k r% | j | | d d f � q% q% W| s� x? | j � D]. } | | k rj | j | d d d f � qj qj Wn | S( s� Forget removed files If we're jumping between revisions (as opposed to merging), and if neither the working directory nor the target rev has the file, then we need to remove it from the dirstate, to prevent the dirstate from listing the file when it is no longer in the manifest. If we're merging, and the other revision has removed a file that is not present in the working directory, we need to mark it as removed. R@ R s forget deleteds forget removedN( t deletedt appendRI t removed( RJ R^ t branchmerget actionsR> R ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt _forgetremovedq s #c s� t | � � � f d � } � f d � } d � } � f d � } � f d � } i | d 6| d 6| d 6| d 6| d 6| d 6| d 6| d 6| d 6} xH | D]@ \ } } } } | j | � } | s� t | � � | | | � q� Wi | d 6| d 6} xB | D]: \ } } | j | � } | s)t | � � | | d � q� Wi } x_ t � � D]Q } t j | � } | | k r�t j t d � | | | f � � n | | | <qMWd S( Nc s � j | � d S( N( R7 ( R t args( t pmmf( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt addop� s c s � j | � d S( N( t discard( R Ri ( Rj ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt removeop� s c S s d S( N( ( R Ri ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt nop� s c s6 | \ } } } | r% � j | � n � j | � d S( N( Rl R7 ( R Ri t f2R5 R1 ( Rj ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt renameop� s c s6 | \ } } } | r% � j | � n � j | � d S( N( Rl R7 ( R Ri Ro R5 t move( Rj ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt mergeop� s t aR' t drt eR t gt mR@ t rdt cdt dcs( case-folding collision between %s and %s( t sett gett AssertionErrorRI t sortedR+ t normcaseR` R ( R t wmfRg t promptsRk Rm Rn Rp Rr t opmapR Rw Ri t msgt opt foldmapt fold( ( Rj s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt _checkcollision� sD c * C s� | o | } g i i } } } t } | r6 | } n_ | | k rQ | j � } nD | rn | j d t � rn n' | r� | j j d d t � r� t } n g t | j � | | g d d � �D] } | j � ^ q� | rvt j | | | | � } | \ } } } } x6 | j � D]( \ } } | j | d | f d f � qWx9 | j � D]( \ } } | j | d | f d f � qGWn | j j t d � � | j j d t | � t | � t | � f � | j j d | | | f � | j � | j � | j � } } } t | j � � } | j | j � � d | k ruxC t | j � D]/ } | j | � j � r?| d c d 7<Pq?q?Wn g g } } t j | | � } | j | � } t j | | � } x�| j � D]�\ } \ } } | r�| \ } }! n( | j | d5 � } }! | d5 k rq�n | r&| \ }" }# n | j | � }" }# | rR| | � rRq�n | r�|! r�| j | � }$ d |" |# |$ k }% | j | t � }& |! |& k r�|# |$ k r�qg| |& k r|" |$ k r| |! k r�| j | d |# f d f � q�| j | d |# f d f � qg|% rA|! |& k rA| j | d |# f d f � qg|% rr| |& k rr| j | d |" f d f � qg| j | d | | t f d f � q�| | k r�q�| r�| | k r�| | }' | j | d d5 |' |" f d |' f � q�| r0| | k r0| | }' | j | d |' | t f d |' f � q�| r�| | k r�| | | k rh| j | d f � qg| d d k r�| j | d d5 d f � qg| j | d d5 d f � q�|! r�| | k r�| | }' | j d5 d | |' |# f d |' f � q�|! ro| | k ro| | }' |' | k rF| j |' d | | t f d! | f � qg| j |' d | | t f d" | f � q�|! r;| | k r;| r�| r�| j | d |# f d# f � qgt | | | | � }( | r�| r�|( r�| j | d | | t f d$ f � qg| r |( r | j | d% f � qg| j | d |# f d# f � q�|! r�|! | | k r�| j | d& f � q�q�WxU t | � D]G \ } }) |) d% k r�| j j t d' � | � qxt sxt |) � � qxW| r�t! j" t d( � � � n t! j# | j$ � sE| r/| s| j d t d) t � r/t% | | g g � qEt% | | | | � n xet | � D]W\ } }) |) d k r�| r�| j | d d5 d* f � q� | j j& t d+ � | t d, � t d- � f d. � r�| j | d d5 d/ f � q� | j | d d5 d0 f � qR|) d& k r� | r2 | j | d | j | � f d1 f � q� | j j& t d2 � | t d, � t d3 � f d. � d. k r� | j | d | j | � f d4 f � q� qRt sRt |) � � qRW| S(6 s� Merge p1 and p2 with ancestor pa and generate merge action list branchmerge and force are as passed in to update partial = function to filter file lists acceptremote = accept the incoming changes without prompting t missingR t followcopiest keyc S s | j � S( N( t rev( RB ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt <lambda>� s Rt s divergent renamesRx s rename and deletes resolving manifests s) branchmerge: %s, force: %s, partial: %s s% ancestor: %s, local: %s, remote: %s s .hgsubstatet +R! Ru s update permissionsRv s remote is newerRw s versions differR' s remote renamed directory to s local copied/moved to Ry i Rs R s remote deletedR@ s other deleteds local renamed directory to s remote copied to s remote moved to s remote createds# remote differs from untracked localt udRz s %s: untracked file differs sL untracked files in working directory differ from files in requested revisiont branchs remote deletesH local changed %s which remote deleted use (c)hanged version or (d)elete?s &Changeds &Deletei s prompt deletes prompt keeps remote recreatingsO remote changed %s which local deleted use (c)hanged version or leave (d)eleted?s &Deleteds prompt recreatingN(' R t p1t dirtyR RD t configboolR~ t parentst manifestt copiest mergecopiesR& Rd t noteR t debugt boolR{ t valuest updatet substatet subt dicthelperst difft flagsdiffR R| RI R1 R R_ RE R} R+ R` t checkcaseR- R� t promptchoice(* R RJ t p2t paRf t forcet partialt acceptremotet overwriteRg t copyt movewithdirR� RB t rett diverget renamedeletet oft flt m1t m2t mat copiedt st abortsR� t fdiffR� t diff12R t n12t fl12t n1t n2t fl1t fl2RR t nolRs Ro t differentRw ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt manifestmerge� s 9 # # & % ( $+c C s | d d k r d p d | f S( Ni R@ i����i ( ( Rs ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt actionkey s c c s | j j } t j } | j } | j } | j } | j j } d } x | D]} | d } | d d k r� | r� | j j t d � | � n | | � y | | | � d t �Wq3t k r� } | j j t d � | | j f � q3XnG | r| j j t d � | � n | | | | � j � | d d � | d k rS| | f Vd } n | d 7} qI W| d k r{| | f Vn d S( s� apply usually-non-interactive updates to the working directory mctx is the context to be merged into the working copy yields tuples for progress updates i i R@ s removing %s t ignoremissings update failed to remove %s: %s! s getting %s i id N( RD t verboseR+ t unlinkpathR[ RC RF t wopenert auditR� R R t OSErrorRE t strerrorR/ ( R R^ R� Ri R� t unlinkR[ t fctxRF R� R t argR t inst( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt getremove� s6 $ c ( C s� d \ } } } } t | � } | j | j � j � � g } | j d t � xB| D]:} | \ } } } } | j j d | | | f � | d k rT | \ } } } | d k r� qT n | j j d | | f � | | } | | } | | k r#| j � r | j � } q5| j | d t �} n | j | | � } | sS| j | d t �} n | j | | | | � | | k r�| r�| j | � q�qT qT W| j j } x` | D]X } t j j | j | � � r�| j j d | � | | � t j | j | � � q�q�Wt | � } g | D] } | d d k r| ^ q} g | D] } | d d k r=| ^ q=} t | � } g | D] } | d d k rr| ^ qr} t | � } g | D] } | d d k r�| ^ q�} g | D] } | d d k r�| d ^ q�} | r(| d d k r(t j | | | | | � n d } t j | j d t | | | f | � } xO | D]G \ } } | | 7} | j j t d � | d | d | d t d � �q\Wt j | j d t | | | f | � } xO | D]G \ } } | | 7} | j j t d � | d | d | d t d � �q�W| rR| d d k rRt j | | | | | � n t d � }! t d � }" | j j }# x�t | � D]�\ } } | \ } } } } |# |! | | d d | d | d |" �| d k r�| \ } } } | d k rt j | | | | j | � | � q�n | | � | j | | | � }$ |$ d k r[|$ d k r[| d 7} qa|$ d k rt| d 7} qa| d 7} q�| d k r_| \ } } }% | r| j j t d � | | f � | | � | j! | | j | � j" � |% � t j | j | � � n | rR| j j t d � | | f � | j! | | j | � j" � |% � n | d 7} q�| d k r�| \ }& | j j# t d � | � x� |& D] }' | j j# d |' � q�Wq�| d k r | \ }& | j j# t d � | � xy |& D] }' | j j# d |' � q�Wq�| d k r�| \ }% | | � t j$ | j | � d |% k d |% k � | d 7} q�q�W| j% � |# |! d d | d |" �| | | | f S( sM apply the merge action list to the working directory wctx is the working copy context mctx is the context to be merged into the working copy actx is the context of the common ancestor Return a tuple of counts (updated, merged, removed, unresolved) that describes how many files were affected by the update. i R� s %s: %s -> %s Rw s .hgsubstates" preserving %s for resolve of %s RA s removing %s i t grRv R@ g����MbP?t updatingt itemt totalt unitt filesR' s moving %s to %s s getting %s to %s Rt s< note: possible conflict - %s was renamed multiple times to: s %s Rx s9 note: possible conflict - %s was deleted and renamed to: Ru R! RB ( i i i i N(& R R R� R R< R� RD R� R� RC R t ancestorR7 Rd R� R� RY R- t lexistsR[ R+ R� t lent subrepot submerget workerR� t progressR R RS RI R� RF R/ RE t setflagsR) (( R Rg RJ R^ t actxR� t updatedt mergedRe t unresolvedt mst movesRs R Rw Ri R� Ro R5 Rq R2 R3 R4 R� t numupdatest workeractionst updateactionst removeactionst hgsubt zt progR R� t _updatingt _filesR� R@ R1 R� t nf( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt applyupdates� s� )) ) )- $ $ ' " % ( c C sZ g } | t | | | | | | | | � 7} | j � d k rV | t | | | � 7} n | S( s4 Calculate the actions needed to merge mctx into tctxN( R� R� RI Rh ( R t tctxR^ R� Rf R� R� R� Rg ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt calculateupdates, s c C s� x�| D]~} | \ } } } } | d k rW | rD | j j | � q�| j j | � q | d k r | s�| j j | � q�q | d k r� | j j | � q | d k r� | j j | � q | d k r� | r� | j j | � q�| j j | � q | d k r�| \ } } } | r�| j j | � | | k r�| rK| j j | � n | | k rm| j j | | � q�| j j | | � q�q�| | k r�| j j | � n | r�| j j | � q�q | d k r | \ } } } | r�| | j k r�q n | rY| j j | � | r:| j j | � | j j | | � n | r�| j j | | � q�q�| j j | � | r�| j j | � q�q q Wd S( s$ record merge actions to the dirstateR@ Rs R Ru Rv Rw R' N( RW t removet dropR7 t normallookupt otherparentt normalR R� ( R Rg Rf Rs R Rw Ri R� Ro R5 Rq t flag( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt recordupdates8 sZ c C s; | } | j � } z�| d } | d k r� y | j | j � � } Wq� t j k r� | j � d k r{ | j d � } q� t j t d � | j � � � q� Xn | o� | } | j � } | d | | } } | r� | | } n | j | � } | j � | j � t | � t | � f \ } } } } | rXt | � d k rXt j t d � � � n | re| | k r�t j t d � � � nR | | k r�| r�| j � | j � k r�t j t d � d t d � �� q�n | r| j � s�| j � rt j t d � d t d � �� n xt | j � D]7 } | j | � j � r't j t d � | � � q'q'Wn� | s)| | | f k r)| j d t � } | s�| d k r t j | | j � g � } | | j � | k r�| } q#| r�t d � } t j | � � q#t d � } t j | � � q&| } q)n t | | | | | | | | � } | sq| t | d f \ } } } } n | s�| j d d t d | d | �n t | | | | | | � } | s�| j | | � t | | | � | s�| j j | j � � q�n Wd | j � X| s7| j d d | d | d | d �n | S( s� Perform a merge between the working directory and the given node node = the node to update to, or None if unspecified branchmerge = whether to merge between branches force = whether to force branch merging or file overwriting partial = a function to filter file lists (dirstate not updated) mergeancestor = whether it is merging with an ancestor. If true, we should accept the incoming changes for any prompts that occur. If false, merging with an ancestor (fast-forward) is only allowed between different named branches. This flag is used by rebase extension as a temporary fix and should be avoided in general. The table below shows all the behaviors of the update command given the -c and -C or no options, whether the working directory is dirty, whether a revision is specified, and the relationship of the parent rev to the target rev (linear, on the same named branch, or on another named branch). This logic is tested by test-update-branches.t. -c -C dirty rev | linear same cross n n n n | ok (1) x n n n y | ok ok ok n n y * | merge (2) (2) n y * * | --- discard --- y n y * | --- (3) --- y n n * | --- ok --- y y * * | --- (4) --- x = can't happen * = don't-care 1 = abort: crosses branches (use 'hg merge' or 'hg update -c') 2 = abort: crosses branches (use 'hg merge' to merge or use 'hg update -C' to discard changes) 3 = abort: uncommitted local changes 4 = incompatible options (checked in commands.py) Return the same tuple as applyupdates(). t defaultt tips branch %s not foundi i s outstanding uncommitted mergess7 merging with a working directory ancestor has no effects nothing to merget hints# use 'hg update' or check 'hg heads's outstanding uncommitted changess use 'hg status' to list changess5 outstanding uncommitted changes in subrepository '%s'R� sC crosses branches (merge branches or use --clean to discard changes)sC crosses branches (merge branches or update --check to force update)t t preupdatet throwt parent1t parent2NR� Ra i (! t wlockRI t branchtipR� Ra t RepoLookupErrort lookupR+ R` R R� R� R t strR� R� Rc R~ R� R� R� R R t foregroundR� R t hookR� t setparentsR� RW t setbrancht release( R R Rf R� R� R� t mergeancestort onodeR� t wcR� t plR� R� R� t fp1t fp2t xp1t xp2R� R� R R� Rg t stats( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyR� v s~ + & 6 !" &(" R R R R R t i18nR t mercurialR Ra R+ RH R� R� R� R� R RY R t objectR R_ Rb Rh R� R R� R� R� R� R� R� RI R� ( ( ( s5 /usr/lib64/python2.7/site-packages/mercurial/merge.pyt <module> s" "T$Q 9 � $ � >