HEX

File: //kunden/lib/python3/dist-packages/hgext/__pycache__/absorb.cpython-39.pyc
a

%0�_\��
@s�dZddlmZddlZddlmZddlmZmZm	Z	m
Z
mZmZm
Z
mZmZmZmZmZmZmZmZmZddlmZdZiZe�e�ZiZe�e�Zedd	d
d�edddd�edd
dd�dddd�ZejZGdd�de �Z!Gdd�de �Z"dd�Z#d;dd�Z$d<dd�Z%Gdd�dej&�Z'd=dd �Z(Gd!d"�d"e �Z)Gd#d$�d$e �Z*d%d&�Z+d'd(�Z,d>d)d*�Z-edd+d,ded-�fd.d/ded0�fd1d2ded3�fd4d5ded6�fgej.ej/ej0ed7�ej1d
d8�d9d:��Z2dS)?a?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
�)�absolute_importN)�_)�cmdutil�commands�context�crecord�error�linelog�mdiff�node�obsolete�patch�phases�pycompat�	registrar�rewriteutil�scmutil�util)�
stringutilsships-with-hg-core�absorb�	add-noiseT��defaults
amend-flag�max-stack-size�2syellows	blue boldsbold)�absorb.description�absorb.node�absorb.pathc@s$eZdZdZdZdZdZdd�ZdS)�nulluizblank ui object doing nothingFTcCsdd�}|S)Nc_sdS�N�)�args�kwdsr r �./usr/lib/python3/dist-packages/hgext/absorb.py�nullfunc\sz$nullui.__getitem__.<locals>.nullfuncr )�namer$r r r#�__getitem__[sznullui.__getitem__N)�__name__�
__module__�__qualname__�__doc__�	debugflag�verbose�quietr&r r r r#rTs
rc@s eZdZdZdd�Zdd�ZdS)�emptyfilecontextz.minimal filecontext representing an empty filecCsdS)N�r ��selfr r r#�dataeszemptyfilecontext.datacCstjSr)r�nullidr0r r r#rhszemptyfilecontext.nodeN)r'r(r)r*r2rr r r r#r.bsr.cCs4t�}g}|D] }||vr|�|�|�|�q|S)z@list -> list. remove duplicated items without changing the order)�set�add�append)Zlst�seen�result�xr r r#�uniqls
r:cCs^|}g}|��tjkrR|r(t|�|kr(qR|��}t|�dkr>qR|�|�|d}q|��|S)a)(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.
    �r)ZphaserZpublic�len�parentsr6�reverse)�headctx�limit�ctxr8r=r r r#�
getdraftstackws	

rBc	Cs�|durt�}|sJ�||dvr*gifSg}i}|d��}t|�D]b}||vrZ|}q�||}|�|�||vr|d}q�|||<|��}|rF|}||vrF|��}q�qF|dur�||vr�|�||�n|�t��|��t|�|fS)aP([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.
    N���r)r4�p1�reversedr6�
copysourcer.r>r:)	�stack�path�	seenfctxs�fctxs�fctxmap�pctxrA�fctx�copyr r r#�getfilestack�s<%
rOc@s eZdZdZdd�Zdd�ZdS)�overlaystorezsread-only, hybrid store based on a dict and ctx.
    memworkingcopy: {path: content}, overrides file contents.
    cCs||_||_dSr)�basectx�memworkingcopy)r1rQrRr r r#�__init__�szoverlaystore.__init__cCsX||jvrdS|j|}||jvr.|j|}n|��}|��|��f}|��}|||fS)z-comply with mercurial.patch.filestore.getfile)NNN)rQrRr2�islinkZisexecrF)r1rHrM�content�moderNr r r#�getfile�s


zoverlaystore.getfileN)r'r(r)r*rSrWr r r r#rP�srPc	Cs�|dur|��j�|���}|dur,|��}|dur<|��}|��}|��}t|�	���
|�}t||�}tj
|��||||||d|d�	S)zi({path: content}, ctx, (p1node, p2node)?, {}?) -> memctx
    memworkingcopy overrides file contents.
    N)	�repor=�text�filesZ	filectxfn�user�date�branch�extra)rXZ	changelogr=rr^�descriptionr\r[r4rZ�unionrPrZmemctx)	rRrAr=r^�descr\r[rZZstorer r r#�overlaycontext�s*
�rbc@s�eZdZdZddd�Zddd�Zdd�Zd	d
�Zdd�Ze	d
d��Z
dd�Zdd�Zdd�Z
dd�Zd dd�Zdd�Zdd�ZdS)!�filefixupstateastate 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
    NcCs�||_||_|pt�|_|pi|_dd�|D�|_t�tj	|j�|_
