§
    cÌczV  ã                   ó†  — d Z ddlZddlmZmZ ddlmZmZm	Z	m
Z
 ddlmZ ddlmZ ddlmZ dd	lmZ dd
lmZ ddlmZ ddlmZ ddlmZ ddlmZ ddlmZmZ dZdZ dZ!dZ" G d„ d¦  «        Z# G d„ de#¦  «        Z$d„ Z%d„ Z&d„ Z'	 d(d„Z(d„ Z)d„ Z*d„ Z+d „ Z, G d!„ d"¦  «        Z- G d#„ d$¦  «        Z.d%„ Z/ G d&„ d'e¦  «        Z0dS ))zRebase.é    Né   )ÚconfigÚosutils)ÚBzrErrorÚUnknownFormatErrorÚNoCommonAncestorÚUnrelatedBranches)Úgen_revision_id)ÚInventoryTreeChange)ÚFrozenHeadsCache)ÚMerger©ÚNULL_REVISION)Úmutter)Ú
NoSuchFile)Ú	topo_sort)Úuié   )ÚMapTreeÚmap_file_idszrebase-planzrebase-currentz	rebase-ofc                   ó2   — e Zd Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ ZdS )ÚRebaseStatec                 ó*   — t          | j        ¦  «        ‚)zPCheck whether there is a rebase plan present.

        :return: boolean
        )ÚNotImplementedErrorÚhas_plan©Úselfs    ú?/usr/lib/python3/dist-packages/breezy/plugins/rewrite/rebase.pyr   zRebaseState.has_plan5   s   € õ
 " $¤-Ñ0Ô0Ð0ó    c                 ó*   — t          | j        ¦  «        ‚)zbRead a rebase plan file.

        :return: Tuple with last revision info and replace map.
        )r   Ú	read_planr   s    r   r!   zRebaseState.read_plan<   s   € õ
 " $¤.Ñ1Ô1Ð1r   c                 ó*   — t          | j        ¦  «        ‚)zsWrite a rebase plan file.

        :param replace_map: Replace map (old revid -> (new revid, new parents))
        )r   Ú
write_plan)r   Úreplace_maps     r   r#   zRebaseState.write_planC   s   € õ
 " $¤/Ñ2Ô2Ð2r   c                 ó*   — t          | j        ¦  «        ‚)z#Remove a rebase plan file.
        )r   Úremove_planr   s    r   r&   zRebaseState.remove_planJ   s   € õ " $Ô"2Ñ3Ô3Ð3r   c                 ó*   — t          | j        ¦  «        ‚)zrWrite the id of the revision that is currently being rebased.

        :param revid: Revision id to write
        )r   Úwrite_active_revid©r   Úrevids     r   r(   zRebaseState.write_active_revidO   s   € õ
 " $Ô"9Ñ:Ô:Ð:r   c                 ó*   — t          | j        ¦  «        ‚)z�Read the id of the revision that is currently being rebased.

        :return: Id of the revision that is being rebased.
        )r   Úread_active_revidr   s    r   r,   zRebaseState.read_active_revidV   s   € õ
 " $Ô"8Ñ9Ô9Ð9r   N)	Ú__name__Ú
