관리-도구
편집 파일: filemerge.pyc
� Hq�Qc @ s� 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 � Z e d � Z g d � Z i Z d d � Z d � Z d � Z d � Z d � Z e d e � d � � Z e d e � d � � Z e d e � d � � Z e d e � d � � Z d � Z e d e e d � � d � � Z e d e � d � � Z d � Z d � Z e j! � Z" d S( i����( t short( t _Nt c C s | j d | d | | � S( Ns merge-toolst .( t config( t uit toolt partt default( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _toolstr s c C s | j d | d | | � S( Ns merge-toolsR ( t configbool( R R R R ( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _toolbool s c C s | j d | d | | � S( Ns merge-toolsR ( t configlist( R R R R ( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _toollist s c s � � � f d � } | S( s; return a decorator for populating internal merge tool tablec sD d � } d | | j j � | _ | t | <� | _ � | _ | S( Ns internal:s ``%s`` ( t __doc__t stript internalst trymerget onfailure( t funct fullname( t nameR R ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt decorator s ( ( R R R R ( ( R R R s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt internaltool s c C s� | t k r | Sx| d D]t } t | | | � } | s; q n t j | t | | d � � } | r t j | t | | d � � } | r� | Sq q Wt | | d | � } t j t j | � � S( Nt regkeyt regkeyaltt regnamet regappendt executable( R R ( R R t utilt lookupregt findexet expandpath( R R t knt kt pt exe( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _findtool# s c sW � f d � } � j d d � } | r\ t � | � } | rO | t j | � f S| | f Sn t j j d � } | r~ | | f Sx{ � j d � D]j \ } } t j | j d | g � } | | � r� | | | | t � r� t � | � } | t j | � f Sq� Wi } x^ � j d � D]M \ } } | j d � d } | | k rt t � | d d � � | | <qqW| j � } t g | j � D] \ } } | | f ^ q� } � j d d � } | r�| | k r�| | f S| j d d | f � n | j d � xK | D]C \ } } | | d | | � r�t � | � } | t j | � f Sq�W| sO| rSd Sd S( Nc s | } | r | d | 7} n t � | � sf | rL � j t d � | � q � j t d � | � n� | r� t � | d � r� � j t d � | � np | r� t � | d � r� � j t d � | � n= t j � rt � | d � r� j t d � | � n t St S( Ns specified for s couldn't find merge tool %s t symlinks tool %s can't handle symlinks t binarys tool %s can't handle binary t guis tool %s requires a GUI ( R% t warnR t noteR R R( t Truet False( R t patR& R' t tmsg( R ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt check3 s R t forcemerget HGMERGEs merge-patternsR s merge-toolsR i t priorityt 0t merget hgmerges internal:prompts internal:merge( Ns hgmerge( s internal:promptN( s internal:mergeN( R R% R t shellquotet ost environt gett configitemst matcht rootR, t splitt intR t keyst sortedt itemst insertt Nonet append( t repoR t pathR' R& R/ t forcet toolpathR5 R- R t mft toolsR" t vt tt namesR# t uimerge( ( R s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _picktool2 sF ! & 2 c C sD d | k r d Sd | k r d Sd | k r0 d Sd | k r@ d Sd S( s Guess the EOL type of a filet s s s N( RC ( t data( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _eoltypet s c C sw t t j | � � } | rs t j | � } t | � } | rs | j | | � } | | k rp t j | | � qp qs n d S( s/ Convert EOL markers in a file to match origfileN( RR R t readfilet replacet writefile( t filet origfilet tostyleRQ t stylet newdata( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _matcheol� s t promptc C s� | j } | j � } | j t d � | t d � t d � f d � rb t | | | | | | | � St | | | | | | | � Sd S( sX Asks the user which of the local or the other version to keep as the merged version.s8 no tool found to merge %s keep (l)ocal or take (o)ther?s &Locals &Otheri N( R RF t promptchoiceR t _iothert _ilocal( RE t mynodet origt fcdt fcot fcat toolconfR t fd( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _iprompt� s t localc C s d S( s6 Uses the local version of files as the merged version.i ( ( RE R` Ra Rb Rc Rd Re ( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyR_ � s t otherc C s) | j | j � | j � | j � � d S( s6 Uses the other version of files as the merged version.i ( t wwriteRF RQ t flags( RE R` Ra Rb Rc Rd Re ( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyR^ � s %t failc C s d S( s� Rather than attempting to merge files that were modified on both branches, it marks them as unresolved. The resolve command must be used to resolve these conflicts.i ( ( RE R` Ra Rb Rc Rd Re ( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _ifail� s c C sH | \ } } } } | r d S| \ } } } } | j } y t | | d | � } Wn� t j k r� t | | d � j � } d j � } | | k r� d j g | D] } d | d ^ q� � } t j t d � | | | f � � q� n X| rDt j | | | | d t �} | s"| j d � d S| d k rDt j | | � qDn d S( Ni t premerget keeps , t 's6 %s.premerge not valid ('%s' is neither boolean nor %s)t quiets premerge successful i ( R R t errort ConfigErrorR t lowerR= t joinR t simplemergeR+ t debugR t copyfile( RE Re t filesR RH R' R& t at bt ct backR Rn t validRK t _validt r( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _premerge� s, * R4 sF merging %s incomplete! (edit conflicts, then use 'hg resolve --mark') c C s� | \ } } } } | rB | j j t d � | j � � t d f St | | | � } | r� | \ } } } } | j } t j | | | | d d d g �} t | f St d f S( s� Uses the internal non-interactive simple merge algorithm for merging files. It will fail if there are any conflicts and leave markers in the partially merged file.s5 warning: internal:merge cannot merge symlinks for %s i t labelRh Ri i ( R R) R RF R, R� Rv R+ ( RE R` Ra Rb Rc Rd Re Ry R RH R' R& R� Rz R{ R| R} R ( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _imerge� s $ t dumpc C s� t | | | � } | r� | \ } } } } | j � } t j | | d � | j | d | j � | j � � | j | d | j � | j � � n t | f S( su Creates three versions of the files to merge, containing the contents of local, other and base. These files can then be used to perform a merge manually. If the file to be merged is named ``a.txt``, these files will accordingly be named ``a.txt.local``, ``a.txt.other`` and ``a.txt.base`` and they will be placed in the same directory as ``a.txt``.s .locals .others .base( R� RF R Rx Rj RQ Rk R, ( RE R` Ra Rb Rc Rd Re Ry R� Rz R{ R| R} Rf ( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _idump� s #&c C sv t | | | � } | rl| \ } } } } | \ } } } } d } t d | j � d t | � d t | j � � d t | j � � d d | j � k d d | j � k d d | j � k � } | j } t | | d d � } d | k r� | | } } n t d | d | d | d | � } t j d | | d � � } t j | d | d | j d | d | j �} t | f St d f S( NR t HG_FILEt HG_MY_NODEt HG_OTHER_NODEt HG_BASE_NODEt HG_MY_ISLINKt lt HG_OTHER_ISLINKt HG_BASE_ISLINKt argss $local $base $others $outputRh t baseRi t outputs \$c S s t j t j | � � S( N( R R6 t localpath( t s( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt <lambda> s t t cwdR8 t outi ( R� t dictRF R t strt changectxRk R R R t interpolatet systemR< t foutR+ R, ( RE R` Ra Rb Rc Rd Re Ry R� R RH R' R& Rz R{ R| R} R� t envR R� RT ( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt _xmerge� s. ! # c s � f d � } | j | � s" d S� j } | j � } | j � pX | j � pX | j � } d | j � | j � k } t � | | | | � \ } } | j d | | | | f � | t k r� t | } | j } | j } n t } t } t d � } | | | | f } | s)| � | | | | | | � S� j | � } | d | � } | d | � } | d } t j | | � | | j � k r�| j t d � | | j � | f � n | j t d � | � | j d | | | f � | � | | | | | | | | | | f � \ } } | sc| r8| rE| j | | � qEn t j | � t j | � t j | � | S| r�t | | d � s�d t | | d � k r�t j d | j � t j � r�d } q�n t } d t | | d � k r t } | j t d � | t d � t d � f d � r d } q n | r�| r�t | | d � sWd t | | d � k r�t j | | � r�| j t d � | t d � t d � f d � r�d } q�q�n t | | d � r�t | | � n | r�| r�| j | | � q�n t j | � t j | � t j | � | S( s perform a 3-way merge in the working directory mynode = parent node before merge orig = original local filename before merge fco = other file context fca = ancestor file context fcd = local file context for current/destination file c s� d t j j | j � � | f } t j d | � \ } } � j | j � | j � � } t j | d � } | j | � | j � | S( Ns %s~%s.t prefixt wb( R7 RF t basenamet tempfilet mkstempt wwritedataRQ t fdopent writet close( R� t ctxt preRf R RQ t f( RE ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt temp s " R� s/ picked tool '%s' for %s (binary %s symlink %s) s merging %s failed! R� Ri s .origs merging %s and %s to %s s merging %s s my %s other %s ancestor %s t checkconflictst conflictsR/ s! ^(<<<<<<< .*|=======|>>>>>>> .*)$i R\ s" was merge of '%s' successful (yn)?s &Yess &Not checkchangedt changeds< output file %s appears unchanged was merge successful (yn)?t fixeolN( t cmpRC R RF t isbinaryRk RO Rw R R R R� R+ R t wjoinR Rx t statusR) R7 t unlinkR R t ret searchRQ t MULTILINER, R] t filecmpR[ ( RE R` Ra Rb Rc Rd R� R Rf R' R& R RH R R R Re Rz R{ R| R} t needcheckR� t checked( ( RE s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt filemerge s� $ ) (# t nodeR t i18nR R Rv R; Rr R7 R� R� R� R R, R R R RC R R% RO RR R[ Rg R_ R^ Rm R� R+ R� R� R� R� t valuest i18nfunctions( ( ( s9 /usr/lib64/python2.7/site-packages/mercurial/filemerge.pyt <module> s. 00 B i