|��|_|jj
rh|��|jkshJ�ddg|_g|_g|_g|_t�|_dS)z�([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.
        cSsg|]}|���qSr )r2��.0�fr r r#�
<listcomp>5r/z+filefixupstate.__init__.<locals>.<listcomp>rN)rJrHr�ui�opts�contentsrZmaplistr
�
splitnewlines�contentlines�
_buildlinelogr	r+�_checkoutlinelog�
chunkstats�targetlines�fixups�
finalcontentsr4�ctxaffected)r1rJrHrhrir r r#rS)s


zfilefixupstate.__init__cCs�|jd}|jd}|��}t�|�}||_|j�|jj�|jj	}t
|�t
|�ksXJ�|r�|dd|dddf}|�|�|�||||�D]`}	|�
|	|�}
|jdt|
�7<|jdd7<|j|
7_|dur�|�||||	|
�q�dS)a�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.
        rCrr;N)rjrlr2r
rkrpr	�annotateZmaxrev�annotateresultr<r6�_alldiffchunks�_analysediffchunkro�boolrq�_showchanges)r1�
targetfctx�fm�a�alines�b�blines�	annotatedZdummyendline�chunk�	newfixupsr r r#�diffwithBs$



zfilefixupstate.diffwithc	Cs�t|j�D]z\}}}}}|j||�}|jjrpt|dd�d}|j�td�t�	|j
|���||t|�f�|j�
|||||�q
|j�dd�r�|��|_n
|��|_dS)z�apply self.fixups. update self.linelog, self.finalcontents.

        call this only once, before getfinalcontent(), after diffwith().
        r;r�s%s: chunk %d:%d -> %d lines
�
edit_linesFN)rErqrprhr+�max�writerr�shortrJr<r	�replacelinesri�get�_checkoutlinelogwitheditsrrrn)r1�rev�a1�a2�b1�b2r�idxr r r#�applyes��zfilefixupstate.applycCs|j�|�}|j|S)z@(fctx) -> str. get modified file content for a given filecontext)rJ�indexrr)r1rMr�r r r#�getfinalcontentzszfilefixupstate.getfinalcontentcs6|\}}}}�||�}|sD�rD|td|d�h}�fdd�|D�}tdd�|D��}	g}
t|	�dkr�|�||dd�r�|	d}|dkr�|d}|
�|||||f�n�||||ks�||k�r,t�||�D]^}
�|
\}}|dkr�||kr�d}}n||
|}|d}|d}|
�||
|
d||f�q�|�|
�S)a�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.
        rr;cs$g|]}�|ddkr�|�qS�rr;r )re�i�r�r r#rg�sz4filefixupstate._analysediffchunk.<locals>.<listcomp>cSsh|]\}}|�qSr r )re�r�lr r r#�	<setcomp>�r/z3filefixupstate._analysediffchunk.<locals>.<setcomp>T)r��listr<�
_iscontinuousr6r�xrange�_optimizefixups)r1r�r�r�r�r�r�ZinvolvedZnearbylinenumsZinvolvedrevsr�r�Zfixuprevr��linenumZnb1Znb2r r�r#rws2
�
z filefixupstate._analysediffchunkccs4tj||||d�}|D]\}}|dkr(q|VqdS)z5like mdiff.allblocks, but only care about differences)Zlines1Zlines2�!N)r
Z	allblocks)r|r~r}rZblocksr�Zbtyper r r#rv�s
zfilefixupstate._alldiffchunksc
	Cs�t��}dg}}t�t|j��D]l}|j||j|}}|dd}|�||||�}tt|��D]\}	}
}}|�	||	|
||�qd||}}q"|S)z~calculate the initial linelog based on self.content{,line}s.
        this is similar to running a partial "annotate".
        r/r�r;)
r	rr�r<rjrlrvrEr�r�)
r1�llogr|r}r�r~rZllrev�chunksr�r�r�r�r r r#rm�s
zfilefixupstate._buildlinelogcCsVg}t�t|j��D]<}|dd}|j�|�d�t|j|jj	��}|�
|�q|S)z1() -> [str]. check out file contents from linelogr;r�r/)rr�r<rjr	rt�join�map�_getlinerur6)r1rjr�r�rUr r r#rn�szfilefixupstate._checkoutlinelogc

s0|j��}td�|jd��}dd�t|j�D�}t|�D]R\}\}}|td�d|dt|�|dt�|���|�	��
d	d�d
f7}q<|td�dt|�7}tdd
���|D]8\}}|j�|dd�|jj
D]����|�q�q�|D]0�|dd���fdd�|D��|���f7}q�|jj|ddd�}|�sNt�td���dgt|j�}d}	|	t|�d}
t�|�D]����d��r��q|�|
d|
d�dk�r�t�td�����|
dd�}tt��|	|
d���D],\}}|dk�r�|||d
|7<�q�q|||k�r,ddg|_|S)z&() -> [str]. prompt all lines for editsZHG: editing %s
HG: "y" means the line to the right exists in the changeset to the top
HG:
rCcSs"g|]\}}t|t�s||f�qSr )�
isinstancer.)rer�rfr r r#rg�s
�z<filefixupstate._checkoutlinelogwithedits.<locals>.<listcomp>sHG: %s/%s %s %s
�|�-r;�
rsHG: %s
cSst�Sr)r4r r r r#�<lambda>�r/z:filefixupstate._checkoutlinelogwithedits.<locals>.<lambda>r�s    %s : %sr/cs$g|]\}}|��vrdnd�qS)�y� r )rer�Z_f�r�Zlinesetr r#rg�s�r)�actionsempty editor text�sHG:s : smalformed line: %sNr�)r	�getalllinesrrJrH�	enumerater<rr�r_�split�defaultdictrtrur5r�r�rhZeditr�Abortr
rk�
startswithrZbytestrro)
r1ZalllinesZ
editortextZvisiblefctxsr��jrfZ
editedtextrjZ
leftpadposZcolonposZlinecontentZchr r�r#r��sh
�����
���

�
 

z(filefixupstate._checkoutlinelogwitheditscCs0|\}}|d@r"|j|d|S|j|SdS)z@((rev, linenum)) -> str. convert rev+line number to line contentr;r�N)rlrp)r1Zlineinfor�r�r r r#r�szfilefixupstate._getlineFcCsR||krdS|j}|�|�}|�|�t|�}|�||�}t|�||t|�kS)a(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] ?
        T)r	Z	getoffset�intr�r<)r1r�r�Zclosedintervalr�Zoffset1Zoffset2Zlinesinbetweenr r r#r� s	
zfilefixupstate._iscontinuousc
s�g�gd�g���fdd�}t|�D]�\}}|\}}}}}	�dd}
�dd}�dd}||kr�||kr�||
kr�|�t|dd�|�r�|�dd<|	�dd<q$|�t|��d<q$|��S)zx[(rev, a1, a2, b1, b2)] -> [(rev, a1, a2, b1, b2)].
        merge adjacent fixups to make them less fragmented.
        )rCrCrCrCrCcs&�dddkr"��t�d��dS)NrrC)r6�tupler �Z
pcurrentchunkr8r r#�	pushchunk8sz1filefixupstate._optimizefixups.<locals>.pushchunkrr�r�r;)r�r�r�r�)
r1rqr�r�r�r�r�r�r�r�ZlastrevZlasta2Zlastb2r r�r#r�1s,
����zfilefixupstate._optimizefixupsc	sTdd�}|\}}}	}
dg||dg|
|	}}|D]f\}
}}}}t�||�D]}t|
d�dd|||<qPt�||�D]}t|
d�dd|||	<q|q6����jddd||||	|
|	fd	d
��j�jdd���fdd
�}t�||�D]$}||||d|||�dd�q�t�|	|
�D]&}||||	d|||�dd��q(dS)NcSs|�d�r|dd�}|S)Nr�rC)�endswith)�liner r r#�trimQs
z)filefixupstate._showchanges.<locals>.trimrr;r�shunks        %s
s@@ -%d,%d +%d,%d @@s	diff.hunk�Zlabel�rH�linetypecs|���d}|r>�j|}�j|d�|��}�j�|����jdd|dd��jd|d|||d��j�j	|d	�dS)
Nr/)rM�node�%-7.7s rr�s	diffchar s%s%s
r�)
�	startitemrJr�hexrsr5Z	changectxr�r2rH)r�Zdiffcharr�r�Z	linelabelrrA�r{r1r r#�	writelineis 
�z.filefixupstate._showchanges.<locals>.writeliner�sdeletedsdiff.deleted�+sinserteds
diff.inserted)rr�r�r�r�r2rH)r1r{r}rr�rqr�r�r�r�r�ZaidxsZbidxsr�Zfa1Zfa2Zfb1Zfb2r�r�r r�r#ryPsB�

�

�zfilefixupstate._showchanges)NN)N)F)r'r(r)r*rSr�r�r�rw�staticmethodrvrmrnr�r�r�r�ryr r r r#rcs

#3

D
rcc@s�eZdZdZd#dd�Zd$dd�Zdd�Zed	d
��Zdd�Z	d
d�Z
dd�Zdd�Zdd�Z
dd�Zdd�Zed%dd��Zd&dd�Zejdd��Zdd �Zejd!d"��ZdS)'�
fixupstatea^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
    NcCsf|sJ�|pt�|_|pi|_||_|d����|_g|_d|_i|_i|_	i|_
d|_t�|_
dS)z�([ctx], ui or None) -> None

        stack: should be linear, and sorted by topo order - oldest first.
        all commits in stack are considered mutable.
        rCN)rrhrirGrXZ
unfiltered�paths�statusrK�fixupmap�
replacemap�	finalnoder4rs)r1rGrhrir r r#rS�s
zfixupstate.__init__cCsX|jd�||�|_g|_|j�d�}|jjs@|r@|r@|��}n|jj}t�}t|�D]�}|j	�
d|�||}t|j||�\}	}
tdd�|g|	D��r�qV|�
�|	d�
�kr�|s�qV|�|	dd��|
|j|<t|	||j	|jd�}|du�r"|��|�d	�|jd
d|dd
�|j
d
d�|�||�||j|<|j�|�|j�|j�qVdS)z9diff and prepare fixups. update self.fixupmap, self.pathsrCr�scalculating fixups for %s
css.|]&}t|t�s|��p$t�|���VqdSr)r�r.rTrZbinaryr2rdr r r#�	<genexpr>�s
�z&fixupstate.diffwith.<locals>.<genexpr>r;N�rhrisshowing changes for spath�%s
rr��r�)rGr�r�rir�ZmodifiedrZr4�sortedrh�debugrO�anyr2�updaterKrcr�Zplainr�r�r�r6rs)r1�	targetctx�matchr{ZeditoptZinterestingpathsrIrHrzrJ�ctx2fctxZfstater r r#r��s:
�



zfixupstate.diffwithcCs>t�|j�D],\}}|jjr0|j�td�|�|��qdS)z*apply fixups to individual filefixupstatessapplying fixups to %s
N)r�	iteritemsr�rhr+r�rr�)r1rH�stater r r#r��szfixupstate.applycCsdd�t�|j�D�S)z>-> {path: chunkstats}. collect chunkstats from filefixupstatescSsi|]\}}||j�qSr )ro)rerHr�r r r#�
<dictcomp>�s�z)fixupstate.chunkstats.<locals>.<dictcomp>)rr�r�r0r r r#ro�s
�zfixupstate.chunkstatscCsh|j�d��F}|��|�|�|jd��|jvr<|��|��Wd�n1sX0Y|jS)z6commit changes. update self.finalnode, self.replacemapr�.N)	rXZtransaction�_commitstack�_movebookmarksrr��_moveworkingdirectoryparent�_cleanupoldcommitsr�)r1�trr r r#�commit�s
&zfixupstate.commitcs�|j}|j}|jrPt�|�D]0\}}|dr|�td�||d|df�qn:|js�|����fdd�dD�\}}|�td�||f�dS)	z+print things like '1 of 2 chunk(s) applied'rs%s: %d of %d chunk(s) applied
r;c3s$|]�t�fdd��D��VqdS)c3s|]}|�VqdSrr �re�s�r�r r#r�r/z7fixupstate.printchunkstats.<locals>.<genexpr>.<genexpr>N)�sum)re�Zstatsr�r#r�r/z-fixupstate.printchunkstats.<locals>.<genexpr>r�s%d of %d chunk(s) applied
N)	rhror,rr�r�rr-�values)r1rhrorH�statZapplied�totalr r�r#�printchunkstats�s��zfixupstate.printchunkstatscCsd}d}|jD]�}|�|�}|s*|s*|}q|��o>|�|||�}|jrb|rbd|j|��<td�}nt|j|||d�}|j	|}|}|��|j|��<|r�|r�td�}ntd�}|t
|�|�|�f}ntd�|�|�}|jj
r|r|j�td�|�|�|f�q|�o|��|_dS)z�make new commits. update self.finalnode, self.replacemap.
        it is splitted from "commit" to avoid too much indentation.
        Nsbecame empty and was dropped)rDs&%d file(s) changed, became empty as %ss%d file(s) changed, became %ss	became %ss%s: %s
)rG�_getnewfilecontentsrZ�_willbecomenoop�skip_empty_successorr�rr�
_commitsinglerXr<�_ctx2strrhr,r�r�)r1Z
lastcommittedZnextp1rArRZwillbecomenoop�msgZnodestrr r r#r�s:

�



� zfixupstate._commitstackcCs:|jjrd|��|��fSd|��t�|���fSdS)Ns%d:%s)rhr+r�r�rr�)r1rAr r r#r�/szfixupstate._ctx2strcCs\i}|jD]L}|j|}||vr"q
||}|��}|j|�|�}||kr
|||��<q
|S)z�(ctx) -> {path: str}

        fetch file contents from filefixupstates.
        return the working copy overrides - files different from ctx.
        )r�rKr2r�r�rH)r1rAr8rHr�rMrUZ
newcontentr r r#r�5s

zfixupstate._getnewfilecontentscs��j}�fdd�t�|j�D�}g}|D]l\}}|rj|�||f��jjr��j�td�|t	�
|�f�q(|�|df��jjr(�j�td�|�q(|j�|||�dS)Ncs(g|] \}}|�jvr|�j|f�qSr )r�)rer%�hshr0r r#rgIs
�z-fixupstate._movebookmarks.<locals>.<listcomp>smoving bookmark %s to %s
sdeleting bookmark %s
)rXrr�Z
_bookmarksr6rhr,r�rrr�Zapplychanges)r1r�rXZ
needupdateZchangesr%r�r r0r#r�Gs 

��zfixupstate._movebookmarkscs�|js4|j�d|j���}|j|��}|��|_n|j|j}|jj�dd�}|}t�	�d�r~�j
j���fdd�}|�j
_zJ����(��
|��|��|j�Wd�n1s�0YW|�n|�0dS)Nsmax(::. - %ln)cSsdS)Nrr r r r r#r�hr/z8fixupstate._moveworkingdirectoryparent.<locals>.<lambda>�_fsmonitorstatecs��j_dSr)r��
invalidater �Zbak�dirstater r#�restoremsz7fixupstate._moveworkingdirectoryparent.<locals>.restore)r�rX�revsr��keys�firstrr�rZsafehasattrr�r�ZparentchangeZrebuildZmanifestr�)r1r�rAZnoopr�r r�r#r�\s 
8z&fixupstate._moveworkingdirectoryparentcCs�|s$|��}t|�dkrdS|d}|��|��kr8dS|���d�rJdSt|����t|��sddSt�	|�D]V\}}||vs�||vr�dS||}||}|�
�|�
�kr�dS|��|krndSqndS)z�({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.
        r;FrscloseT)r=r<r]r^r�r4rZ�issubsetrr��flagsr2)rRrArLr=rHrUrMZpfctxr r r#r�ws*zfixupstate._willbecomenoopcCsv|o|tjf}|��}|jr6|j�dd�r6|��|d<t�|�	�|�
�dd�|j��D��}t
|||||d�}|��S)z�(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.
        rrs
absorb_sourcecSsi|]\}}||g�qSr r )reZoldnodeZnewnoder r r#r��s�z,fixupstate._commitsingle.<locals>.<dictcomp>)r^ra)rr3r^�_useobsoleterhZ
configboolr�rZupdate_hash_refsrXr_r��itemsrbr�)r1rRrArDr=r^raZmctxr r r#r��s��
�zfixupstate._commitsinglecCst�|jtj�S)z
() -> bool)r�	isenabledrXZcreatemarkersoptr0r r r#r��szfixupstate._useobsoletecCs2dd�t�|j�D�}|r.tj|j|ddd�dS)NcSs$i|]\}}||dur|gng�qSrr )re�k�vr r r#r��s�z1fixupstate._cleanupoldcommits.<locals>.<dictcomp>rT)Z	operationZfixphase)rr�r�rZcleanupnodesrX)r1Zreplacementsr r r#r��s
�
�zfixupstate._cleanupoldcommitscCst�|jd�S)Nr)rr�rhr0r r r#r��szfixupstate.skip_empty_successor)NN)NN)N)N)r'r(r)r*rSr�r��propertyror�r�r�r�r�r�r�r�r�r�rZ
propertycacher�r�r�r r r r#r��s*

*

+


r�cCs�t|�tjtjfvrdS|j��}|jt|j	�d}g|_	|_
t��}|�
|�t�|���}||j}dd�|dd�D�}||||ffS)zA(crecord.uihunk or patch.recordhunk) -> (path, (a1, a2, [bline])))NNr;cSs"g|]}|�d�s|dd��qS)r�r;N)r�)rer�r r r#rg�r/z_parsechunk.<locals>.<listcomp>N)�typerZuihunkr
Z
recordhunk�header�filenameZfromliner<ZbeforeZafterrZstringior�r
rk�getvalueZremoved)ZhunkrHr�ZbufZ
patchlinesr�rr r r#�_parsechunk�s


rcCs�i}tdd��}tt|�D] \}}|r|s,q||�|�qt�|�D]^\}}||vsF|s\qF|jdd�t�||�	��}|D]\}}	}
|
|||	�<q~d�
|�||<qFt||�S)z�(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.
    cSsgSrr r r r r#r��r/z$overlaydiffcontext.<locals>.<lambda>T)r>r/)r�r�rr6rr��sortr
rkr2r�rb)rAr�rRZpatchmaprH�infoZpatches�linesr�r�rr r r#�overlaydiffcontext�srcCsj|durf|�dd�}|d}t|���dkr:t�td���t||�}|rft|�|krf|�td�|�|sxt�td���|dur�|d}|dur�d	}|dur�i}t|||d
�}t	�
|||�}	|�d��rt�
||d��|��|	�}
t�|
�}t�|||	�d
}t|d|�}d}
|�d��s*|�d��s6|�d|�}
|�||	|
�|
du�r�|
��|
�ddt|j��|
jdd�t|�D]n}||jv�r��q~|
��|
j|d�|
jdd�|
jdd|��dd�|����d
}|
jdd|dd��q~|
��|�d��sf|�d��s4|j�r4|jddd��r4t�td ���|� �|�!��rP|�"�n|j#�sf|�td!��|S)"z�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.
    Nrrr�r;scannot absorb into a merges7absorb: only the recent %d changesets will be analysed
sno mutable changeset to changer r��interactiverCrs
print_changess
apply_changesscounts
%d changesets affected
ssummaryr�)rAs	changesetr�r�rr�s
descfirstliner�r�dry_runs#apply changes (y/N)? $$ &Yes $$ &Norsabsorb cancelled
snothing applied
)$Z	configintr<r=rr�rrB�warnr�rr�r�r
�diffrZ
parsepatchrZrecordfilterrZ	formatterr�r�r�rsr2rErr�r_�
splitlines�endZpromptchoicer�r�r�r-)rhrXrGr��patsrir@r?r�ZmatcherrZ
origchunksr�r{rAZ
descfirstliner r r#�absorb�s�
���

��
����

r�as
apply-changess0apply changes without prompting for confirmation�ps
print-changess;always print which changesets are modified by which changes�ir
s*interactively select which chunks to apply�es
edit-linessGedit what lines belong to which changesets before commit (EXPERIMENTAL)shg absorb [OPTION] [FILE]...)ZhelpcategoryZ	helpbasicc	Os�t�|�}|����|���j|ds0t�|�t||||d�}tdd�|j�	�D��dkrxWd�Wd�dSWd�n1s�0YWd�n1s�0YdS)a�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.
    r)rricss|]}|dVqdS)rNr r�r r r#r��r/zabsorbcmd.<locals>.<genexpr>rNr;)
rZbyteskwargsZwlock�lockrZcheckunfinishedrr�ror�)rhrXrrir�r r r#�	absorbcmdAs>

r)N)N)NNN)NNNN)3r*Z
__future__r�collectionsZmercurial.i18nrZ	mercurialrrrrrr	r
rrr
rrrrrrZmercurial.utilsrZ
testedwithZcmdtableZcommandZconfigtableZ
configitemZ
colortabler��objectrr.r:rBrOZ	filestorerPrbrcr�rrrZ
dryrunoptsZtemplateoptsZwalkoptsZCATEGORY_COMMITTINGrr r r r#�<module>s�H

�


R
|6 
O��������� �&