File: //lib64/python2.7/site-packages/hgext/absorb.pyc
�
1�3\c
@@ s� d Z d d l m Z d d l Z d d l m Z d d l m Z m Z m Z m
Z
m Z m Z m
Z
m Z m Z m Z m Z m Z m Z m Z m Z m Z d d l m Z d Z i Z e j e � Z i Z e j e � Z e d d d
e �e d d d
e �e d d d
d
�i d d 6d d 6d d 6Z e j! Z! d e" f d � � YZ# d e" f d � � YZ$ d � Z% e d � Z& e d � Z' d e j( f d � � YZ) e e d � Z* d e" f d � � YZ+ d e" f d! � � YZ, d" � Z- d# � Z. e e e e d$ � Z/ e d d% d& e e d' � f d( d) e e d* � f d+ d, e e d- � f d. d/ e e d0 � f g e j0 e j1 e j2 e d1 � d2 e j3 d3 e �d4 � � Z4 d S(5 s? apply working directory changes to changesets (EXPERIMENTAL)
The absorb extension provides a command to use annotate information to
amend modified chunks into the corresponding non-public changesets.
::
[absorb]
# only check 50 recent non-public changesets at most
max-stack-size = 50
# whether to add noise to new commits to avoid obsolescence cycle
add-noise = 1
# make `amend --correlated` a shortcut to the main command
amend-flag = correlated
[color]
absorb.description = yellow
absorb.node = blue bold
absorb.path = bold
i ( t absolute_importN( t _( t cmdutilt commandst contextt crecordt errort linelogt mdifft nodet obsoletet patcht phasest pycompatt registrart repairt scmutilt util( t
stringutils ships-with-hg-coret absorbs add-noiset defaults
amend-flags max-stack-sizei2 t yellows absorb.descriptions blue bolds absorb.nodet bolds absorb.patht nulluic B@ s) e Z d Z e Z e Z e Z d � Z RS( s blank ui object doing nothingc C@ s
d � } | S( Nc _@ s d S( N( ( t argst kwds( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt nullfunc\ s ( ( t nameR ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt __getitem__[ s ( t __name__t
__module__t __doc__t Falset debugflagt verboset Truet quietR ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR U s
t emptyfilecontextc B@ s e Z d Z d � Z d � Z RS( s. minimal filecontext representing an empty filec C@ s d S( Nt ( ( t self( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt datab s c C@ s t j S( N( R t nullid( R' ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR e s ( R R R R( R ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR% ` s c C@ sM t � } g } x7 | D]/ } | | k r | j | � | j | � q q W| S( s@ list -> list. remove duplicated items without changing the order( t sett addt append( t lstt seent resultt x( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt uniqh s
c C@ s� | } g } xn | j � t j k r| | r@ t | � | k r@ Pn | j � } t | � d k rb Pn | j | � | d } q W| j � | S( s) (ctx, int?) -> [ctx]. get a linear stack of non-public changesets.
changesets are sorted in topo order, oldest first.
return at most limit items, if limit is a positive number.
merges are considered as non-draft as well. i.e. every commit
returned has and only has 1 parent.
i i ( t phaseR t publict lent parentsR, t reverse( t headctxt limitt ctxR/ R5 ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt
getdraftstackr s
c C@ sR | d k r t � } n | s$ t � | | d k r> g i f Sg } i } | d j � } x� t | � D]� } | | k r� | } Pn | | } | j | � | | k r� d } Pn | | | <| j � } | rg | d } | | k r� | j � } Pq� qg qg W| d k r8| | k r%| j | | � q8| j t � � n | j � t | � | f S( sP ([ctx], str, set) -> [fctx], {ctx: fctx}
stack is a list of contexts, from old to new. usually they are what
"getdraftstack" returns.
follows renames, but not copies.
seenfctxs is a set of filecontexts that will be considered "immutable".
they are usually what this function returned in earlier calls, useful
to avoid issues that a file was "moved" to multiple places and was then
modified differently, like: "a" was copied to "b", "a" was also copied to
"c" and then "a" was deleted, then both "b" and "c" were "moved" from "a"
and we enforce only one of them to be able to affect "a"'s content.
return an empty list and an empty dict, if the specified path does not
exist in stack[-1] (the top of the stack).
otherwise, return a list of de-duplicated filecontexts, and the map to
convert ctx in the stack to fctx, for possible mutable fctxs. the first item
of the list would be outside the stack and should be considered immutable.
the remaining items are within the stack.
for example, given the following changelog and corresponding filelog
revisions:
changelog: 3----4----5----6----7
filelog: x 0----1----1----2 (x: no such file yet)
- if stack = [5, 6, 7], returns ([0, 1, 2], {5: 1, 6: 1, 7: 2})
- if stack = [3, 4, 5], returns ([e, 0, 1], {4: 0, 5: 1}), where "e" is a
dummy empty filecontext.
- if stack = [2], returns ([], {})
- if stack = [7], returns ([1, 2], {7: 2})
- if stack = [6, 7], returns ([1, 2], {6: 1, 7: 2}), although {6: 1} can be
removed, since 1 is immutable.
i����i N(
t NoneR* t AssertionErrort p1t reversedR, t renamedR% R6 R1 ( t stackt patht seenfctxst fctxst fctxmapt pctxR9 t fctxR? ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt getfilestack� s< %
t overlaystorec B@ s e Z d Z d � Z d � Z RS( ss read-only, hybrid store based on a dict and ctx.
memworkingcopy: {path: content}, overrides file contents.
c C@ s | | _ | | _ d S( N( t basectxt memworkingcopy( R' RI RJ ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt __init__� s c C@ s� | | j k r d S| j | } | | j k r? | j | } n | j � } | j � | j � f } | j � } | | | o� | d f S( s- comply with mercurial.patch.filestore.getfilei N( NNN( RI R; RJ R( t islinkt isexecR? ( R' RA RF t contentt modeR? ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt getfile� s
( R R R RK RP ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyRH � s c C@ s� | d
k r- | j � j j | j � � } n | d
k rH | j � } n | j � } | j � } | j � } t | j
� � j | � } t | | � } t
j d | j � d | d | d | d | d | d | d d
d | � S( si ({path: content}, ctx, (p1node, p2node)?, {}?) -> memctx
memworkingcopy overrides file contents.
t repoR5 t textt filest filectxfnt usert datet brancht extraN( R; RQ t changelogR5 R RX RV t descriptionRU R* RS t unionRH R t memctx( RJ R9 R5 RX RV t descRU RS t store( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt overlaycontext� s ! t filefixupstatec B@ s� e Z d Z d d d � Z d d � Z d � Z d � Z d � Z e d � � Z
d � Z d � Z d � Z
d
� Z e d � Z d � Z d
� Z RS( s state needed to apply fixups to a single file
internally, it keeps file contents of several revisions and a linelog.
the linelog uses odd revision numbers for original contents (fctxs passed
to __init__), and even revision numbers for fixups, like:
linelog rev 1: self.fctxs[0] (from an immutable "public" changeset)
linelog rev 2: fixups made to self.fctxs[0]
linelog rev 3: self.fctxs[1] (a child of fctxs[0])
linelog rev 4: fixups made to self.fctxs[1]
...
a typical use is like:
1. call diffwith, to calculate self.fixups
2. (optionally), present self.fixups to the user, or change it
3. call apply, to apply changes
4. read results from "finalcontents", or call getfinalcontent
c C@ s� | | _ | | _ | p t � | _ | p- i | _ g | D] } | j � ^ q: | _ t j t j
| j � | _ | j � | _
| j j r� | j � | j k s� t � n d d g | _ g | _ g | _ g | _ t � | _ d S( s� ([fctx], ui or None) -> None
fctxs should be linear, and sorted by topo order - oldest first.
fctxs[0] will be considered as "immutable" and will not be changed.
i N( RC RA R t uit optsR( t contentsR
t maplistR t
splitnewlinest contentlinest
_buildlinelogR R! t _checkoutlinelogR< t
chunkstatst targetlinest fixupst
finalcontentsR* t ctxaffected( R' RC RA Ra Rb t f( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyRK s " c C@ sP | j d } | j d } | j � } t j | � } | | _ | j j | j j � | j j } t
| � t
| � k s~ t � | r� | d d | d d d f } | j | � n x� | j
| | | | � D]{ } | j | | � }
| j d c t |
� 7<| j d c d 7<| j |
7_ | d k r� | j | | | | |
� q� q� Wd S( s� calculate fixups needed by examining the differences between
self.fctxs[-1] and targetfctx, chunk by chunk.
targetfctx is the target state we move towards. we may or may not be
able to get there because not all modified chunks can be amended into
a non-public fctx unambiguously.
call this only once, before apply().
update self.fixups, self.chunkstats, and self.targetlines.
i����i i N( Rc Rf R( R Re Rj R t annotatet maxrevt annotateresultR4 R< R, t _alldiffchunkst _analysediffchunkRi t boolRk R; t _showchanges( R' t
targetfctxt fmt at alinest bt blinest annotatedt dummyendlinet chunkt newfixups( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt diffwith0 s$
c C@ s� x� t | j � D]� \ } } } } } | j | | !} | j j r� t | d d � d } | j j t d � t j | j
| j � � | | t | � f � n | j j
| | | | | � q W| j j d t � r� | j � | _ n | j � | _ d S( s� apply self.fixups. update self.linelog, self.finalcontents.
call this only once, before getfinalcontent(), after diffwith().
i i i s %s: chunk %d:%d -> %d lines
t
edit_linesN( R> Rk Rj Ra R! t maxt writeR R t shortRC R4 R t replacelinesRb t getR t _checkoutlinelogwitheditsRl Rh ( R' t revt a1t a2t b1t b2R{ t idx( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt applyS s % c C@ s | j j | � } | j | S( s@ (fctx) -> str. get modified file content for a given filecontext( RC t indexRl ( R' RF R� ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt getfinalcontentg s c C@ s� | \ } } } } | | | !} | ry | ry | t d | d � h } g | D]$ } | | d d k rL | | ^ qL } n t t d � | D� � � }
g } t |
� d k r| j | | d t � r|
d } | d k r�| d }
| j |
| | | | f � q�n� | | | | k s(| | k r�x� t j | | � D]� } | | \ } } | d k r;| | k rvd } } n | | | } | d } | d }
| j |
| | d | | f � q;q;Wn | j | � S( s� analyse a different chunk and return new fixups found
return [] if no lines from the chunk can be safely applied.
the chunk (or lines) cannot be safely applied, if, for example:
- the modified (deleted) lines belong to a public changeset
(self.fctxs[0])
- the chunk is a pure insertion and the adjacent lines (at most 2
lines) belong to different non-public changesets, or do not belong
to any non-public changesets.
- the chunk is modifying lines from different changesets.
in this case, if the number of lines deleted equals to the number
of lines added, assume it's a simple 1:1 map (could be wrong).
otherwise, give up.
- the chunk is modifying lines from a single non-public changeset,
but other revisions touch the area as well. i.e. the lines are
not continuous as seen from the linelog.
i i c s@ s | ] \ } } | Vq d S( N( ( t .0t rt l( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pys <genexpr>� s (
R� t listR* R4 t
_iscontinuousR# R, R
t xranget _optimizefixups( R' R~ R| R� R� R� R� t involvedt nearbylinenumst it involvedrevsR R� t fixuprevt linenumt nb1t nb2( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyRs l s0
1 +
"
*c c@ sP t j | | d | d | �} x+ | D]# \ } } | d k rC q% n | Vq% Wd S( s5 like mdiff.allblocks, but only care about differencest lines1t lines2t !N( R t allblocks( Rx Rz Ry R{ t blocksR~ t btype( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyRr � s
c
C@ s� t j � } d g } } x� t j t | j � � D]� } | j | | j | } } | d d } | j | | | | � } x? t t | � � D]+ \ } }
} } | j | | |
| | � q� W| | } } q2 W| S( s~ calculate the initial linelog based on self.content{,line}s.
this is similar to running a partial "annotate".
R& i i (
R R
R� R4 Rc Rf Rr R> R� R� (
R' t llogRx Ry R� Rz R{ t llrevt chunksR� R� R� R� ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyRg � s
% c C@ sy g } xl t j t | j � � D]R } | d d } | j j | � d j t | j | j j � � } | j
| � q W| S( s1 () -> [str]. check out file contents from linelogi i R& ( R
R� R4 Rc R Ro t joint mapt _getlineRq R, ( R' Rc R� R� RN ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyRh � s !c C@ s% | j j � } t d � | j d j � } g t | j � D]' \ } } t | t � s< | | f ^ q< } x{ t | � D]m \ } \ } } | t d � d | d t | � | d t j
| j � � | j � j d d � d f 7} qv W| t d � d t | � 7} t
d
� � } xT | D]L \ } } | j j | d d � x% | j j D] } | | j | � qLWqWxc | D][ } | d d
j g | D]( \ } } | | | k r�d n d ^ q�� | j | � f 7} qrW| j j | d
d d �}
|
s
t j t d � � � n g | j D] } d
^ q} d } | t | � d }
x� t j |
� D]� } | j d � rkqPn | |
d |
d !d k r�t j t d � | � � n | |
d } xL t | | |
d !� D]3 \ } } | d k r�| | | d c | 7<q�q�WqPW|
| k r!d d g | _ n | S( s& () -> [str]. prompt all lines for editsZ HG: editing %s
HG: "y" means the line to the right exists in the changeset to the top
HG:
i����s HG: %s/%s %s %s
t |t -i s
i s HG: %s
c S@ s t � S( N( R* ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt <lambda>� R& i s %s : %sR& t yt t actionR s empty editor texti s HG:s : s malformed line: %s( R t getalllinesR RC RA t enumeratet
isinstanceR% R4 R R� RZ t splitt defaultdictRo Rq R+ R� R� Ra t editR t AbortR Re t
startswithRi ( R' t alllinest
editortextR� Rn t visiblefctxst jt linesetR� t _ft
editedtextRc t
leftpadpost colonpost linecontentt ch( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR� � sP ! %
2 $ # c C@ s8 | \ } } | d @r) | j | d | S| j | Sd S( s@ ((rev, linenum)) -> str. convert rev+line number to line contenti i N( Rf Rj ( R' t lineinfoR� R� ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR� � s
c C@ sq | | k r t S| j } | j | � } | j | � t | � } | j | | � } t | � | | t | � k S( s (a1, a2 : int) -> bool
check if these lines are continuous. i.e. no other insertions or
deletions (from other revisions) among these lines.
closedinterval decides whether a2 should be included or not. i.e. is
it [a1, a2), or [a1, a2] ?
( R# R t getoffsett intR� R4 ( R' R� R� t closedintervalR� t offset1t offset2t linesinbetween( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR� � s c
@ s g � d d d d d g g � � � f d � } x� t | � D]� \ } } | \ } } } } } � d d }
� d d } � d d } | | k r� | | k r� | |
k r� | j t | d d � | � r� | � d d <| � d d <q= | � t | � � d <q= W| � � S( sx [(rev, a1, a2, b1, b2)] -> [(rev, a1, a2, b1, b2)].
merge adjacent fixups to make them less fragmented.
i����c @ s2 � d d d k r. � j t � d � � n d S( Ni i����( R, t tuple( ( t
pcurrentchunkR/ ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt pushchunk s i i i i ( R� R� R� R� (
R' Rk R� R� R~ R� R� R� R� R� t lastrevt lasta2t lastb2( ( R� R/ s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR� s $ c @ s� d � } | \ } } } }
d g | | d g |
| } } x� | D]� \ }
} } } } x9 t j | | � D]% } t |
d � d d | | | <qm Wx9 t j | | � D]% } t |
d � d d | | | <q� WqE W� j � � j d d d | | | | |
| f d d �� j d
� j d d � � � f d � } xB t j | | � D]. } | | | | d
| | | � d d � qOWxB t j | |
� D]. } | | | | d | | | � d d � q�Wd S( Nc S@ s | j d � r | d } n | S( Ns
i����( t endswith( t line( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt trim+ s
i i i t hunks %s
s @@ -%d,%d +%d,%d @@t labels diff.hunkRA t linetypec @ s� � j � d } | rX � j | } � j d | � | j � } � j j | j � � n � j d d | d d �� j d | d | | d | �� j d � j d
| � d S( NR& RF R s %-7.7s R� s absorb.nodes diffchar s %s%s
RA R� (
t startitemRC R t hexRm R+ t changectxR� R( RA ( R� t diffcharR� R� t linelabelR R9 ( Rw R' ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt writeline@ s
R� t deleteds diff.deletedt +t inserteds
diff.inserted( R
R� R� R� R� R( RA ( R' Rw Ry R{ R~ Rk R� R� R� R� R� t aidxst bidxsR� t fa1t fa2t fb1t fb2R� R� ( ( Rw R' s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyRu ) s( # #'
"
! !N( R R R R; RK R� R� R� Rs t staticmethodRr Rg Rh R� R� R R� R� Ru ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR` s # 2
5 t
fixupstatec B@ s� e Z d Z d d d � Z d d d � Z d � Z e d � � Z d � Z d � Z
d � Z d � Z d � Z
d
� Z d � Z e d d � � Z d d
� Z e j d � � Z d � Z d � Z RS( s^ state needed to run absorb
internally, it keeps paths and filefixupstates.
a typical use is like filefixupstates:
1. call diffwith, to calculate fixups
2. (optionally), present fixups to the user, or edit fixups
3. call apply, to apply changes to memory
4. call commit, to commit changes to hg database
c C@ s� | s t � | p t � | _ | p' i | _ | | _ | d j � j � | _ g | _ d | _ i | _
i | _ i | _ d | _
t � | _ d S( s� ([ctx], ui or None) -> None
stack: should be linear, and sorted by topo order - oldest first.
all commits in stack are considered mutable.
i����N( R< R Ra Rb R@ RQ t
unfilteredt pathsR; t statusRD t fixupmapt
replacemapt finalnodeR* Rm ( R' R@ Ra Rb ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyRK a s c C@ s� | j d j | | � | _ g | _ | j j d � } | j j r_ | r_ | r_ | j � } n | j j } t � } xgt | � D]Y} | j j
d | � | | } t | j | | � \ } }
t d � | g | D� � r� q� n | j
� | d j
� k r | r q� n | j | d � |
| j | <t | | d | j d | j �} | d k r�| j � | j d � | j d d
| d d �| j
d
d � n | j | | � | | j | <| j j | � | j j | j � q� Wd S( s9 diff and prepare fixups. update self.fixupmap, self.pathsi����R� s calculating fixups for %s
c s@ s? | ]5 } t | t � s | j � p6 t j | j � � Vq d S( N( R� R% RL R t binaryR( ( R� Rn ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pys <genexpr>� s i Ra Rb s showing changes for RA s %s
R� s absorb.pathR� N( R@ R� R� Rb R� t modifiedRS R* t sortedRa t debugRG t anyR( t updateRD R` R; R� t plainR� R� R� R, Rm ( R' t targetctxt matchRw t editoptt interestingpathsRB RA Rv RC t ctx2fctxt fstate( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR� v s8
#
!
c C@ sW xP | j j � D]? \ } } | j j rE | j j t d � | � n | j � q Wd S( s* apply fixups to individual filefixupstatess applying fixups to %s
N( R� t iteritemsRa R! R� R R� ( R' RA t state( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR� � s c C@ s t d � | j j � D� � S( s> -> {path: chunkstats}. collect chunkstats from filefixupstatesc s@ s$ | ] \ } } | | j f Vq d S( N( Ri ( R� RA R� ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pys <genexpr>� s ( t dictR� R� ( R' ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyRi � s c C@ s� | j j � �� | j j � �� | j j d � �] } | j � | j | � | j d j � | j k ru | j � n | j r� | j
� n Wd QX| j s� | j � n Wd QXWd QX| j S( s6 commit changes. update self.finalnode, self.replacemapR t .N(
RQ t wlockt lockt transactiont _commitstackt _movebookmarksR R� t _moveworkingdirectoryparentt _useobsoletet _obsoleteoldcommitst _stripoldcommitsR� ( R' t tr( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt commit� s
c @ s� | j } | j } | j rp x� | j � D]A \ } } | d r( | j t d � | | d | d f � q( q( WnQ | j s� | j � � � f d � d D� \ } } | j t d � | | f � n d S( s+ print things like '1 of 2 chunk(s) applied'i s %s: %d of %d chunk(s) applied
i c 3@ s+ | ]! � t � f d � � D� � Vq d S( c 3@ s | ] } | � Vq d S( N( ( R� t s( R� ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pys <genexpr>� s N( t sum( R� ( t stats( R� s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pys <genexpr>� s s %d of %d chunk(s) applied
N( i i ( Ra Ri R" R� R� R R$ t values( R' Ra Ri RA t statt appliedt total( ( R
s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt printchunkstats� s
# c C@ sh d } d } x@| j D]5} | j | � } | rE | rE | } q n d } | j | | | � r� d | j | j � <t d � } n� | j | | d | �} | j | } | } | j � | j | j � <| r� t d � t | � | j
| � f } n t d � | j
| � } | j j r | r | j j
t d � | j
| � | f � q q W| o^| j � | _ d S( s� make new commits. update self.finalnode, self.replacemap.
it is splitted from "commit" to avoid too much indentation.
R& s became empty and was droppedR= s %d file(s) changed, became %ss became %ss %s: %s
N( R; R@ t _getnewfilecontentst _willbecomenoopR� R R t
_commitsingleRQ R4 t _ctx2strRa R" R� R� ( R' t
lastcommittedt nextp1R9 RJ t msgt nodestr( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR � s,
0c C@ sM | j j r& d | j � | j � f Sd | j � t j | j � � f Sd S( Ns %d:%s( Ra R! R� R� R R� ( R' R9 ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR � s c C@ s� i } x{ | j D]p } | j | } | | k r5 q n | | } | j � } | j | j | � } | | k r | | | j � <q q W| S( s� (ctx) -> {path: str}
fetch file contents from filefixupstates.
return the working copy overrides - files different from ctx.
( R� RD R( R� R� RA ( R' R9 R/ RA R� RF RN t
newcontent( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR � s
c C@ s | j } g | j j � D]. \ } } | | j k r | | j | f ^ q } g } x� | D]� \ } } | r� | j | | f � | j j r� | j j t d � | t j
| � f � q� qZ | j | d f � | j j rZ | j j t d � | � qZ qZ W| j j | | | � d S( Ns moving bookmark %s to %s
s deleting bookmark %s
(
RQ t
_bookmarksR� R� R, Ra R" R� R R R� R; t applychanges( R' R RQ R t hsht
needupdatet changes( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR s ( !c @ s� | j sL | j j d | j j � � } | j | j � } | j � | _ n | j | j } | j j � d � } | } t j � d � r� � j
j � � � f d � } | � j
_ n z9 � j � �' � j
| j � | j � | j � Wd QXWd | � Xd S( Ns max(::. - %ln)c S@ s d S( Ni ( ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR� " R& t _fsmonitorstatec @ s � � j _ d S( N( R! t
invalidate( ( t bakt dirstate( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt restore& s ( R� RQ t revsR� t keyst firstR R$ R t safehasattrR! R" t parentchanget rebuildt manifestR� ( R' R& R9 t noopR% ( ( R# R$ s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR s
,c C@ s� | s5 | j � } t | � d k r( t S| d } n t | j � � j t | � � sZ t Sx| | j � D]n \ } } | | k s� | | k r� t S| | } | | } | j � | j � k r� t S| j � | k rg t Sqg Wt S( s� ({path: content}, ctx, ctx) -> bool. test if a commit will be noop
if it will become an empty commit (does not change anything, after the
memworkingcopy overrides), return True. otherwise return False.
i i (
R5 R4 R R* RS t issubsetR� t flagsR( R# ( RJ R9 RE R5 RA RN RF t pfctx( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR / s"
!
c C@ s� | o | t j f } | j � } | j rR | j j d d � rR | j � | d <n t | | | d | �} | j � j j i | j
� d 6� � | j � SWd QXd S( s� (ctx, {path: content}, node) -> node. make a single commit
the commit is a clone from ctx, with a (optionally) different p1, and
different file contents replaced by memworkingcopy.
R s add-noiset
absorb_sourceRX R s
new-commitN( R s
new-commit( R R) RX R Ra t
configboolR� R_ RQ t configoverrideR2 R
( R' RJ R9 R= R5 RX t mctx( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR I s c C@ s t j | j t j � S( s
() -> bool( R
t isenabledRQ t createmarkersopt( R' ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR Y s c C@ sk g | j j � D]5 \ } } | j | | r< | j | f p? d f ^ q } | rg t j | j | � n d S( N( ( R� R� RQ R
t
createmarkers( R' t kt vt relations( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR ^ s Hc C@ s� | j j � } | j j d | | | � } | j j j } g | D] } | | � ^ q@ } | r} t j | j j | j | � n d S( Ns %ln - (::(heads(%ln::)-%ln))( R� R' RQ R& RY R R t stripRa ( R' t nodelistR& t tonodeR� ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR d s N( R R R R; RK R� R� t propertyRi R
R R R R R R R� R R R t
propertycacheR R R ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR� T s$ ( # c C@ s� t | � t j t j f k r" d S| j j � } | j t | j
� d } g | _
| _ t j
� } | j | � t j | j � � } | | j } g | d D] } | d d k r� | d ^ q� } | | | | f f S( sA (crecord.uihunk or patch.recordhunk) -> (path, (a1, a2, [bline]))i i R� N( NN( t typeR t uihunkR t
recordhunkR; t headert filenamet fromlineR4 t beforet afterR t stringioR� R Re t getvaluet removed( R� RA R� t buft
patchlinesR� R� R{ ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt _parsechunkn s
1c C@ s i } t d � � } xB t t | � D]1 \ } } | s% | rE q% n | | j | � q% Wx� | j � D]� \ } } | | k sg | r� qg n | j d t � t j | | j � � } x$ | D] \ } } }
|
| | | +q� Wd j
| � | | <qg Wt | | � S( s� (ctx, [crecord.uihunk]) -> memctx
return a memctx with some [1] patches (chunks) applied to ctx.
[1]: modifications are handled. renames, mode changes, etc. are ignored.
c S@ s g S( N( ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR� � R& R6 R& ( R� R� RM R, R� t sortR# R Re R( R� R_ ( R9 R� RJ t patchmapRA t infot patchest linesR� R� R{ ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt overlaydiffcontext~ s c C@ s= | d k rf | j d d � } t | d | � } | rf t | � | k rf | j t d � | � qf n | s� t j t d � � � n | d k r� | d } n | d k r� d! } n | d k r� i } n t | d | d | �} t j
| | | � } | j d � rft j
| | d j � | j � | � } t j | � }
t j | |
� d
} t | d | � } n d } | j d � s�| j d � r�| j d | � } n | j | | | � | d k r�| j � | j d
d t | j � � | j d d � x� t | � D]� }
|
| j k r qn | j � | j d |
� | j d d � | j d d |
j � d d �|
j � j � d
} | j d d | d d �qW| j � n | j d � s9| j d � s�| j d d d �r�t j t d � � � q�n | j � | j! � r| j" � q9| j# s9| j t d � � q9n | S(" s� pick fixup chunks from targetctx, apply them to stack.
if targetctx is None, the working copy context will be used.
if stack is None, the current draft stack will be used.
return fixupstate.
R s max-stack-sizeR� s7 absorb: only the recent %d changesets will be analysed
s no mutable changeset to changeRa Rb t interactivei����i t
print_changest
apply_changest counts
%d changesets affected
R� t summaryR9 t changesetR s %-7.7s R� s absorb.nodet
descfirstlines %s
s absorb.descriptiont dry_runs" apply changes (yn)? $$ &Yes $$ &NoR i s absorb cancelled
s nothing applied
N( ($ R; t configintR: R4 t warnR R R� R� R R� R� R t diffR t
parsepatchR t recordfilterRS t formatterR� R� R� Rm R( R> R R� RZ t
splitlinest endt promptchoiceR� R
R R$ ( Ra RQ R@ R� t patsRb R8 R� t matcherR^ t
origchunksR� Rw R9 RZ ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyR � sd
(
Rx s
apply-changess0 apply changes without prompting for confirmationt ps
print-changess; always print which changesets are modified by which changesR� RT s9 interactively select which chunks to apply (EXPERIMENTAL)t es
edit-linessG edit what lines belong to which changesets before commit (EXPERIMENTAL)s hg absorb [OPTION] [FILE]...t helpcategoryt helpbasicc O@ sW t j | � } t | | d | d | �} t d � | j j � D� � d k rS d Sd S( s� incorporate corrections into the stack of draft changesets
absorb analyzes each change in your working directory and attempts to
amend the changed lines into the changesets in your stack that first
introduced those lines.
If absorb cannot find an unambiguous changeset to amend for a change,
that change will be left in the working directory, untouched. They can be
observed by :hg:`status` or :hg:`diff` afterwards. In other words,
absorb does not write to the working directory.
Changesets outside the revset `::. and not public() and not merge()` will
not be changed.
Changesets that become empty after applying the changes will be deleted.
By default, absorb will show what it plans to do and prompt for
confirmation. If you are confident that the changes will be absorbed
to the correct place, run :hg:`absorb -a` to apply the changes
immediately.
Returns 0 on success, 1 if all chunks were ignored and nothing amended.
Re Rb c s@ s | ] } | d Vq d S( i N( ( R� R ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pys <genexpr> s i i N( R
t byteskwargsR R Ri R ( Ra RQ Re Rb R� ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt absorbcmd� s &%(5 R t
__future__R t collectionst mercurial.i18nR t mercurialR R R R R R R R R
R R R
R R R R t mercurial.utilsR t
testedwitht cmdtablet commandt configtablet
configitemR# R; t
colortableR� t objectR R% R1 R: RG t filestoreRH R_ R` R� RM RS R t
dryrunoptst templateoptst walkoptst CATEGORY_COMMITTINGRm ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/absorb.pyt <module> sJ j
Q� T� <
l