__module__Ú__qualname__r   r!   r#   r&   r(   r,   © r   r   r   r   3   sn   € € € € € ð1ð 1ð 1ð2ð 2ð 2ð3ð 3ð 3ð4ð 4ð 4ð
;ð ;ð ;ð:ð :ð :ð :ð :r   r   c                   ó8   — e Zd Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Zd„ Z	dS )	ÚRebaseState1c                 ó,   — || _         |j        | _        d S ©N)ÚwtÚ
_transportÚ	transport)r   r5   s     r   Ú__init__zRebaseState1.__init__`   s   € ØˆŒØœˆŒˆˆr   c                 ól   — 	 | j                              t          ¦  «        dk    S # t          $ r Y dS w xY w)úSee `RebaseState`.r   F)r7   Ú	get_bytesÚREBASE_PLAN_FILENAMEr   r   s    r   r   zRebaseState1.has_pland   sE   € ð	Ø”>×+Ò+Õ,@ÑAÔAÀSÒHÐHøÝð 	ð 	ð 	Ø�5�5ð	øøøs   ‚"% ¥
3²3c                 ó’   — | j                              t          ¦  «        }|dk    rt          t          ¦  «        ‚t	          |¦  «        S )r:   r   )r7   r;   r<   r   Úunmarshall_rebase_plan©r   Útexts     r   r!   zRebaseState1.read_plank   s>   € àŒ~×'Ò'Õ(<Ñ=Ô=ˆØ�3Š;ˆ;ÝÕ1Ñ2Ô2Ð2Ý% dÑ+Ô+Ð+r   c                 ó  — | j                              ddi¦  «         t          | j         j                             ¦   «         |¦  «        }t          |t          ¦  «        sJ ‚| j                             t          |¦  «         dS )r:   ó	   rebase-v1s   write-requiredN)
r5   Úupdate_feature_flagsÚmarshall_rebase_planÚbranchÚlast_revision_infoÚ
isinstanceÚbytesr7   Ú	put_bytesr<   )r   r$   Úcontents      r   r#   zRebaseState1.write_planr   sw   € àŒ×$Ò$ lÐ4EÐ%FÑGÔGÐGÝ&ØŒGŒN×-Ò-Ñ/Ô/°ñ>ô >ˆå˜'¥5Ñ)Ô)Ð)Ð)Ð)ØŒ× Ò Õ!5°wÑ?Ô?Ð?Ð?Ð?r   c                 ó~   — | j                              ddi¦  «         | j                             t          d¦  «         dS )r:   rB   Nr   )r5   rC   r7   rI   r<   r   s    r   r&   zRebaseState1.remove_planz   s<   € àŒ×$Ò$ l°DÐ%9Ñ:Ô:Ð:ØŒ× Ò Õ!5°sÑ;Ô;Ð;Ð;Ð;r   c                 ó†   — |€t           }t          |t          ¦  «        sJ ‚| j                             t
          |¦  «         dS )r:   N)r   rG   rH   r7   rI   ÚREBASE_CURRENT_REVID_FILENAMEr)   s     r   r(   zRebaseState1.write_active_revid   sA   € àˆ=Ý!ˆEÝ˜%¥Ñ'Ô'Ð'Ð'Ð'ØŒ× Ò Õ!>ÀÑFÔFÐFÐFÐFr   c                 ó¨   — 	 | j                              t          ¦  «                             d¦  «        }|t          k    rdS |S # t
          $ r Y dS w xY w)r:   ó   
N)r7   r;   rM   Úrstripr   r   r?   s     r   r,   zRebaseState1.read_active_revid†   sc   € ð	Ø”>×+Ò+Õ,IÑJÔJ×QÒQÐRWÑXÔXˆDØ•}Ò$Ð$Ø�tØˆKøÝð 	ð 	ð 	Ø�4�4ð	øøøs   ‚=A ÁA Á
AÁAN)
r-   r.   r/   r8   r   r!   r#   r&   r(   r,   r0   r   r   r2   r2   ^   sƒ   € € € € € ð'ð 'ð 'ðð ð ð,ð ,ð ,ð@ð @ð @ð<ð <ð <ð
Gð Gð Gðð ð ð ð r   r2   c                 ó¤   — dt           z  }|d| z  z  }|D ]:}||         \  }}|d||fz  d                     d„ |D ¦   «         ¦  «        z   dz   z  }Œ;|S )z±Marshall a rebase plan.

    :param last_rev_info: Last revision info tuple.
    :param replace_map: Replace map (old revid -> (new revid, new parents))
    :return: string
    s   # Bazaar rebase plan %d
s   %d %s
s   %s %sr   c                 ó   — g | ]}d |z  ‘ŒS )s    %sr0   )Ú.0Úps     r   ú
<listcomp>z(marshall_rebase_plan.<locals>.<listcomp>�   s   € Ð5Ð5Ð5 Q�f˜q‘jÐ5Ð5Ð5r   rO   )ÚREBASE_PLAN_VERSIONÚjoin)Úlast_rev_infor$   ÚretÚoldrevÚnewrevÚ
newparentss         r   rD   rD   ‘   s„   € ð 'Õ)<Ñ
<€CØˆ:˜Ñ%Ñ%€CØð ?ð ?ˆØ*¨6Ô2Ñˆ�Øˆx˜6 6Ð*Ñ*Ø�HŠHÐ5Ð5¨*Ð5Ñ5Ô5Ñ6Ô6ñ7Ø9>ñ?ñ 	?ˆˆà€Jr   c                 óž  — |                       d¦  «        }|d         dt          z  k    rt          |d         ¦  «        ‚|d                               dd¦  «        }t          |d         ¦  «        |d         f}i }|dd…         D ]F}|dk    rŒ	|                      d¦  «        }|d         t	          |dd…         ¦  «        f||d         <   ŒG||fS )	zwUnmarshall a rebase plan.

    :param text: Text to parse
    :return: Tuple with last revision info, replace map.
    rO   r   s   # Bazaar rebase plan %dr   ó    é   Nr   )ÚsplitrV   r   ÚintÚtuple)r@   ÚlinesÚptsrF   r$   Úls         r   r>   r>   ¡   s×   € ð �JŠJ�uÑÔ€EàˆQ„xÐ-Õ0CÑCÒCÐCÝ   q¤Ñ*Ô*Ð*à
�Œ(�.Š.˜˜qÑ
!Ô
!€CÝ˜c !œf™+œ+ s¨1¤vÐ.ÐØ€KØ�1�2�2ŒYð 7ð 7ˆØ�Š8ˆ8àØ�gŠg�d‰mŒmˆØ" 1œv¥u¨S°°°¬W¡~¤~Ð6ˆ�C˜”FÑÐØ Ð,Ð,r   c                 ó„   — |t           k    rt           S |                      |¦  «        }t          |j        |j        ¦  «        S )zæGenerate a revision id for the rebase of an existing revision.

    :param repository: Repository in which the revision is present.
    :param revid: Revision id of the revision that is being rebased.
    :return: new revision id.)r   Úget_revisionr
   Ú	committerÚ	timestamp)Ú
repositoryr*   Úrevs      r   Úregenerate_default_revidrl   ¸   s<   € ð •ÒÐÝÐØ
×
!Ò
! %Ñ
(Ô
(€CÝ˜3œ=¨#¬-Ñ8Ô8Ð8r   Fc                 ó–  — |�"|| v sJ d                      || ¦  «        ¦   «         ‚|�|| v s
J d¦   «         ‚i }|                     | ¦  «        }t          |¦  «        }	|€|	d         }|€8|                     ||¦  «        }
|
t          hk    rt          ¦   «         ‚|	d         }|	|	                     |¦  «        |	                     |¦  «        dz   …         }t          |¦  «        }|D �]ä}||         }t          |t          ¦  «        sJ d|z  ¦   «         ‚g }| 
                    |d         |f¦  «        |hk    r|                     |¦  «         nb|d         |v r(|                     ||d                  d         ¦  «         n0|                     |¦  «         |                     |d         ¦  «         t          |¦  «        dk    r±| 
                    |dd…         ¦  «        }|dd…         D ]r}||v rl| 
                    ||f¦  «        |hk    rŒ#||v r6||         d         }|d         |k    r||d<   ŒG|                     |¦  «         Œ]|                     |¦  «         Œst          |¦  «        dk    r|r�Œ�t          |¦  «        } |||¦  «        }||k    sJ d|z  ¦   «         ‚t          |t          ¦  «        sJ d	|z  ¦   «         ‚||f||<   �Œæ|S )
a  Create a simple rebase plan that replays history based
    on one revision being replayed on top of another.

    :param todo_set: A set of revisions to rebase. Only the revisions
        topologically between stop_revid and start_revid (inclusive) are
        rebased; other revisions are ignored (and references to them are
        preserved).
    :param start_revid: Id of revision at which to start replaying
    :param stop_revid: Id of revision until which to stop replaying
    :param onto_revid: Id of revision on top of which to replay
    :param graph: Graph object
    :param generate_revid: Function for generating new revision ids
    :param skip_full_merged: Skip revisions that merge already merged
                             revisions.

    :return: replace map
    Nz)invalid start revid({!r}), todo_set({!r})zinvalid stop_revidéÿÿÿÿr   r   znot tuple: %rzold and newrevid equal (%r)zparents not tuple: %r)ÚformatÚget_parent_mapr   Úfind_lcar   r	   Úindexr   rG   rb   ÚheadsÚappendÚlen)Útodo_setÚstart_revidÚ
stop_revidÚ
onto_revidÚgraphÚgenerate_revidÚskip_full_mergedr$   Ú
parent_mapÚorderÚlcaÚtodoÚheads_cacheÚoldrevidÚ
oldparentsÚparentsÚadditional_parentsÚ	oldparentÚ	newparentÚnewrevids                       r   Úgenerate_simple_planr‰   Ä   s2  € ð& Ð +°Ð"9Ð"9Ð"9Ø3×:Ò:¸;ÈÑQÔQñ #:Ô"9Ð"9àÐ ¨xÐ!7Ð!7Ð!7Ð9MÑ!7Ô!7Ð!7Ø€KØ×%Ò% hÑ/Ô/€JÝ�jÑ!Ô!€EØÐØ˜2”Yˆ
ØÐà�nŠn˜Z¨Ñ4Ô4ˆØ•=�/Ò!Ð!Ý#Ñ%Ô%Ð%Ø˜A”hˆØ�—’˜[Ñ)Ô)¨%¯+ª+°jÑ*AÔ*AÀAÑ*EÐEÔF€DÝ" 5Ñ)Ô)€Kð ð !4ñ !4ˆØ Ô)ˆ
Ý˜*¥eÑ,Ô,ÐJÐJ¨oÀ
Ñ.JÑJÔJÐJØˆà×Ò˜j¨œm¨ZÐ8Ñ9Ô9¸j¸\ÒIÐIØ�NŠN˜:Ñ&Ô&Ð&Ð&Ø˜Œ]˜kÐ)Ð)Ø�NŠN˜; z°!¤}Ô5°aÔ8Ñ9Ô9Ð9Ð9à�NŠN˜:Ñ&Ô&Ð&Ø�NŠN˜: aœ=Ñ)Ô)Ð)åˆz‰?Œ?˜QÒÐØ!,×!2Ò!2°:¸a¸b¸b´>Ñ!BÔ!BÐØ'¨¨¨œ^ð 2ð 2�	ØÐ 2Ð2Ð2Ø"×(Ò(¨)°ZÐ)@ÑAÔAÀjÀ\ÒQÐQØØ" kÐ1Ð1Ø$/°	Ô$:¸1Ô$=˜	Ø" 1œ:¨Ò3Ð3Ø)2˜G A™J˜Jà#ŸNšN¨9Ñ5Ô5Ð5Ð5àŸš yÑ1Ô1Ð1øÝ�7‰|Œ|˜qÒ Ð Ð%5Ð ÙÝ˜‘.”.ˆØ!�> (¨GÑ4Ô4ˆØ˜8Ò#Ð#Ð#Ð%BÀXÑ%MÑ#Ô#Ð#Ý˜'¥5Ñ)Ô)ÐLÐLÐ+BÀWÑ+LÑLÔLÐLØ!)¨7Ð 3ˆ�HÑÑØÐr   c           	      óx  ‡— i }g }i }i Š| D ]H\  }}||vrg ||<   |€Œ|‰|<   ||vrg ||<   |D ]&}	|	|vrg ||	<   ||	                               |¦  «         Œ'ŒI‰                     |                     t          ˆfd„|                     ¦   «         ¦  «        ¦  «        ¦  «         |                     ¦   «         D ]'\  }}
|
‰|
         f||<   |                      |¦  «         Œ(t          |¦  «        }t          ¦   «         }d}t          j	         
                    ¦   «         }	 t          |¦  «        dk    �rR|                     ¦   «         }|                     |¦  «         |dz  }|                     d||¦  «         ||         D ]ð}||v rŒ||v r||         d         }n‰|         }t          |t          ¦  «        sJ d|z  ¦   «         ‚||         d         |vrBt          |¦  «        }||         d         ||                     |¦  «        <   t          |¦  «        } ||t          |¦  «        ¦  «        t          |¦  «        f||<   ||         d         |k    r||= Œ×||vr|                      |¦  «         Œñt          |¦  «        dk    �°R|                     ¦   «          n# |                     ¦   «          w xY w|D ]	}||v r||= Œ
|S )a	  Create a rebase plan that replaces a bunch of revisions
    in a revision graph.

    :param ancestry: Ancestry to consider
    :param renames: Renames of revision
    :param graph: Graph object
    :param generate_revid: Function for creating new revision ids
    Nc                 ó   •— | ‰vS r4   r0   )Úxr}   s    €r   ú<lambda>z)generate_transpose_plan.<locals>.<lambda>(  s   ø€ ¸AÀZÐ<O€ r   r   r   zdetermining dependenciesz"Expected tuple of parents, got: %r)rt   Úupdaterp   ÚfilterÚvaluesÚitemsru   Úsetr   Ú
ui_factoryÚnested_progress_barÚpopÚaddrG   rb   Úlistrr   Úfinished)ÚancestryÚrenamesrz   r{   r$   r€   ÚchildrenÚrÚpsrT   ÚvÚtotalÚ	processedÚiÚpbÚcr„   r*   r}   s                     @r   Úgenerate_transpose_planr¤     s-  ø€ ð €KØ€DØ€HØ€JØð "ð "‰ˆˆ2Ø�HÐÐØˆH�Q‰KØˆ:ØØˆ
�1‰Ø�HÐÐØˆH�Q‰KØð 	"ð 	"ˆAØ˜Ð Ð Ø �˜‘Ø�QŒK×Ò˜qÑ!Ô!Ð!Ð!ð	"ð
 ×Ò�e×*Ò*­6Ð2OÐ2OÐ2OÐ2OÐQX×Q_ÒQ_ÑQaÔQaÑ+bÔ+bÑcÔcÑdÔdÐdð —’‘”ð ð ‰ˆˆ1Ø˜Z¨œ]Ð+ˆ�A‰Ø�Š�A‰Œˆˆå�‰IŒI€EÝ‘”€IØ	€AÝ	Œ×	*Ò	*Ñ	,Ô	,€BðÝ�$‰iŒi˜!Šm‰mØ—’‘
”
ˆAØ�MŠM˜!ÑÔÐØ�‰FˆAØ�IŠIÐ0°!°UÑ;Ô;Ð;à˜a”[ð #ð #�Ø˜�<�<ØØ˜Ð#Ð#Ø)¨!œn¨QÔ/�G�Gà(¨œm�GÝ! '­5Ñ1Ô1ð Cð CØ8¸7ÑBñCô Cð Cð # 1”~ aÔ(¨GÐ3Ð3Ý" 7™mœm�GØ0;¸A´¸qÔ0A�G˜GŸMšM¨!Ñ,Ô,Ñ-Ý# G™nœn�GØ"0 .°µE¸'±N´NÑ"CÔ"CÝ"'¨¡.¤.ð"2�˜A‘à˜q”> !Ô$¨Ò)Ð)Ø# A˜˜Ø˜iÐ'Ð'Ø—K’K ‘N”N�Nøõ3 �$‰iŒi˜!Šm‰mð6 	�Š‰Œˆˆøˆ�Š‰Œˆˆøøøð ð #ð #ˆØ�KÐÐØ˜EÐ"øàÐs   ÄE&J ÊJ+c              #   óº   K  — |                      ¦   «         D ]C\  }}t          |t          ¦  «        s
J d¦   «         ‚|                      |d         ¦  «        s|V — ŒDdS )z›Figure out what revisions still need to be rebased.

    :param repository: Repository that contains the revisions
    :param replace_map: Replace map
    zreplace map parents not tupler   N)r‘   rG   rb   Úhas_revision)rj   r$   r*   Ú
parent_idss       r   Úrebase_todor¨   Z  su   è è € ð )×.Ò.Ñ0Ô0ð ð ÑˆˆzÝ˜*¥eÑ,Ô,ÐMÐMÐ.MÑMÔMÐMØ×&Ò& z°!¤}Ñ5Ô5ð 	ØˆKˆKˆKøðð r   c                 óB  — |                       ¦   «         }t          |                     |                     ¦   «         ¦  «        ¦  «        }t          j                             ¦   «         }	 t          |¦  «        D ]y\  }}|                     d|t          |¦  «        ¦  «         ||         \  }}	t          |	t          ¦  «        sJ d|	z  ¦   «         ‚|                      |¦  «        rŒl ||||	¦  «         Œz	 |                     ¦   «          dS # |                     ¦   «          w xY w)zúRebase a working tree according to the specified map.

    :param repository: Repository that contains the revisions
    :param replace_map: Dictionary with revisions to (optionally) rewrite
    :param merge_fn: Function for replaying a revision
    zrebase revisionszExpected tuple for %rN)Ú	get_graphr—   Úiter_topo_orderÚkeysr   r“   r”   Ú	enumeraterŽ   ru   rG   rb   r¦   r˜   )
rj   r$   Úrevision_rewriterrz   r€   r¢   r¡   r*   rˆ   r\   s
             r   Úrebaser¯   f  s  € ð × Ò Ñ"Ô"€EÝ�×%Ò% k×&6Ò&6Ñ&8Ô&8Ñ9Ô9Ñ:Ô:€DÝ	Œ×	*Ò	*Ñ	,Ô	,€Bð
Ý! $™œð 	;ð 	;‰HˆAˆuØ�IŠIÐ(¨!­S°©Y¬YÑ7Ô7Ð7Ø%0°Ô%7Ñ"ˆX�zÝ˜j­%Ñ0Ô0ÐVÐVÐ2IÈJÑ2VÑVÔVÐVØ×&Ò& xÑ0Ô0ð àØÐ˜e X¨zÑ:Ô:Ð:Ð:ð	;ð 	�Š‰Œˆˆˆøˆ�Š‰Œˆˆøøøs   Á(B	D ÄDc              #   ó   K  — | D ]È}|j         d         �!|                     |j         d         ¦  «        }n|j         d         }|j         d         �!|                     |j         d         ¦  «        }n|j         d         }t          |                     |j        ¦  «        |j        |j        |j        ||f|j        |j        |j	        ¦  «        V — ŒÉd S )Nr   r   )
Ú	parent_idÚnew_idr   Úfile_idÚpathÚchanged_contentÚ	versionedÚnameÚkindÚ
executable)Úold_iter_changesÚmap_treeÚchangeÚ
old_parentÚ
new_parents        r   Úwrap_iter_changesr¿   ~  sâ   è è € Ø"ð ð ˆØÔ˜AÔÐ*Ø!Ÿš¨Ô)9¸!Ô)<Ñ=Ô=ˆJˆJàÔ)¨!Ô,ˆJØÔ˜AÔÐ*Ø!Ÿš¨Ô)9¸!Ô)<Ñ=Ô=ˆJˆJàÔ)¨!Ô,ˆJÝ!Ø�OŠO˜FœNÑ+Ô+¨V¬[ØÔ" FÔ$4Ø˜Ð$ f¤k°6´;ØÔñ	ô ð 	ð 	ð 	ð 	ðð r   c                   ó&   — e Zd ZdZdd„Zd„ Zd„ ZdS )ÚCommitBuilderRevisionRewriterzsRevision rewriter that use commit builder.

    :ivar repository: Repository in which the revision is present.
    Tc                 ó"   — || _         || _        d S r4   )rj   Úmap_ids)r   rj   rÃ   s      r   r8   z&CommitBuilderRevisionRewriter.__init__•  s   € Ø$ˆŒØˆŒˆˆr   c                 ó:   ‡ — t          ˆ fd„|D ¦   «         ¦  «        S )Nc                 óH   •— g | ]}‰j                              |¦  «        ¯|‘ŒS r0   )rj   r¦   )rS   rT   r   s     €r   rU   zHCommitBuilderRevisionRewriter._get_present_revisions.<locals>.<listcomp>š  s.   ø€ ÐKÐKÐK˜A¨4¬?×+GÒ+GÈÑ+JÔ+JÐK�aÐKÐKÐKr   )rb   )r   Úrevidss   ` r   Ú_get_present_revisionsz4CommitBuilderRevisionRewriter._get_present_revisions™  s&   ø€ ÝÐKÐKÐKÐK ÐKÑKÔKÑLÔLÐLr   c                 óD  — t          |t          ¦  «        sJ d|z  ¦   «         ‚t          d|||¦  «         | j                             |¦  «        }t          |j        ¦  «        }|                     d¦  «        |t          <   |  	                    |j
        ¦  «        }|  	                    |¦  «        }| j                             |¦  «        }| j        r't          | j        ||¦  «        }	t          ||	¦  «        }
