|
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/mercurial/ |
Upload File : |
�
Hq�Qc @ sv d d l Z d d l Z d � Z d � Z d � Z d � Z d � Z d � Z d � Z d � Z d
� Z
d � Z d S( i����Nc C s5 t g | D]$ } | | k r
| | k r
| ^ q
� S( s- Return list of elements in d1 not in d2 or d3( t sorted( t d1t d2t d3t d( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt _nonoverlap s c C s' | j d � } | d k r d S| | S( Nt /i����t ( t rfind( t ft s( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt _dirname s c
C s� | j } t | � } | d k r* | } n | d k r? | } n i d | 6d | 6} | | g } t j | � t | � } t } | } x#| r�t j | � }
|
| k r� g | j j � D] } | j | � ^ q� } n | j
|
� } x� | D]� } | d k rq� n | | k rL| |
| | <| | r8| d 7} n t j | | � q� | | r� | | | |
k r� d | | <| d 8} t } q� q� W| |
r� |
} | d 8} q� q� W| s�d S| S( so Find the earliest revision that's an ancestor of a or b but not both,
None if no such revision exists.
i����i i N(
t changelogt lent Nonet heapqt heapifyt Falset heappopt dirstatet parentst revt
parentrevst heappusht True(
t repot at bt clt workingt sidet visitt interestingt hascommonancestort limitt rt pR ( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt
_findlimit sF
.
c C s� | j � } xy | j � D]k \ } } | | k rk | | | k rR | | | | <n | | k rk | | =qk n | | k r | | | <q q Wx< | j � D]. \ } } | | k r� | | k r� | | =q� q� W| S( s chain two sets of copies a->b( t copyt iteritemst items( t srct dstR R t tt kt v( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt _chainN s
c C sq | j � } | j � } xR | j � D]D } | j | j � d � | j � k rS | S| j � | k r% d Sq% Wd S( s@ return file context that is the ancestor of fctx present in actxN( R t manifestt ancestorst gett pathR t filenode( t fctxt actxt stopt amR ( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt
_tracefilee s $c C sS | j j } | j � j � } x. | j � D] } | | d k r+ | | =q+ q+ W| S( Nt anm( t _repoR t copiesR& t keys( R t dst cR, ( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt _dirstatecopiesp s c C s� d } | j � d k rC | } | j � } | | k rC t | � Sn i } t | j � j � � } | j | j � j � � x: | D]2 } t | | | � } | r� | j � | | <q� q� W| d k r� t
| | | t | � � } n | S( s< find {dst@b: src@a} copy mapping where a is an ancestor of bN( R R t p1R? t setR/ t iterkeyst difference_updateR8 R2 R. ( R R t wt cmt missingR t ofctx( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt _forwardcopiesx s
c C sX t | | � } i } x< t | j � � D]( \ } } | | k rF q( n | | | <q( W| S( N( RH R R' ( R R R R# R, R- ( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt _backwardrenames� s c C s� | | k s | s | r i S| j | � } | | k rF t | | � S| | k r_ t | | � St | | t | | � t | | � � S( s5 find {dst@y: src@x} copy mapping for directed compare( t ancestorRH RI R. ( t xt yR ( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt
pathcopies� s
c s� � s � s � � k r* i i i i f S� j � d k rp � j � �
j j � k rp �
j j � i i i f St �
� j � � j � � � � d k r� i i i i f S� j � } � j � } � j � � � � �
f d � } t j | � � i � i } i � i � d � � � � � � � � � � f d � } �
j
j d � � t | | � � } t | | � � }
| r��
j
j d d j
| � � n |
r��
j
j d d j
|
� � n x | D] } | | | | � q�Wx |
D] } | | | | � q�Wi } t � }
t � } x� � j � D]� \ } } t | � d k sX| � k sX| � k r�� | =| � k r�| � k r�g | D]$ } | � k s�| � k r~| ^ q~| | <|
j | � q�q"| j | � q"W� rr�
j
j d � x� t � � D]x } d
} | � k r| d 7} n | | k r1| d 7} n | |
k rJ| d
7} n �
j
j d � | | | f � q�Wn ~ � s�� | � | f S�
j
j d � � j � � j � } } | j d � | j d � t � } i } x� � j � D]� \ } } t | � t | � } } | | k r!q�q�| | k rI| | k rI| j | � q�| | k rq| | k rq| j | � q�| | k r�| | | k r�| j | � q�| d | | d <q�Wx$ | D] } | | k r�| | =q�q�W~ ~ ~ | s�� | � | f Sx, | D]$ } �
j
j d | | | f � q Wx� | |
D]� } | � k r3xo | D]d } | j | � rL| | | t | � } | � k r�| | | <�
j
j d | | f � n PqLqLWq3q3W� | � | f S( s&
Find moves and copies between context c1 and c2 that are relevant
for merging.
Returns four dicts: "copy", "movewithdir", "diverge", and
"renamedelete".
"copy" is a mapping from destination name -> source name,
where source is in c1 and destination is in c2 or vice-versa.
"movewithdir" is a mapping from source name -> destination name,
where the file at source present in one context but not the other
needs to be moved to destination by the merge process, because the
other context moved the directory it is in.
"diverge" is a mapping of source name -> list of destination names
for divergent renames.
"renamedelete" is a mapping of source name -> list of destination
names for files deleted in c1 that were renamed in c2 or vice-versa.
c sQ t | � d k r> � j � d k r1 � j | � S� j | � S� j | d | �S( Ni t fileid( R
R R t filectx( R t n( t c1t c2R ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt makectx� s
c S s) | | k r | S| j � | j � } } y� | j � | j � } } | d k r` | j � } n | d k r{ | j � } n x� t r| j � | j � } } | | k r� | j � } q~ | | k r� | j � } q~ | | k r� | S| | k s| | k s| | k r~ t Sq~ WWn t k
r$t SXd S( N( R0 R R t nextR R t
StopIteration( t f1t f2R" t g1t g2t f1rt f2r( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt related� s* $
c sH d } t | g � } x� | | | � j � D]� } | j � } | j � } | | k ro | � k r/ Pq/ q/ n | j | � | � | <| | k r� q/ n | | � j | � k r� Pn � | | | � } � | | � j � � } | r/ | | k s| | j � k r/ | � | <d } Pq/ q/ W| � k rD� j | g � j | � n d S( s( check possible copies of f from m1 to m2N( R RA R0 R R2 t addR1 t
setdefaultt append( R t m1t m2t oft seent oct ocrRR t cr( t caR& t ctxt diverget fullcopyR" t maR\ ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt checkcopies s.
$
s& searching for copies back to rev %d
s" unmatched files in local:
%s
s
s" unmatched files in other:
%s
i sK all copies found (* = to merge, ! = divergent, % = renamed and deleted):
R t *t !t %s src: '%s' -> dst: '%s' %s
s! checking for directory renames
R s) discovered dir src: '%s' -> dst: '%s'
s' pending file src: '%s' -> dst: '%s'
N( t nodeR R R@ R; R% R R/ t utilt lrucachefunct uit debugR t joinRA R( R
t updateR t dirst addpathR' R R] t
startswith( R RQ RR Rg R` Ra RS t movewithdirRl t u1t u2R t renamedeletet
renamedelete2t diverge2Rb t flt noteR R t invalidt dirmoveR* R) t dsrct ddstt iR t df( ( RQ RR Rg R& Rh Ri Rj R" Rk R\ R s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt mergecopies� s� - $
*5
( Rq R R R R% R. R8 R? RH RI RM R� ( ( ( s6 /usr/lib64/python2.7/site-packages/mercurial/copies.pyt <module> s 9