File: //usr/lib/python2.7/dist-packages/mercurial/copies.pyc
Xc @@ s d d l m Z d d l Z d d l m Z m Z m Z m Z d Z d Z d d Z
d Z e d
Z
e d Z d Z e d
Z d d Z d Z d Z d Z d Z d Z e d Z d S( i ( t absolute_importNi ( t nodet pathutilt scmutilt utilc
C@ s | j } t | } | d k r* | } n | d k r? | } n i d | 6d | 6} | | g } t j | t | } t } | } x#| rt 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| sd St
| | | S( s
Find the last revision that needs to be checked to ensure that a full
transitive closure for file copies can be properly calculated.
Generally, this means finding the earliest revision number that's an
ancestor of a or b but not both, except when a or b is a direct descendent
of the other, in which case we can return the minimum revnum of a and b.
None if no such revision exists.
ii i N( t changelogt lent Nonet heapqt heapifyt Falset heappopt dirstatet parentst revt
parentrevst heappusht Truet min(
t repot at bt clt workingt sidet visitt interestingt hascommonancestort limitt rt pR
( ( s4 /usr/lib/python2.7/dist-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( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt _chainh s
ic C@ sw xp | j D]b } | j | j d | j k r; | S| d k r
| j | k r
| j | k r
d Sq
Wd S( s return file context that is the ancestor of fctx present in ancestor
manifest am, stopping after the first ancestor lower than limiti N( t ancestorst gett pathR t filenodet linkrevR ( t fctxt amR t f( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt
_tracefile s
$0c C@ sS | j j } | j j } x. | j D] } | | d k r+ | | =q+ q+ W| S( Nt anm( t _repoR t copiesR t keys( t dt dst cR& ( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt _dirstatecopies s c C@ sL | j } | j } | r? | j | } | j | } n | j | S( s Computes which files are in b but not a.
This is its own function so extensions can easily wrap this call to see what
files _forwardcopies is about to process.
( t manifestt matchest
filesnotin( R R t matcht mat mb( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt _computeforwardmissing s c
C@ s d } | j d k rC | } | j } | | k rC t | Sn t | j | j | j } | d k ry d } n | j } i } | } | r | j | k r | j j t j k r t
j | j | j } n t
| | d | } | j j j | j g d t } xL | D]D }
| |
} | | _ t | | | } | r#| j | |
<q#q#W| d k rt | | | t | } n | S( s< find {dst@b: src@a} copy mapping where a is an ancestor of biR= t inclusiveN( R R t p1R9 R R3 R: t p2R t nullidR t
matchfilest filesR@ R R) R t _ancestrycontextR1 R+ R( (
R R R= t wR R/ t cmt forwardmissingmatcht missingt ancestrycontextR0 R. t ofctx( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt _forwardcopies s2
! 4 $
c C@ st | j j j d d r i St | | } i } x< t | j D]( \ } } | | k rb qD n | | | <qD W| S( Nt experimentalt disablecopytrace( R3 t uit
configboolRN t sortedR! ( R R R0 R R& R' ( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt _backwardrenames s c C@ s | | k s | s | r i S| j | } | | k rL t | | d | S| | k re t | | St | | t | | t | | d | S( s5 find {dst@y: src@x} copy mapping for directed compareR= ( t ancestorRN RT R( ( t xt yR= R ( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt
pathcopies s
t c C@ s t | | } t | | } d } | r= | d | 7} n | rm | j j d | d d j | f n | r | j j d | d d j | f n | | f S( s Computes, based on addedinm1 and addedinm2, the files exclusive to c1
and c2. This is its own function so extensions can easily wrap this call
to see what files mergecopies is about to process.
Even though c1 and c2 are not used in this function, they are useful in
other extensions for being able to read the file nodes of the changed files.
"baselabel" can be passed to help distinguish the multiple computations
done in the graft case.
s unmatched files in %ss
(from %s)s
%s:
%s
t locals
t other( RS RQ t debugt join( R t c1t c2t addedinm1t addedinm2t baselabelt u1t u2t header( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt _computenonoverlap s **c @ s j j t d d d k r g } d k rp g j D] } | j ^ qU } n j j | d t _ n f d } t j
| S( s return a 'getfctx' function suitable for _checkcopies usage
We have to re-setup the function building 'filectx' for each
'_checkcopies' to ensure the linkrev adjustment is properly setup for
each. Linkrev adjustment is important to avoid bug in rename
detection. Moreover, having a proper '_ancestrycontext' setup ensures
the performance impact of this adjustment is kept limited. Without it,
each file could do a full dag traversal making the time complexity of
the operation explode (see issue4537).
This function exists here mostly to limit the impact on stable. Feel
free to refactor on default.
RG RA c @ sh t | d k r= j d k r1 j | S d | S j | d | } | _ | _ | S( Ni t fileid( R R R t filectxRG t _descendantrev( R0 t nR. ( t act ctxR R ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt makectx s
N( R R3 t getattrR R
R R) R RG R t lrucachefunc( Rl t revsR Rm ( ( Rk Rl R R s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt _makegetfctx s (
c C@ s i } x6 | D]. } | | k r
| | | | | <| | =q
q
Wxc | D][ } | | k s^ t | | } | d | k r | | d | d g | | <qF | | | <qF W| S( s combine partial copy pathsi i ( t AssertionError( t copyfromt copytot finalcopyt diverget incompletediverget remainderR0 t ic( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt _combinecopies$ s
c 5 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 S| j j d d r i i i i f S| j d k r | j n | } | j d k r | j n | } | | k p | j | } | | k p| j | } | p | } | } | r?| j | } n t
| | j | j }
|
d k ryi i i i f S| j j d |
| j } | j } | j }
i } i } i i d 6i d 6i d 6| d 6| d 6} i i d 6i d 6i d 6| d 6| d 6} | j
|
} | j
|
} t | | @ } | | k rwt | | | | | \ } } | | } } nf t | | | | | d d
\ } } | j } t | | | | j
| | j
| d d \ } } x0 | D]( } t | | | | | | | |
| qWx0 | D]( } t | | | | | | | |
| qWt | d j | d j } t | d j | d j } | rt | d | d | | | n t | d | d | | | i } t } t } x | j D] \ } }! t |! d k s+| | k s+| | k r| | =| | k r| | k rg |! D]$ } | | k so| | k rQ| ^ qQ| | <| j |! qq| j |! qW| r| j j d
d j | n i }" i }# i }$ i i d 6i d 6i d 6|" d 6|# d 6}% i i d 6i d 6i d 6|" d 6|# d 6}& xR | D]J } t | | | | | | | |
|% t | | | | | | | |
|& q4W| r|& d st t i |% d | |" |# }$ ne | r|% d st t i |& d | |" |# }$ n/ |% d st |& d st |# s t xS |$ D]K } | |" k s<t |$ | }' |' d | rY| n | k r$|' |" | <q$q$WxQ |" j D]C \ } }! t |! d k r|! d |! d k r| | |! d <qqW| ru| j j ru| j j d x t | D]x } d }( | | k r|( d 7}( n | | k r4|( d 7}( n | | k rM|( d 7}( n | j j d | | | |( f qWn ~ | s| i | | f S| j j d | j | j }) }* |) j d |* j d t }+ i }, x | j D] \ }- }. t j |. t j |- }/ }0 |/ |+ k r*qq|/ |) k rV|0 |) k rV|+ j |/ d q|/ |* k r|0 |* k r|+ j |/ d q|/ d |, k r|, |/ d |0 d k r|+ j |/ d q|0 d |, |/ d <qWx$ |+ D] }1 |1 |, k r|, |1 =qqW~) ~* ~+ |, s | i | | f Sx, |, D]$ }2 | j j d |2 |, |2 f q! Wi }3 x | | D] } | | k rZ xo |, D]d }2 | j |2 rs |, |2 | t |2 }4 |4 | k r |4 |3 | <| j j d | |4 f n Pqs qs WqZ qZ W| |3 | | f S( sM
Find moves and copies between context c1 and c2 that are relevant
for merging. 'base' will be used as the merge base.
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.
RO RP s& searching for copies back to rev %d
R t fullcopyt
incompleteRv Rw Rb t bases topological common ancestori s% unmatched files new in both:
%s
s
i i sK all copies found (* = to merge, ! = divergent, % = renamed and deleted):
RY t *t !t %s src: '%s' -> dst: '%s' %s
s! checking for directory renames
t /s) discovered dir src: '%s' -> dst: '%s'
s' pending file src: '%s' -> dst: '%s'
N(! R R R RB R4 RQ RR R t
descendantRU R R\ R: R< RS Rf t _checkcopiest dictR" Rz t setR t updateR] Rr t debugflagt dirst addpathR! R t dirnamet addt
startswith(5 R R^ R_ R} t _c1t _c2t dirtyc1t dirtyc2t graftt tcaR t m1t m2R? Rv Rw t data1t data2R` Ra t bothnewt u1rt u2rt u1ut u2ut mtaR0 R R{ t renamedeletet renamedeletesett
divergesett oft flt bothdiverget bothincompletedivergeRx t both1t both2Ry t notet d1t d2t invalidt dirmoveR$ R# t dsrct ddstt iR6 t movewithdirt df( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt mergecopies4 s: - $$
&
&$$
*5
"&
&
(
c C@ s) | | k r | S| j | j } } y | j | j } } | d k r` t | } n | d k r{ t | } n x t r| j | j } } | | k r t | } q~ | | k r t | } q~ | | k r | S| | k s| | k s| | k r~ t Sq~ WWn t k
r$t SXd S( sF return True if f1 and f2 filectx have a common ancestor
Walk back to common ancestor to see if the two files originate
from the same file. Since workingfilectx's rev() is None it messes
up the integer comparison logic, hence the pre-step check for
None (f1 and f2 can only be workingfilectx's initially).
N( R) R- R t nextR R
t
StopIteration( t f1t f2R t g1t g2t f1rt f2r( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt _related6 s* $
c C@ s | j } | j }
| o4 | | k o4 | | k } t | } | | | j | k rg | rg d Sd }
t | g } x| | | | j D]} | j } | j }
|
| k r | | k r Pq q n | j |
| r | | d |
<n |
| d | <|
| k rq n | |
| j |
k r7d S| |
| |
} t | | | j
} | r |
| k s|
| j k r | r| | d |
<n |
| k r|
| d | <n{ | r| | d |
<| d | =| | d |
<nK xH | D]@ } | | k r| | d k st | |
g | d | <PqqWd Sq W|
|
k r| sU| rf| | d |
<qxa | D]V } | | k rm| | k r| d j | g j
| n |
| g | d | <d SqmWn d S( s
check possible copies of f from m1 to m2
ctx = starting context for f in m1
f = the filename to check (as in m1)
m1 = the source manifest
m2 = the destination manifest
base = the changectx used as a merge base
tca = topological common ancestor for graft-like scenarios
remotebase = True if base is outside tca::ctx, False otherwise
limit = the rev number to not search beyond
data = dictionary of dictionary to store copy data. (see mergecopies)
note: limit is only an optimization, and there is no guarantee that
irrelevant revisions will not be limited
there is no easy way to make this algorithm stop in a guaranteed way
once it "goes behind a certain revision".
NR{ R Rv R| Rw ( R: Rq R* R R R) R- R+ R R R Rr t
setdefaultt append( Rl R0 R R R} R t
remotebaseR t dataR? R t backwardst getfctxR t seent oct ocrR_ t crt sf( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyR X sb
$
c C@ s i } | d k rB | j j d d rB t | | | | } n xf t | | | | j D]G \ } } | | k r~ q` n | j | d k r` | j j | | q` q` Wd S( s+ reproduce copies from fromrev to rev in the dirstate
If skiprev is specified, it's a revision that should be used to
filter copy records. Any copies that occur between fromrev and
skiprev will not be duplicated, even if they appear in the set of
copies between fromrev and rev.
RO RP t nmaN( R RQ RR RX R! R R ( R R t fromrevt skiprevt excludeR$ R# ( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt duplicatecopies s * ( t
__future__R R RY R R R R R R( R1 R9 R R@ RN RT RX Rf Rq Rz R R R R ( ( ( s4 /usr/lib/python2.7/dist-packages/mercurial/copies.pyt <module> s$ " U
1 # " \