n|}
	 |d         }n# t          $ r
 t           }Y nw xY w	 |d         }n# t          $ r
 t           }Y nw xY w| j                             |¦  «        }|                     |¦  «        }t%          ||
¦  «        }| j                             d||j        |j        |j        ||t/          j        ¦   «         ¬¦  «        }	 |                     |
||¦  «        D ]\  }}Œ|                     ¦   «          |                     |j        ¦  «        S #  |                     ¦   «          ‚ xY w)a#  Replay a commit by simply commiting the same snapshot with different
        parents.

        :param oldrevid: Revision id of the revision to copy.
        :param newrevid: Revision id of the revision to create.
        :param new_parents: Revision ids of the new parent revisions.
        z4CommitBuilderRevisionRewriter: Expected tuple for %rz*creating copy %r of %r with new parents %rúutf-8r   N)rE   r„   rh   ri   ÚtimezoneÚrevpropsÚrevision_idÚconfig_stack)rG   rb   r   rj   rg   ÚdictÚ
propertiesÚdecodeÚREVPROP_REBASE_OFrÇ   r§   Úrevision_treerÃ   r   r   Ú
IndexErrorr   Úiter_changesr¿   Úget_commit_builderrh   ri   rÊ   Ú_mod_configÚGlobalStackÚrecord_iter_changesÚfinish_inventoryÚcommitÚmessageÚabort)r   r‚   rˆ   Únew_parentsrZ   rË   Únonghost_oldparentsÚnonghost_newparentsÚoldtreeÚ
fileid_mapÚ
mappedtreeÚold_baseÚnew_baseÚold_base_treerº   rÔ   ÚbuilderÚrelpathÚfs_hashs                      r   Ú__call__z&CommitBuilderRevisionRewriter.__call__œ  sT  € õ ˜+¥uÑ-Ô-ÐsÐsÐ/eÐhsÑ/sÑsÔsÐsÝÐ;Ø˜ ;ñ	0ô 	0ð 	0à”×-Ò-¨hÑ7Ô7ˆå˜Ô)Ñ*Ô*ˆØ&.§o¢o°gÑ&>Ô&>ˆÕ"Ñ#ð #×9Ò9¸&Ô:KÑLÔLÐØ"×9Ò9¸+ÑFÔFÐØ”/×/Ò/°Ñ9Ô9ˆØŒ<ð 	!Ý%Ø”Ð!4Ø#ñ%ô %ˆJõ ! ¨*Ñ5Ô5ˆJˆJà ˆJð	%Ø*¨1Ô-ˆHˆHøÝð 	%ð 	%ð 	%Ý$ˆHˆHˆHð	%øøøð	%Ø" 1”~ˆHˆHøÝð 	%ð 	%ð 	%Ý$ˆHˆHˆHð	%øøøàœ×5Ò5°hÑ?Ô?ˆØ"×/Ò/°Ñ>Ô>ÐÝ(Ð)9¸:ÑFÔFˆØ”/×4Ò4Ø ¸Ô8HØÔ&°´Ø¨8Ý$Ô0Ñ2Ô2ð	 5ñ 4ô 4ˆð
	Ø&-×&AÒ&AØ ¨,ñ'8ô '8ð ð Ñ"�˜'àØ×$Ò$Ñ&Ô&Ð&Ø—>’> &¤.Ñ1Ô1Ð1øð	Ø�MŠM‰OŒOˆOØøøøs1   Ã:D ÄDÄDÄD$ Ä$D8Ä7D8Æ=A
H ÈHN)T)r-   r.   r/   Ú__doc__r8   rÇ   ré   r0   r   r   rÁ   rÁ   �  sS   € € € € € ðð ð
ð ð ð ðMð Mð Mð5ð 5ð 5ð 5ð 5r   rÁ   c                   ó(   — e Zd Zdd„Zd„ Zd„ Zd„ ZdS )ÚWorkingTreeRevisionRewriterNc                 ó€   — || _         | j         j        j                             ¦   «         | _        || _        || _        dS )zE
        :param wt: Working tree in which to do the replays.
        N)r5   rE   rj   rª   rz   ÚstateÚ
merge_type)r   r5   rî   rï   s       r   r8   z$WorkingTreeRevisionRewriter.__init__Ö  s7   € ð ˆŒØ”W”^Ô.×8Ò8Ñ:Ô:ˆŒ
ØˆŒ
Ø$ˆŒˆˆr   c           
      óâ  — | j         j        j        }| j        €	ddlm} |}n| j        }| j         j        j                             |¦  «        }t          | j         |d         g¦  «         | j                              | j          	                    ¦   «         ¦  «         
                    ¦   «         r
J d¦   «         ‚|                     |¦  «        }| j                             |¦  «         t          | j         j        | j         ¬¦  «        }	|	                     || j         j        ¦  «         |                      ||j        ||¦  «        }
t%          d|›d|›d	|
›d
|›�¦  «         |	                     |
| j         j        ¦  «         ||	_        |	                     ¦   «          |dd…         D ]}| j                              |¦  «         Œ|                      ||¦  «         | j                             d¦  «         dS )zÈReplay a commit in a working tree, with a different base.

        :param oldrevid: Old revision id
        :param newrevid: New revision id
        :param newparents: New parent revision ids
        Nr   )ÚMerge3Mergerr   zChanges in rev)Ú	this_treez
replaying z as z with base z and new parents r   )r5   rE   rj   rï   Úmergerñ   rg   Úcomplete_revertÚchanges_fromÚ
basis_treeÚhas_changedrÒ   rî   r(   r   Úset_other_revisionÚdetermine_baser§   r   Úset_base_revisionÚdo_mergeÚadd_pending_mergeÚcommit_rebase)r   r‚   rˆ   r\   rj   rñ   rï   rZ   rà   ÚmergerÚ
base_revidr‡   s               r   ré   z$WorkingTreeRevisionRewriter.__call__ß  së  € ð ”W”^Ô.ˆ
ØŒ?Ð"Ø-Ð-Ð-Ð-Ð-Ð-Ø%ˆJˆJàœˆJØ””Ô*×7Ò7¸ÑAÔAˆõ 	˜œ *¨Q¤- Ñ1Ô1Ð1Ø”7×'Ò'¨¬×(:Ò(:Ñ(<Ô(<Ñ=Ô=×IÒIÑKÔKÐ]Ð]ÐM]Ñ]Ô]Ð]à×*Ò*¨8Ñ4Ô4ˆØŒ
×%Ò% hÑ/Ô/Ð/Ý˜œœ°$´'Ð:Ñ:Ô:ˆØ×!Ò! (¨D¬G¬NÑ;Ô;Ð;Ø×(Ò(Ø�fÔ'¨°:ñ?ô ?ˆ
åˆØ��˜(˜(˜( J J J°
°
ð<ñ 	=ô 	=ð 	=à× Ò  ¨T¬W¬^Ñ<Ô<Ð<Ø&ˆÔØ�ŠÑÔÐØ# A B Bœð 	1ð 	1ˆIØŒG×%Ò% iÑ0Ô0Ð0Ð0Ø×Ò˜6 8Ñ,Ô,Ð,ØŒ
×%Ò% dÑ+Ô+Ð+Ð+Ð+r   c                 ó  — t          |¦  «        dk    rt          S t          |¦  «        dk    r|d         S t          |¦  «        dk    r|d         S 	  | j        j        |d         |d         gŽ S # t          $ r |d         cY S w xY w)aF  Determine the base for replaying a revision using merge.

        :param oldrevid: Revid of old revision.
        :param oldparents: List of old parents revids.
        :param newrevid: Revid of new revision.
        :param newparents: List of new parents revids.
        :return: Revision id of the new new revision.
        r   r   )ru   r   rz   Úfind_unique_lcar   )r   r‚   rƒ   rˆ   r\   s        r   rù   z*WorkingTreeRevisionRewriter.determine_base  s¦   € õ ˆz‰?Œ?˜aÒÐÝ Ð õ ˆz‰?Œ?˜aÒÐØ˜a”=Ð õ
 ˆz‰?Œ?˜aÒÐð ˜a”=Ð ð	!Ø-�4”:Ô-°
¸1´¸zÈ!¼}Ð/MÐNÐNøÝð 	!ð 	!ð 	!Ø˜a”=Ð Ð Ð ð	!øøøs   ÁA/ Á/BÂBc           	      ó   — |j         |k    sJ d|z  ¦   «         ‚t          |j        ¦  «        }|j                              d¦  «        |t          <   | j        j                             ¦   «                              ¦   «         }| 	                    ¦   «         }|j
        |k    r|j
        g|k    rd}n#|j
        |vr|                     |j
        ¦  «         d|v r|d= d|v r|d= | j                             |j        |j        |j        ||||¬¦  «         dS )z{Commit a rebase.

        :param oldrev: Revision info of new revision to commit.
        :param newrevid: New revision id.zInvalid revid %rrÉ   NÚauthorÚauthors)rÛ   ri   rÊ   rË   Úrev_idrh   r  )rÌ   rÎ   rÏ   rÐ   rÑ   r5   rE   Ú
get_configÚusernameÚget_apparent_authorsrh   rt   rÚ   rÛ   ri   rÊ   )r   rZ   rˆ   rË   rh   r  s         r   rý   z)WorkingTreeRevisionRewriter.commit_rebase!  s3  € ð
 Ô! XÒ-Ð-Ð-Ð/AÀHÑ/LÑ-Ô-Ð-Ý˜Ô)Ñ*Ô*ˆØ&,Ô&8×&?Ò&?ÀÑ&HÔ&HˆÕ"Ñ#Ø”G”N×-Ò-Ñ/Ô/×8Ò8Ñ:Ô:ˆ	Ø×-Ò-Ñ/Ô/ˆØÔ˜yÒ(Ð(ð Ô Ð! WÒ,Ð,Ø�øàÔ wÐ.Ð.Ø—’˜vÔ/Ñ0Ô0Ð0Ø�xÐÐØ˜Ð"Ø˜Ð Ð Ø˜Ð#ØŒ�ŠØ”N¨fÔ.>Ø”_¨xÀØ¨ð 	ñ 	2ô 	2ð 	2ð 	2ð 	2r   r4   )r-   r.   r/   r8   ré   rù   rý   r0   r   r   rì   rì   Ô  sV   € € € € € ð%ð %ð %ð %ð!,ð !,ð !,ðF!ð !ð !ð>2ð 2ð 2ð 2ð 2r   rì   c                 óò  — | j         j                             |d         ¦  «        }|                      |¦  «        }| j                              |d         ¦  «         |                      d„ |dd…         D ¦   «         ¦  «         |j        D ]s}|                      |j        d         ¦  «        }t          j
        |¦  «        r=t          j        |¦  «        rt          j        |¦  «         Œ_t          j        |¦  «         Œt|                      d|d¬¦  «         |                      |                      ¦   «         ¦  «                             ¦   «         r
J d¦   «         ‚|                      d„ |D ¦   «         ¦  «         dS )	zÚSimple helper that reverts to specified new parents and makes sure none
    of the extra files are left around.

    :param wt: Working tree to use for rebase
    :param newparents: New parents of the working tree
    r   c                 ó(   — g | ]}|t           k    ¯|‘ŒS r0   r   ©rS   rœ   s     r   rU   z#complete_revert.<locals>.<listcomp>G  s"   € ÐGÐGÐG˜Q°A½Ò4FÐ4F�qÐ4FÐ4FÐ4Fr   Nr   F)Úold_treeÚbackupszRev changedc                 ó(   — g | ]}|t           k    ¯|‘ŒS r0   r   r  s     r   rU   z#complete_revert.<locals>.<listcomp>Q  s"   € ÐCÐCÐC˜Q°µ]Ò0BÐ0B�qÐ0BÐ0BÐ0Br   )rE   rj   rÒ   rõ   Úgenerate_revision_historyÚset_parent_idsÚaddedÚabspathr´   r   ÚlexistsÚisdirÚrmtreeÚosÚunlinkÚrevertrö   r÷   )r5   r\   ÚnewtreeÚdeltar¼   Úabs_paths         r   rô   rô   =  s[  € ð ŒiÔ"×0Ò0°¸A´Ñ?Ô?€GØ�OŠO˜GÑ$Ô$€EØ„I×'Ò'¨
°1¬Ñ6Ô6Ð6Ø×ÒÐGÐG *¨R¨a¨R¤.ÐGÑGÔGÑHÔHÐHØ”+ð $ð $ˆØ—:’:˜fœk¨!œnÑ-Ô-ˆÝŒ?˜8Ñ$Ô$ð 	$ÝŒ}˜XÑ&Ô&ð $Ý”˜xÑ(Ô(Ð(Ð(å”	˜(Ñ#Ô#Ð#øØ‡I‚Iˆd˜W¨e€IÑ4Ô4Ð4Ø�Š˜rŸ}š}™œÑ/Ô/×;Ò;Ñ=Ô=ÐLÐL¸}ÑLÔLÐLØ×ÒÐCÐC *ÐCÑCÔCÑDÔDÐDÐDÐDr   c                   ó   — e Zd ZdZdZd„ ZdS )ÚReplaySnapshotErrorz(Raised when replaying a snapshot failed.z'Replaying the snapshot failed: %(msg)s.c                 ó<   — t          j        | ¦  «         || _        d S r4   )r   r8   Úmsg)r   r  s     r   r8   zReplaySnapshotError.__init__X  s   € ÝÔ˜$ÑÔÐØˆŒˆˆr   N)r-   r.   r/   rê   Ú_fmtr8   r0   r   r   r  r  T  s.   € € € € € Ø2Ð2Ø8€Dðð ð ð ð r   r  )F)1rê   r  Ú r   rÖ   r   Úerrorsr   r   r   r	   Úbzr.generate_idsr
   Úbzr.inventorytreer   rz   r   ró   r   Úrevisionr   Útracer   r7   r   Útsortr   r   Úmaptreer   r   r<   rM   rV   rÑ   r   r2   rD   r>   rl   r‰   r¤   r¨   r¯   r¿   rÁ   rì   rô   r  r0   r   r   ú<module>r)     sç  ðð" €à 	€	€	€	ðð ð ð ð ð ð ð ðð ð ð ð ð ð ð ð ð ð ð ð 0Ð /Ð /Ð /Ð /Ð /Ø 4Ð 4Ð 4Ð 4Ð 4Ð 4Ø %Ð %Ð %Ð %Ð %Ð %Ø Ð Ð Ð Ð Ð Ø %Ð %Ð %Ð %Ð %Ð %Ø Ð Ð Ð Ð Ð Ø #Ð #Ð #Ð #Ð #Ð #Ø Ð Ð Ð Ð Ð Ø Ð Ð Ð Ð Ð ðð ð ð ð ð ð ð ð
 %Ð Ø 0Ð ØÐ ØÐ ð(:ð (:ð (:ð (:ð (:ñ (:ô (:ð (:ðV0ð 0ð 0ð 0ð 0�;ñ 0ô 0ð 0ðfð ð ð -ð -ð -ð.	9ð 	9ð 	9ð ;@ðGð Gð Gð GðTIð Ið IðX	ð 	ð 	ðð ð ð0ð ð ð"Bð Bð Bð Bð Bñ Bô Bð BðJf2ð f2ð f2ð f2ð f2ñ f2ô f2ð f2ðREð Eð Eð.ð ð ð ð ˜(ñ ô ð ð ð r   