| Server IP : 80.87.202.40 / Your IP : 216.73.216.169 Web Server : Apache System : Linux rospirotorg.ru 5.14.0-539.el9.x86_64 #1 SMP PREEMPT_DYNAMIC Thu Dec 5 22:26:13 UTC 2024 x86_64 User : bitrix ( 600) PHP Version : 8.2.27 Disable Function : NONE MySQL : OFF | cURL : ON | WGET : ON | Perl : ON | Python : OFF | Sudo : ON | Pkexec : ON Directory : /lib64/python3.9/site-packages/hgext/__pycache__/ |
Upload File : |
a
�+�b�H � @ s~ d Z ddlmZ ddlZddlZddlmZ ddlmZm Z m
Z
ddl m Z ddl
mZmZmZmZmZmZmZmZmZmZmZmZm 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* dZ+d Z,h d
�Z-i Z.e!�/e.�Z/i Z0e!�1e0�Z1e1d d d
d� dZ2dd� Z3dd� Z4dd� Z5d�dd�Z6e!�7� Z7e7d�dd� �Z8e7d�d d � �Z9d d � Z:G d d!� d!e;�Z<e/d"d#d$g ed%�ed&�fd'd(g ed)�ed&�fd*d+g ed,�ed&�fd-d.d/ed0�ed&�fd/d1d
ed2�fd3d4d/ed5�ed6�fd7d8d
ed9�fd:d;d/ed<�ed=�fd>d?d
ed@�fd/dAd
edB�fdCdDd
edE�fdFdGd
edE�fdHdId/edJ�fd/dKd
edL�fdMdNd
edO�fdPdQd
edR�fd/dSd/edT�fgej= ej> ej? edU�e/j@dV�dWdX� �ZAdYdZ� ZBd�d[d\�ZCd]d^� ZDd_d`� ZEdadb� ZFdcdd� ZGdedf� ZHdgdh� ZIdidj� ZJdkdl� ZKdmdn� ZLdodp� ZMdqdr� ZNdsdt� ZOdudv� ZPdwdx� ZQdydz� ZRd{d|� ZSd}d~� ZTdd�� ZUd�d�d��ZVd�d�� ZWd�d�� ZXd�d�� ZYd�d�� ZZd�d�� Z[d�d�� Z\dS )�z�command to move sets of revisions to a different ancestor
This extension lets you rebase changesets in an existing Mercurial
repository.
For more information:
https://mercurial-scm.org/wiki/RebaseExtension
� )�absolute_importN)�_)�nullrev�short�wdirrev)�open)� bookmarks�cmdutil�commands�copies�destutil�
dirstateguard�error�
extensions�
logcmdutil�merge�
mergestate� mergeutil�obsolete�obsutil�patch�phases�pycompat� registrar�repair�revset�
revsetlang� rewriteutil�scmutil�smartset�state�util���s -1> s -3s -4s -2s -5� devel� rebase.force-in-memory-mergeF)�defaults ships-with-hg-corec C s dS )N� � r' r' r' �2/usr/lib64/python3.9/site-packages/hgext/rebase.py�_nothingtorebaseV s r) c C sD | � � �dd �}|d ur ||d< | � � �dd �}|d ur@||d< d S )N� sources intermediate-source)�extra�get)�ctxr+ �sr' r' r( �
_savegraftZ s r/ c C s | � � |d< d S )N� branch)�branch)r- r+ r' r' r( � _savebranchc s r2 c C s t j| d|d|d�S )zhsmall wrapper around destmerge to pass the right extra args
Please wrap destutil.destmerge instead.� rebaseF)�action� sourcesetZ onheadcheck� destspace)r Z destmerge)�repor5 r6 r' r' r( � _destrebaseg s �r8 s _destrebasec C s6 d }|d ur t �| t�| �|�}|t�t| |�g�@ S �N)r �getsetr Z fullreposet�basesetr8 )r7 �subset�xr5 r' r' r( �_revsetdestrebasew s r> s _destautoorphanrebasec C sp | � � }|�d�}t�| ||��� }|r0||v r8t�� S t�| |�}t |�dkrft
� t d�||f ��t�|�S )Ns
obsolete()r& s8 ambiguous automatic rebase: %r could end up on any of %r)
�
unfiltered�revsr r: �firstr r; r Zorphanpossibledestination�lenr �
StateErrorr )r7 r< r= �unfiZ obsoleted�src�destsr' r' r( �_revsetdestautoorphanrebase� s
��rG c C s t j| �� j| dd�S )z short description for a contextr3 )�command)r Zformat_changeset_summaryr7 �ui�r- r' r' r( �_ctxdesc� s �rK c @ s� e Zd ZdZd#dd�Zedd� �Zd$dd �Zd
d � Zd d
� Z dd� Z
dd� Z d%dd�Z dd� Z
dd� Zdd� Zd&dd �Zd d � Zd d � Zd'd!d"�ZdS )(�
rebaseruntimez2This class is a container for rebase runtime stateFNc C s |d u r i }d| _ d| _|| _|| _|| _d | _t| _i | _d | _ i | _
t � | _ |�
dd�| _t�|t�|��| _|�
dd �| _|�
d�}tg| _|r�|g| _|�dd�| _|�
dd�| _|�
dd�| _t� |jd �| _ i | _ t � | _ || _ || _!t"�#|d
�| _$d S ) NF�collapse�dateZextrafns rewrites
backup-bundleZkeepZ keepbranchesr3 � rebasestate)%�prepared�resume�_reporI �opts�
originalwdr �externalr �activebookmark�destmap�set�skippedr, � collapsefr Z
logmessager � byteskwargs� collapsemsgrN r/ �extrafns�
configbool�backupf�keepf�
keepbranchesfr Zskip_empty_successor�skipemptysuccessorf�&obsolete_with_successor_in_destination�%obsolete_with_successor_in_rebase_set�inmemory�dryrun�statemodZcmdstate�stateobj)�selfr7 rI re rf rS �er' r' r( �__init__� s>
�zrebaseruntime.__init__c C s | j r| j�� S | jS d S r9 )rP rR r? �ri r' r' r( r7 � s
zrebaseruntime.repoc C sV |r|j dd| jdd� n8| j�dd��}| �|� W d � n1 sH0 Y dS )z*Store the current status to allow recoveryrO )rO s plain)�location� wN)Zaddfilegenerator� _writestatusr7 �vfs)ri �tr�fr' r' r( � storestatus� s �zrebaseruntime.storestatusc C s | j }|jd u sJ �|�|| j �� d � |�d� |�|| j �� d � |�dt| j� � |�dt| j� � |�dt| j � � |�d| j
p�d � | j }t �
| j�D ]V\}}|| �� }|dkr�|| �� }nd| }||| �� }|�d|||f � q�|j�d� d S ) N�
s %d
� %s
� r � %ds %s:%s:%s
s rebase status stored
)r7 �
filtername�writerT �hexrU �intrZ r` ra rV rW r � iteritemsr rI �debug) ri rr r7 rW �d�v�oldrev�newrevZdestnoder' r' r( ro � s$
zrebaseruntime._writestatusc C s� | j �� s t�| jtd�� | �� }| jj�d� |d | _ |d | _
|d | _ |d | _ |d | _
|d | _|d | _|d
| _|d | _d S )
z"Restore a previously stored statusr3 s rebase status resumed
�
originalwd� destmap� state� skipped� collapse� keep� keepbranches� external� activebookmarkN)rh �existsr Zwrongtooltocontinuer7 r �_readrI r} rT rW r rY rZ r` ra rU rV )ri �datar' r' r( �
restorestatus s
zrebaseruntime.restorestatusc C sb d| _ | j}|jd u sJ �d d d td d d�}d }i }i }|�d�}t|�� �� �D �]N\}}|dkrv|| �� |d< qR|dkr�|r�|| �� }qR|dkr�|| �� |d< qR|d kr�t t
|��|d
< qR|d kr�t t
|��|d < qR|d
kr�t t
|��|d< qR|dk�r$t |�dk�rd|v �s$||d< qR|� d�} || d �� }
| d } | t
v �rRqRt | �dk�rr|| d �� } n|} | ||
< | tk�r�t||
< qR|| �� ||
< qR|d d u �r�t�td���||d< ||d< t� }
|d
�s,t|�� �}t|�� �D ]2\}}|tk�r ||v �r |
�|� |�|� �q�|
|d< |j�dd�dd� t|
�D ���pXd � |S ) NT)r� r� r� r� r� r� rO r r� r& � r� � r� � r� � r� � �Q � :r� s .hg/rebasestate is incompleter� r� r� s computed skipped revs: %s
� c s s | ]}d | V qdS �rw Nr' ��.0�rr' r' r( � <genexpr>[ rv z&rebaseruntime._read.<locals>.<genexpr>rv )rP r7 rx r rp � enumerate�read�
splitlines�rev�boolr{ rB �split� legacystates�
revtodostr�revtodor �Abortr rX �values�sorted�items�addrI r} �join)ri r7 r� Z
legacydestr rW rr �i�l�argsr� r� �destrevrY �seen�old�newr' r' r( r� sx �
"
��zrebaseruntime._readc s� � j r
dS � j�dd�s dS � fdd�� jD �}t� j|� j�\� _� _t � j�}|�
� j� t � j� j||� t �
� jt j�r�t � � _n6� j�d� j� j�D ] }� j�|d� � j�|d� q�dS )z<Compute structures necessary for skipping obsolete revisionsN� experimentals rebaseskipobsoletec s h | ]}� j | �� r|�qS r' )r7 r r� rl r' r( � <setcomp>f rv z8rebaseruntime._handleskippingobsolete.<locals>.<setcomp>s descendants(%ld) and not %ld)r` rI r^ r �_compute_obsolete_setsr7 rW rc rd rX �update�_checkobsrebaser � isenabled�allowdivergenceoptr@ �pop)ri Z obsoletesetZ
skippedsetr� r' rl r( �_handleskippingobsolete` s* �
�z%rebaseruntime._handleskippingobsoleteTc C s� d| _ z"| �� | �� t| j|�| _W nb tjy� |rht| j� t | j� | jj
� t d�� Y dS t d�}t d�}tj
||d��Y n0 |r�|o�| j}| j||||d�S d S )NTsF rebase aborted (no revision is removed, only broken state is cleared)
r s# cannot continue inconsistent rebases- use "hg rebase --abort" to clear broken state��hint)�backup� suppwarnsrf �confirm)rQ r� r� �restorecollapsemsgr7 r\ r �RepoLookupError� clearstatus�clearcollapsemsgrI �warnr r� r_ �_abort)ri �isabortr� r� rf r� �msgr� r' r' r( �_prepareabortorcontinuey s4
��
�z%rebaseruntime._prepareabortorcontinuec
C s� |s
t � S t| j|| j�}|s4| j�td�� t � S |\| _| _| _ | jr�t
| j� � �}t |�dkrrt
�td���tt|��}| jjj|gdd�}t| j| j |�| _tt
|� � ��D ]0}| j| }|�� r�| js�| j�td�| � q�| �� | j�s�t
|�� �}|t
| j�8 }|| j 8 }i }t � | jt j ��r8ddi}zD| j� |��" t!j"| j|d d
� W d � n1 �sp0 Y W nB t
j#�y� } z&| j$d u �r�td �| _$| �W Y d } ~ n
d } ~ 0 0 d| _%d S ) N� nothing to rebase
r& s3 --collapse does not work with multiple destinationsT)Z inclusives reopening closed branch head %s
)r� s evolution.allowdivergences truer3 )r4 s& use --keep to keep original changesets)&r) �
buildstater7 rZ rI �statusr rT rW r rX r� rB r �
InputError�next�iter� changelogZ ancestors�externalparentrU r� Z closesbranchra r� r` �keysrc rd r r� �createmarkersopt�configoverrider Zprecheckr� r� rP )
ri rW �resultrF r� �
destancestors�dest� rebaseset� overridesrj r' r' r( �_preparenewrebase� sN � �
�6
z rebaseruntime._preparenewrebasec C sf | j r.ddlm} || j�| _| jj�d� n| jd | _| jj�d� | jjjdd| j | j d� d S )Nr )�overlayworkingctxs rebasing in memory
s rebasing on disk
r3 s using in-memory rebase: %r
)Zrebase_imm_used)re Zmercurial.contextr� r7 �wctxrI r} �log)ri r� r' r' r( �_assignworkingcopy� s �z rebaseruntime._assignworkingcopyc
s4 | � � | j| j }}| jrn| j�dt� | jrnt� }| j D ]0}|�
|| � � � t |�dkr<t
�td���q<| jpx|j| _| jr�t�|� | �� |r�| �|� dd� t�| j �D �}|jjtd�td�t |�d�� � fd d
�}t| j�D ],}| j�d |�} | D ]}| �|||� �qq� � � |� td �� d S )
Nr r& s' cannot collapse multiple named branchesc S s g | ]\}}|t kr|�qS r' )r� )r� �kr r' r' r( �
<listcomp>� rv z0rebaseruntime._performrebase.<locals>.<listcomp>s rebasings
changesets)Zunit�totalc s � j d| �� | f d� d S )N� %d:%s)�item)Z incrementr� rJ ��pr' r( �progress s z.rebaseruntime._performrebase.<locals>.progresss sort(%ld, -topo)s rebase merging completed
) r� r7 rI ra r] �insertr2 rZ rX r r� r1 rB r r� r rV Z_activebookmarkr Z
deactivaters r r| Z makeprogress�
sortsourcerW r@ � _rebasenodeZcomplete�note)
ri rq r7 rI Zbranchesr� Zcandsr� r< Z
sortedrevsr' r� r( �_performrebase� s:
�
� z rebaseruntime._performrebasec
s | j }|| }|du r |�� }| jsL|j� t�||� fdd�| j�� D ��}| j}|du rb|�� }d|� � i}| j
D ]}|||� qtt |� � t
j�} | | j d�}
|j�|
d��P | jr�t|| j||||�� |d�} nt|||||�� |d�} | W d � S 1 �s0 Y dS ) z�Commit the wd changes with parents p1 and p2.
Reuse commit info from rev but also store useful information in extra.
Return node of committed revision.Nc s, i | ]$\}}|t kr� �|�� �|�g�qS r' )r� �node)r� r� r� ��clr' r( �
<dictcomp> s �z/rebaseruntime._concludenode.<locals>.<dictcomp>s
rebase_source))s phasess
new-commit)� ui� allowemptycommitr3 )r� r+ � commitmsg�editor�userrN )r+ r� r� r� rN )r7 � descriptionrZ r� r Zupdate_hash_refsr r� rN rz r] �maxZphaser Zdraftrb rI r� re �commitmemorynoder� r� �
commitnode) ri r� r� r� r7 r- rN r+ �cZ destphaser� �newnoder' r� r( �
_concludenode sV
��
��
� zrebaseruntime._concludenodec
C s� | j | j| j }}}|| }t|�}| j| |krJ|�td�| � �nX|| jv r|td�| } |j�| � | j� |� �n&|| j
v �r| j
| }
|
d u r�td�| } n t||
�} td�|| f } |j�| � | j� |� t t ||| j
| j| j��} | | j|< �n�| j| tk�r�|�td�| � ||� t||| j
| j| j| j
�\}
}}| j�r�| j�� �� |
k�r�|j�d� d| _�nd|�d d
�i}|�|d ��� z t|||
||| j| jd � W n� tj�yp | j�r�t� d ��| j�r� |�td
�� zt � |� W n( tj �y. t |� t!|� � Y n0 d| _"| �#� t$j%||
| jd� t|||
||| j| jd � Y n0 W d � n1 �s�0 Y | j�s�|t&k}t �'|d �}t j(f d|i|��}| j�)||
�*� || �*� � | �+||�}nd }|d u�rB|| �� | j|< |�dt,|� � || �-� �r�|�.td�| � n>| j�sh|�.td�| � | j� |� |
| j|< |�d|
� n |�td�||| j| f � |�s�| �/� d S )Ns already rebased %s
sI note: not rebasing %s and its descendants as this would cause divergence
s+ note: not rebasing %s, it has no successor
s4 note: not rebasing %s, already in destination as %s
s rebasing %s
s resuming interrupted rebase
F)r� s
forcemerge�toolrv r3 )r� sD hit merge conflicts; rebasing that commit again in the working copy
)�wc�editforms rebased as %s
sR note: created empty successor for %s, its destination already has all its changes
sC note: not rebasing %s, its destination already has all its changes
s next revision set to %d
s already rebased %s as %s
)0r7 rI rS rK r r� r rd rY r� rc r� �
adjustdestrW r� �
defineparentsrQ r� �p1r� r} r, r� �
rebasenoderZ r �InMemoryMergeConflictsErrorrf �ConflictResolutionRequiredr �
bailifchangedr� r� r� re r� �mergemodr� r Z
mergeeditform�getcommiteditor�
setparentsr� r� r �isemptyr� rs )ri rq r� Z
progressfnr7 rI rS r- Zdescr� ZsuccZsuccdescr� r �p2�baser� Zmergingr� r� r� r' r' r( r� F s�
���
�� ��
�
���,
������
�zrebaseruntime._rebasenodec C s� | j | j| j }}}|�dt�|��}|�� | j�r&t|t | j
�| j | j
| j | j
�\}}}|�d�}d} | jrz| j}
n6d}
t| j
�D ]"} | | j vr�|
d|| �� 7 }
q�d}tj|| d�} t| j
�}
| j�|| �� || j �� � | j|
| |
d�}|d u�r&|| �� }| j
D ]}|| j
|< �qd |�� v �rLt || j
| j fi |�� | j
�| j | j �}|d
k �rn| j }|d d � |d � � D �v�r�|� t d
�� t!�"|| � d }| j�r�| j#�s�|}t$||| j | j
| j || j#|| j%d� t&|� t'|� |� t d�� t(j)|�*d�dd� | j �r8t+| j �}|� t d�| � |�,� | j-�r~| j-|j.v �r~|d �� |j.| j- k�r~t/�0|| j-� d S )Nr3 �edits rebase.collapses Collapsed revisions
* %sT)r r� )r� � qtipr c S s g | ] }|� � �qS r' �r� �r� r� r' r' r( r� rv z/rebaseruntime._finishrebase.<locals>.<listcomp>s0 update back to initial working directory parent
)�fmr� s rebase completed
s undo�Z
ignoremissings %d revisions have been skipped
� .)1r7 rI rS � formatterr r[ Z startitemrZ r� �minr rW rY rc r, r\ r� r� r r r� r� r r� rU r� r� �tags�updatemqrT �parentsr� r r r� r` � clearrebasedr_ r� r� r! �
unlinkpathZsjoinrB �endrV �
_bookmarksr �activate)ri r7 rI rS r r r Z_baseZeditoptr� r� �rebasedr� Z
revtoreuser� r� r� Znewwd� collapsedasZ
skippedlenr' r' r( �
_finishrebase� s� �
�
�
�
��zrebaseruntime._finishrebasec
s� �j � �zz�fdd��j�� D �}� fdd�|D �}d}|rp� jjtd�d�� fdd�|D �� td �d
� d }t� }|r�t� j� |��}|t|� r�� j�td �� d }|�r6|r�d
d� � �d|�D �} t|�}
|
�
�j � � � |s�|s�|
�
�j� � d �� |
v } | �r t�� �j � |�r6tj� j� | |d� �j�rZ�j� jv �rZt�� �j� W t� � t� � |�s�� j�td�� n(t� � t� � |�s�� j�td�� 0 dS )z-Restore the repository to its original state.c s2 g | ]*\}}|d kr||kr|� j | kr|�qS �r �rW )r� r� r. rl r' r( r� . s �z(rebaseruntime._abort.<locals>.<listcomp>c s g | ]}� | � � s|�qS r' )Zmutable)r� r~ �r7 r' r( r� 3 rv Ts- warning: can't clean up public changesets %s
� , c 3 s | ]}t � | �V qd S r9 ��bytesr� r! r' r( r� 8 rv z'rebaseruntime._abort.<locals>.<genexpr>s see 'hg help phases' for detailsr� FsD warning: new changesets detected on destination branch, can't strip
c S s g | ] }|� � �qS r' )r� r r' r' r( r� K s �
roots(%ld)r �r� s rebase aborted
r )r7 r r� rI r� r r� rX r� � descendantsr� rW r� r� rT r� r � clean_updater �striprV r r r r� r� ) ri r� r� rf r� r Z immutableZcleanupr' Z strippointsZupdateifonnodesZ shouldupdater' )r7 ri r( r� % sd
��� ��
� �zrebaseruntime._abort)FFN)N)TFFF)N)TFFF)�__name__�
__module__� __qualname__�__doc__rk �propertyr7 rs ro r� r� r� r� r� r� r� r� r� r r� r' r' r' r( rL � s&
1
M �
"4-
: QrL r3 � sr* s5 rebase the specified changesets and their descendantss REV� bs bases= rebase everything from branching point of specified changeset� rs revs rebase these revisions� d� destrv s# rebase onto the specified changesetr� s collapse the rebased changesets� ms messages# use text as collapse commit messages TEXT� es edits invoke editor on commit messages� ls logfiles& read collapse commit message from files FILE� kr� s keep original changesetsr� s keep original branch names� Ds detachs (DEPRECATED)� is interactive� t� tools specify merge tools stops stop interrupted rebase� cs continues continue an interrupted rebase� as aborts abort an interrupted rebases auto-orphanssL automatically rebase orphan revisions in the specified revset (EXPERIMENTAL)s> [[-s REV]... | [-b REV]... | [-r REV]...] [-d REV] [OPTION]...)Z helpcategoryc
K s� | � dd�}t�|ddd�}|rDt�||ddg� t�||g d�� t�|dd� t�|d d
d � |sr|�� d urvd
}|�d�r�t|�dh }t�|d|� t|�|�d���}t �
d|�g|d < d|d< |�d�s�|�d�r�t | |||�S |dk�r�t || �}|�
� �� |�� �� |�� |j�r2t�td���t�|tj�}|j�sd|�sdtjtd�td�d��t�||j � |�� W d � W d � dS 1 �s�0 Y W d � n1 �s�0 Y n�|�rzzNddi} | � | d��$ t | ||||d�W d � W S 1 �s0 Y W nV tj �yv | � dd��rB� | � td �� t |� t!|� t | |||d
d� Y S 0 nt | |||�S d S ) au move changeset (and descendants) to a different branch
Rebase uses repeated merging to graft changesets from one part of
history (the source) onto another (the destination). This can be
useful for linearizing *local* changes relative to a master
development tree.
Published commits cannot be rebased (see :hg:`help phases`).
To copy commits, see :hg:`help graft`.
If you don't specify a destination changeset (``-d/--dest``), rebase
will use the same logic as :hg:`merge` to pick a destination. if
the current branch contains exactly one other head, the other head
is merged with by default. Otherwise, an explicit revision with
which to merge with must be provided. (destination changeset is not
modified by rebasing, but new changesets are added as its
descendants.)
Here are the ways to select changesets:
1. Explicitly select them using ``--rev``.
2. Use ``--source`` to select a root changeset and include all of its
descendants.
3. Use ``--base`` to select a changeset; rebase will find ancestors
and their descendants which are not also ancestors of the destination.
4. If you do not specify any of ``--rev``, ``--source``, or ``--base``,
rebase will use ``--base .`` as above.
If ``--source`` or ``--rev`` is used, special names ``SRC`` and ``ALLSRC``
can be used in ``--dest``. Destination would be calculated per source
revision with ``SRC`` substituted by that single source revision and
``ALLSRC`` substituted by all source revisions.
Rebase will destroy original changesets unless you use ``--keep``.
It will also move your bookmarks (even if you do).
Some changesets may be dropped if they do not contribute changes
(e.g. merges from the destination branch).
Unlike ``merge``, rebase will do nothing if you are at the branch tip of
a named branch with two heads. You will need to explicitly specify source
and/or destination.
If you need to use a tool to automate merge/conflict decisions, you
can specify one with ``--tool``, see :hg:`help merge-tools`.
As a caveat: the tool will not be used to mediate when a file was
deleted, there is no hook presently available for this.
If a rebase is interrupted to manually resolve a conflict, it can be
continued with --continue/-c, aborted with --abort/-a, or stopped with
--stop.
.. container:: verbose
Examples:
- move "local changes" (current commit back to branching point)
to the current branch tip after a pull::
hg rebase
- move a single changeset to the stable branch::
hg rebase -r 5f493448 -d stable
- splice a commit and all its descendants onto another part of history::
hg rebase --source c0c3 --dest 4cf9
- rebase everything on a branch marked by a bookmark onto the
default branch::
hg rebase --base myfeature --dest default
- collapse a sequence of changes into a single commit::
hg rebase --collapse -r 1520:1525 -d .
- move a named branch while preserving its name::
hg rebase -r "branch(featureX)" -d 1.3 --keepbranches
- stabilize orphaned changesets so history looks linear::
hg rebase -r 'orphan()-obsolete()' -d 'first(max((successors(max(roots(ALLSRC) & ::SRC)^)-obsolete())::) + max(::((roots(ALLSRC) & ::SRC)^)-obsolete()))'
Configuration Options:
You can make rebase require a destination if you set the following config
option::
[commands]
rebase.requiredest = True
By default, rebase will close the transaction after each commit. For
performance purposes, you can configure rebase to use a single transaction
across the entire rebase. WARNING: This setting introduces a significant
risk of losing the work you've done in a rebase if the rebase aborts
unexpectedly::
[rebase]
singletransaction = True
By default, rebase writes to the working copy, but you can configure it to
run in-memory for better performance. When the rebase is not moving the
parent(s) of the working copy (AKA the "currently checked out changesets"),
this may also allow it to run even if the working copy is dirty::
[rebase]
experimental.inmemory = True
Return Values:
Returns 0 on success, 1 if nothing to rebase or there are
unresolved conflicts.
r3 s experimental.inmemory�abort�stop�continuer� �dry_run)r� �sourcer
r� r� rB r
NFZ auto_orphanss %ld and orphan()s _destautoorphanrebase(SRC)r� s! cannot stop in --collapse sessions< cannot remove original changesets with unrebased descendantss^ either enable obsmarkers to allow unstable revisions or use --keep to keep original changesetsr� r �r3 � singletransactionT)re r# r$ s? hit merge conflicts; re-running rebase without in-memory merge
)"r^ r Zcheck_at_most_one_argZ check_incompatible_arguments�currenttransactionr, rX �listr@ r �
formatspec�
_dryrunrebaserL �wlock�lockr� rZ r rC r r r� Zallowunstableoptr` r r( rT r r� � _dorebaser r� r� r� )
rI r7 rS re r4 Zdisallowed_optsZuserrevs�rbsrtZ
allowunstabler� r' r' r( �rebasej sx =
�
�
�
���
P8��rM c C s� t || dd|d�}|�d�}|r0| �td�� n| �td�� |�� ��4 |�� �� d}�z�z�ddi}| �|d��| t| ||||�}|t� kr�d}|W d � W W |r�|j ddd|�d �d
� W d � W d � S W d � n1 s�0 Y W nx t
j �y` | �td �� Y W |�rD|j ddd|�d �d
� W d � W d � d S t
j �yz d}� Y n�0 |�r�| �td
�� | �
td���s�|�� n|j ddd|d� d}n| �td�� W |�r�|j ddd|�d �d
� W d � W d � dS W |�rN|j ddd|�d �d
� n |�rL|j ddd|�d �d
� 0 W d � n1 �sd0 Y W d � n1 �s�0 Y d S )NT)re rf rS r� s starting in-memory rebase
s8 starting dry-run rebase; repository will not be changed
rC r3 FrA )r� r� r� rf s hit a merge conflict
r& s rebase completed successfully
s! apply changes (yn)?$$ &Yes $$ &No)r� r� r� r� sW dry-run rebase completed successfully; run without -n/--dry-run to perform this rebase
r )rL r, r� r rI rJ r� � _origrebaser) r� r r r� Z promptchoicer ) rI r7 r4 rS rL r� Z
needsabortr� �resr' r' r( rH s s�
��
��@��
����� ���rH c C s t || ||d�}t| ||||�S )N)rS )rL rN )rI r7 r4 rS re rL r' r' r( rK � s rK c
C s� |dks J �|� � ��r |�� ��F |�d�rvzt�d�r>d}W n tyV d}Y n0 d| }td�| }t�|��|j r�|j
s�t�td���|�r&|j
r�t�td ���|d
kr�|�d d �r�| � td
�� |dkr�t j
�|�}t�|� |j|d
kd�} | d u�r�| W d � W d � S n�|�d�}
t| ||j|�dd �|�dg �|�dg �|�dg �|
d�} |�| �} | d u�r�| W d � W d � S t||j � d } | �dd�}
|
�r�|�d�} t�| ��t d }|
�r�|j�s�t�|d�}t�|��* |�| � |j �s|� � W d � n1 �s00 Y W d � n1 �sP0 Y W d � n1 �sp0 Y W d � n1 �s�0 Y d S )Nr? � interactives histeditrv s --config extensions.histedit=s hg%s help -e histeditsO interactive history editing is supported by the 'histedit' extension (see "%s")s+ message can only be specified with collapses* cannot use collapse with continue or abortr> r� Fs tool option will be ignored
r@ �r� �
_destspacer� rB r
r� �r6 r3 rD ) rI rJ r, r �find�KeyErrorr r r� r\ rZ r� �
mergestatemodr r� r �checkunresolvedr� �_definedestmapre r� �storecollapsemsgr^ Z transactionr! Zacceptinterventionr
r� rf r )rI r7 r4 rS rL Zenablehistedit�helpr� �ms�retcoder6 rW rq Zsingletr�dsguardr' r' r( rN � sx
���
��
"
�
rN c s� |du r g }t ��� |s$t ��� | �dd�rJ|sJtjtd�td�d��d}|rxt��|�} | st| � td�� dS �n�|r�t��|�}
|
s�| � td�� dS ��
d |
|
�} �n�t��|p�d
g�} | s�| � td �� dS |r�t� �|�}n�t �| |d � }t
|�}g } i }
| D ]2}��
d
||�� ��� }|
�|g �|g |
|< �qd|
v �rV|
�� t�|
�D ] \}}| t��
d||��7 } �q`��
d| �} | �sZt| �|�� gk�r�|�r�| � td�| � n| � td�� n���
d| |�� ��s,|�r| � td�d��fdd�| D ��|f � n| � td�| � n*| � td�d��fdd�| D ��|f � dS t| v �rrt�td����d
�� | v }| jdd ||d � |�r�|�r�t ��� t ��� |�sԈt �| |d � }t
|�}t�d | �}d |i}|du �r�ztj �||d �}W n� tj�y� i }| D ]�}t�d!|�|d"< �j |gd#|d$�}t |�}|d%k�rf|�� ||< n8|d&k�r�| � td'��| � nt�td(��| ���q Y n0 |du�r�|�� � � fd)d*�| D �}|�s�| � td+�� dS |S ),z:use revisions argument to define destmap {srcrev: destrev}N� commands� rebase.requiredests you must specify a destinations use: hg rebase -d REVr� s- empty "rev" revision set - nothing to rebase
s0 empty "source" revision set - nothing to rebase
s (%ld):: + (%ld)r s5 empty "base" revision set - can't compute rebase set
rS s ancestor(%d, %d)s children(%d) & ancestors(%ld)s %ld::s6 nothing to rebase - %s is both "base" and destination
sA nothing to rebase - working directory parent is also destination
s
%ld - ::%dsG nothing to rebase - "base" %s is already an ancestor of destination %s
� +c 3 s | ]}t � | �V qd S r9 r# r� r! r' r( r� ] rv z!_definedestmap.<locals>.<genexpr>sV nothing to rebase - working directory parent is already an ancestor of destination %s
s nothing to rebase from %s to %s
c 3 s | ]}t � | �V qd S r9 r# r� r! r' r( r� k rv s cannot rebase the working copyr3 s! rebasing working copy parent: %r
)Zrebase_rebasing_wcps %lds ALLSRC)�
localaliasrw s SRCT)r� ra r& r s skipping %s - empty destination
s' rebase destination for %s is not uniquec s i | ]
}|� �qS r' r' r� )r� r' r( r� � rv z"_definedestmap.<locals>.<dictcomp>s& nothing to rebase - empty destination
) r �checkunfinishedr r^ r r� r r Zrevranger� r@ Z revsingler8 r$ r� rA r, �clearr r| rF r� r r� r rG r r� ZanyrevsrB r� )rI r7 re ZdestfZsrcfZbasefZrevfr6 r� r� rE r
�rootsZbpbase�bZbp�bsZ rebasingwcpZallsrc�aliasrW r� Zdestset�sizer' )r� r7 r( rX s�
� �
�������� ��� ��
�
�
rX c C s� t � }t|�}|D ]F}||kr q| | �� D ]*}|�� |vr,|�� |vr,|�|�� � q,q|sbtS t|�dkrv|�� S t� t
d�t |�d� dd� t
|�D ��f ��dS )z�Return the revision that should be used as the second parent
when the revisions in state is collapsed on top of destancestors.
Abort if there is more than one parent.
r& sK unable to collapse on top of %d, there is more than one external parent: %sr" c s s | ]}d | V qdS r� r' �r� r� r' r' r( r� � rv z!externalparent.<locals>.<genexpr>N)rX r r r� r� r rB r� r rC r r� r� r� )r7 r r� r rB r� r� r' r' r( r� � s& � ��r� c
C sb d}d|v r|d }|� � |j||||||d�}|�� rL| j�dd�sLdS | �|�} |�� | S )zXCommit the memory changes with parents p1 and p2.
Return node of committed revision.Nr0 )rN r+ r� r1 r� r� r� )Z_compactZtomemctxr rI r^ Z commitctxZclean)
r7 r� r� r+ r� rN r� r1 ZmemctxZ commitresr' r' r( r� � s" �
r� c C sv t �� }| j�dd�s"t�| d�}|�< | j|||||d�}| j�| | �� � |W d � S 1 sh0 Y dS )zTCommit the wd changes with parents p1 and p2.
Return node of committed revision.r3 rD )�textr� rN r+ r� N) r! ZnullcontextmanagerrI r^ r
Zcommit�dirstateZ setbranchr1 )r7 r� r+ r� rN r� r] r� r' r' r( r� � s
�r� c
C sN | | }|� � r |�|� nT| d �� |krL| j�d||f � t�|� n | j�d� | d }| j�| � � � | | }| j�d||f � |dur�| j�d|| | f � | j
� |� � |� � �} tj
| |dd|| g d�|d �}
|�|� � | | � � � |�rt�|||� nt�|||�� � |
jd
k�rJ|� � �r@t�� �n
t�d ��dS ) zFRebase a single revision rev on top of p1 using base as merge ancestorr s update to %d:%s
s already in destination
Ns merge against %d:%s
s detach base %d:%s
T)r3 r* s parent of source)Z branchmerge�force�ancestor�
mergeancestor�labelsr� r r3 )Z
isinmemoryZsetbaser� rI r} r r( rk ry rE r� �
isancestorr� Z_updater r Z graftcopiesr Zunresolvedcountr r r ) r7 r� r r r
rM r� Zp1ctxr- rn Zstatsr' r' r( r � s@ �
r c
s� �| � � ��fdd�|� � D �}g }| j�|�D ]j}� }|tkrd| �d||��� } | durd|| }|� kr�� |v r�|� }|tkr�t�d� ��|� |� q2|S )a� adjust rebase destination given the current rebase state
rev is what is being rebased. Return a list of two revs, which are the
adjusted destinations for rev's p1 and p2, respectively. If a parent is
nullrev, return dest without adjustment for it.
For example, when doing rebasing B+E to F, C to G, rebase will first move B
to B1, and E's destination will be adjusted from F to B1.
B1 <- written during rebasing B
|
F <- original destination of B, E
|
| E <- rev, which is being rebased
| |
| D <- prev, one parent of rev being checked
| |
| x <- skipped, ex. no successor or successor in (::dest)
| |
| C <- rebased as C', different destination
| |
| B <- rebased as B1 C'
|/ |
A G <- destination of C, different
Another example about merge changeset, rebase -r C+G+H -d K, rebase will
first move C to C1, G to G1, and when it's checking H, the adjusted
destinations will be [C1, G1].
H C1 G1
/| | /
F G |/
K | | -> K
| C D |
| |/ |
| B | ...
|/ |/
A A
Besides, adjust dest according to existing rebase information. For example,
B C D B needs to be rebased on top of C, C needs to be rebased on top
\|/ of D. We will rebase C first.
A
C' After rebasing C, when considering B's destination, use C'
| instead of the original C.
B D
\ /
A
c s0 g | ](\}}|d kr�| � kr|�vr|�qS r r' )r� r. r~ �r� rW rY r' r( r� T s �z adjustdest.<locals>.<listcomp>s max(%ld and (::%d))Ns- rev %d should be rebased already at this time)
r� r� �
parentrevsr r@ rA r� r ZProgrammingError�append)
r7 r� rW r rY rB r� �prevZadjusted� candidater' rq r( r� s& 5�� r� c s^ t �� t j�}|| }|rZ|sZ� fdd�|D �}td�}td�}tj|d�|�f |d��dS )a
Abort if rebase will create divergence or rebase is noop because of markers
`rebaseobsrevs`: set of obsolete revision in source
`rebaseobsskipped`: set of revisions from source skipped because they have
successors in destination or no non-obsolete successor.
c 3 s | ]}t � | �V qd S r9 r# r� r! r' r( r� y rv z"_checkobsrebase.<locals>.<genexpr>s+ this rebase will cause divergences from: %ssJ to force the rebase please set experimental.evolution.allowdivergence=True� ,r� N)r r� r� r r rC r� ) r7 rI �
rebaseobsrevsZrebaseobsskippedZ divergenceokZdivergencebasecandidatesZ divhashesr� �hr' r! r( r� l s �r� c c sP | j du sJ �| jjj}t�| j| | �� g�D ]}||�}|dur0|V q0dS )z,yield revision numbers for successors of revN)rx r� �index�get_revr �
allsuccessors�obsstorer� )rD r� rz r. r� r' r' r( �
successorrevs� s
r} c s� �j du sJ ��j� � j�|� }�j���}ttg�t��|||��t|�}tdd� |dd� D ��rx�d �d< �nPt|�D ]�\�} | }
t ���fdd�t
�| �D ��r��� }
n | |v r�|| dkr�|| }
t�d�� �D ]T\} } | tkr�q�|
| ��rt}
q�| |
�r�|
�| < t}
|� || || < |�< q�|
��< q��d tk�r�|d �d k�r�t ��dk�r~t |�dk�s�J ��� � |� � t
��t
|�k�r�|�v�r�t�td���� f ��t ��fd d��D ���r�t�td
���t�fd d�t
|�D ��dk�rhddg}
t|�D ]�\�}|tk�s |�v �r@�q t
|�|h }t��d |||��}|�r �fd
d�|�� D �}� fdd�|D �}t��d|||��|
�< �q t dd� |
D ���rhtdd� t|
�D ��\}�|dk�r td���fdd�|
D ��}t�td���� |f ���dk�rh�� tk�rN�� �d �d< ��< |� |d |d< |�< |d }�j�dt�� � �d �d |fS )a Return new parents and optionally a merge base for rev being rebased
The destination specified by "dest" cannot always be used directly because
previously rebase result could affect destination. For example,
D E rebase -r C+D+E -d B
|/ C will be rebased to C'
B C D's new destination will be C' instead of B
|/ E's new destination will be C' instead of B
A
The new parents of a merge is slightly more complicated. See the comment
block below.
Nc s s | ]}|t kV qd S r9 �r r� r' r' r( r� � rv z defineparents.<locals>.<genexpr>r& r c 3 s | ]}�|� � �V qd S r9 r' )r� r= )rF r� rp r' r( r� � rv r� s> cannot rebase %d:%s without moving at least one of its parentsc 3 s | ]}|t ko� �|�V qd S r9 r~ ri )rp r� r' r( r� � rv �! source is ancestor of destinationc 3 s" | ]}|t kr|� vrd V qdS )r& Nr~ )r� re )�newpsr' r( r� rv s (%ld %% (%d+%d))c s$ g | ] \}}|d kr|� vr|�qS r r' )r� r� r~ )�
obsskippedr' r( r� s z!defineparents.<locals>.<listcomp>c s" g | ]}� � |�d tkr|�qS )r& )rr r r� r� r' r( r� s s %ld - (::%ld) - %ldc s s | ]}|d uV qd S r9 r' �r� r@ r' r' r( r� rv c s s& | ] \}}|d urt |�|fV qd S r9 )rB )r� r� r@ r' r' r( r� s �s or c 3 s. | ]&}|d urd� � fdd�|D ��V qd S )Nr" c 3 s | ]}d |� | f V qdS )r� Nr' r� r! r' r( r� + rv z*defineparents.<locals>.<genexpr>.<genexpr>)r� r� r! r' r( r� * s �s4 rebasing %d:%s will include unwanted changes from %ss future parents are %d and %d
)rx r� �
isancestorrevrr r r� rF �allr� �anyr} rB �reverserX r r� r �sumr@ r� r r� rI r} �tuple)r7 r� rW r rY r� r� Zoldps�basesr� Znp�jr= Zunwantedr
� other_basesZsiderevsr� Zmergesr� Z unwanteddescr' )r� rF r� rp r� r� r7 r� r( r� � s�
�
�� �
�
��� �
�� ��
r� c C s< t j�| jj|�}t�t|d��D ]}|�d�r" dS q"dS )z/Return true if the given patch is in git formats rbs
diff --gitTF)�os�pathr� �mqr Z
linereaderr �
startswith)r7 � patchnameZmqpatch�liner' r' r( � isagitpatchF s
r� c sB i }| j � � jdd� }t� �� jD ]T}| |j �� }||v rl| j�d||jf � |jt | |j�f||< q$��
|j� q$|�r>� � | |� � � t
|dd�D ]p}||vr�|| \}} | j�td�||| | || f � � j| d|| d|| gd� q���
|| d � q�� �fd
d �|D �}
|
� jdd�< d� _� �� dS ) z9Update rebased mq patches - finalize and then import themNs. revision %d is an mq patch (%s), finalize it.
T)r� s updating mq patch %s to %d:%s
r' rw )r� �gitr� r c s& g | ] }� j �|d �d �vr|�qS )r& r )Zguard_rer� �r� r. �r� Zskippedpatchesr' r( r� { s �z updatemq.<locals>.<listcomp>)r� Z
fullseriesrX �appliedr� r� rI r} �namer� r� Zfinishr� r� r� r ZqimportZ seriesdirtyZ savedirty) r7 r rY rS ZmqrebaseZoriginal_seriesr� r� r� ZisgitZ newseriesr' r� r( r O sL
�� �� � �r c C s. |pd}| � dd�}|�d| � |�� dS )z,Store the collapse message to allow recoveryrv � last-message.txtrn ru N)rp ry �close)r7 r\ rr r' r' r( rY � s rY c C s | j jddd� dS )z Remove collapse message filer� Tr N)rp r r! r' r' r( r� � s r� c
C sr z"| � d�}|�� �� }|�� W nJ tyl } z2|jtjkr@� |rJd}nt�t d���W Y d}~n
d}~0 0 |S )z*Restore previously stored collapse messager� rv s' missing .hg/last-message.txt for rebaseN)
rp �readliner) r� �IOError�errno�ENOENTr r� r )r7 r� rr r\ �errr' r' r( r� � s
$r� c C s* | � � }|r|�d� | jjddd� dS )zRemove the status filesrO Tr N)rE Zremovefilegeneratorrp r )r7 rq r' r' r( r� � s
r� c c sb t | �}|r^t|�}g }|D ]}| | |vr |�|� q |sJt�td���|t |�8 }|V qdS )a� yield source revisions in an order that we only rebase things once
If source and destination overlaps, we should filter out revisions
depending on other revisions which hasn't been rebased yet.
Yield a sorted list of revisions each time.
For example, when rebasing A to B, B to C. This function yields [B], then
[A], indicating B needs to be rebased first.
Raise if there is a cycle so the rebase is impossible.
s# source and destination form a cycleN)rX r� rs r r� r )rW ZsrcsetZsrclistr� r� r' r' r( r� � s
r� c s� |� � }� d �� }d� �� v rT� fdd�� jjD �}t|�� �|@ rTt�t d���t
t |��}|srt� t d���t
� �d|d ��}|s�t� t d���d d
� }t
||d �}t�|t��t|�d k} |D ]�}
� ||
�� } |
�| �} | |
kr�t� t d
���| | k�rv� d }
| |
�� k�r.|
�� |
�� k}n|
�� | �� k}|�sv|�rv| |
�� v �rv|
�� �|
�� < � j�d� q�d} � j�d| |
f � q�| �r�dS t
��D ]B}dd� � j�|�D �}|�r�t�fdd�|D ���r�|�|< �q�||�fS )zlDefine which revisions are going to be rebased and where
repo: repo
destmap: {srcrev: destrev}
r r c s h | ]}� |j �� �qS r' )r� r� r� r! r' r( r� � rv z buildstate.<locals>.<setcomp>s& cannot rebase onto an applied mq patchs no matching revisionsr% r c S s | � � S r9 r
)r� r' r' r( �revof� s zbuildstate.<locals>.revof)�keyr& r Ns! source is a child of destination
Fs rebase onto %s starting from %s
c S s g | ]}|t kr|�qS r' r~ ri r' r' r( r� rv z buildstate.<locals>.<listcomp>c 3 s | ]}� � |�|kV qd S r9 )r, ri )r r' r( r� rv z buildstate.<locals>.<genexpr>)r� r� r r� r� rX r� r rC r rF r� r� r� �dict�fromkeysr� rB rm r r1 r rI r} r� rr r� )r7 rW rM r� rT Z mqappliedZ sortedsrcrd r� Z emptyrebase�rootr� Z
commonbaser� Z
samebranchr� r r' )r7 r r( r� � sN
r� Tc sZ |j j} i }
i } t�|tj� } g }
t|�� �D ]~\}}|dkr0||kr0| |�}|pZ| |�}|| |< d}||v r�| s�|| �� s�d}n|r�|
�|� n|f}|dur0||
|f< q0|
r�|f|
t|
�< |�r8|j � |j
}|j }i }t �
|
�D ]4\}}|D ]&}|� fdd�|D �dd�|� |�< q�q�||dd d
�}|j|d � |�rBi }
tj||
d | |d
� dS )a~ dispose of rebased revision at the end of the rebase
If `collapsedas` is not None, the rebase was a collapse whose result if the
`collapsedas` node.
If `keepf` is not True, the rebase has --keep set and no nodes should be
removed (but bookmarks still need to be moved).
If `backup` is False, no backup will be stored when stripping rebased
revisions.
r Nr' c s g | ] }� |��qS r' r' )r� �n�Zhfr' r( r� = rv z clearrebased.<locals>.<listcomp>s node)r� s oldnodes newnodes)r� �value)� nodechangesr3 r& )r� r� r r� r� r� r� rs r� ZhexfuncZ
formatlistZ
formatdictr r| r� r Z cleanupnodes)rI r7 rW r rY r r` r r� ZtonodeZ replacementsZmovesZ stripcleanupZcollapsednodesr� r� Zoldnoder� ZsuccsZfl�fdZchangesZoldnsZnewnZoldnr� r' r� r( r sD & r c
O s
|� d��r�|�dd�r6td�}td�}tj||d��|�� ��� |�� ��T |� d�rh|d= |�d� tj |d d
� tj
|td �d� t |�}t j
}d d
� } | t _
z"| ||g|�R i |��}
W |t _
n|t _
0 t |�} | |k�r�d|v r�|d= d|v r�|d= t|jj|d��} | |d< zt||fi |�� W nb tj�y� t�|�\}
}}|
|d �� k�rr|�td�� n|�td�� t �||� Y n0 W d � n1 �s�0 Y W d � n1 �s�0 Y n2|� d��r�t�td���| ||g|�R i |��}
|
S )zCCall rebase after pull if the latter has been invoked with --rebaserM r^ r_ s, rebase destination required by configurations) use hg pull followed by hg rebase -d DESTr� r� sC --update and --rebase are not compatible, ignoring the update flag
T)Z skipmergesC cannot pull with rebase: please commit or shelve your changes firstc _ s d S r9 r' )r� �kwargsr' r' r( �_dummya s zpullrebase.<locals>._dummyr� rB )�startrR r r� s% nothing to rebase - updating instead
Nr� s% --tool can only be used with --rebase)r, r^ r r r� rI rJ r} r rb r rB r
Z postincomingrF r� r@ rM ZNoMergeDestAbortr Z
destupdater� r� r� )ZorigrI r7 r� rS r� r� Z revsprepullZorigpostincomingr� �retZ revspostpullr6 r� Z_aZ_br' r' r( �
pullrebaseE sZ
���
T r� c
s� i }t � }| j}|jj�t | �d��}|D ]�}|�|�}t t�| j|g��} | � |� �fdd�| D �}
|
�
d� | r�|
� |�r�d||< q*� | } |
D ] } |� | | �r�| ||< q*q�||v s�t
� fdd�|
D ��r*|�|� q*||fS )ai Figure out what to do about about obsolete revisions
`obsolete_with_successor_in_destination` is a mapping mapping obsolete => successor for all
obsolete nodes to be rebased given in `rebaseobsrevs`.
`obsolete_with_successor_in_rebase_set` is a set with obsolete revisions,
without a successor in destination, that would cause divergence.
s extinct()c s h | ] }� |��qS r' r' r� )rz r' r( r� � rv z)_compute_obsolete_sets.<locals>.<setcomp>Nc 3 s | ]}|� v V qd S r9 r' r� r r' r( r� � rv z)_compute_obsolete_sets.<locals>.<genexpr>)rX r� ry rz r@ r� r r{ r| �remove�discard�issubsetr� r� r� )
r7 rw rW rc rd r� Z extinctrevsZsrcrevZsrcnodeZ
successorsZsuccrevsZdstrevZsuccrevr' )rW rz r( r� � s.
�r� c C sj |� � �N |�� �& t|| �}|jdd� W d � n1 s>0 Y W d � n1 s\0 Y d S )NTrQ )rI rJ rL r� )rI r7 rL r' r' r( � abortrebase� s
r� c C s� |� � �� |�� �v t|| �}tj�|�}t�|� |jdd�}|d urh|W d � W d � S |� d � |�
� W d � n1 s�0 Y W d � n1 s�0 Y d S )NFrQ ) rI rJ rL rV r r� r rW r� r� r )rI r7 rL r[ r\ r' r' r( �continuerebase� s
r� c C s� |j �d�sd S z t|| i �}|�� |j}W n( tjyV td�}| �|� Y d S 0 t dd� t
� |�D ��}| �td�| � td�d�| | � td�d �t |�| f � d S )
NrO s8 rebase: (use "hg rebase --abort" to clear broken state)
c S s g | ]}|d kr|�qS r r' )r� r� r' r' r( r� � rv z summaryhook.<locals>.<listcomp>s# rebase: %s, %s (rebase --continue)
s
%d rebaseds rebase.rebaseds %d remainings rebase.remaining)
rp r� rL r� r r r� r ry rB r Z
itervaluesZlabel)rI r7 rL r r� Z
numrebasedr' r' r( � summaryhook� s(
����r� c C sl t �tjdt�}|d �ddd td�f� |d �dddtd�f� tj� dt
� t j dd d
d
t
td � d S ) Ns pullr& rv r3 s' rebase working directory to branch headr: r; s specify merge tool for rebaserO T)�fnameZstopflagZ continueflagZ abortfuncZ continuefunc)r Z wrapcommandr
�tabler� rs r r Z summaryhooksr� r� rg Z
addunfinishedr� r� )rI �entryr' r' r( �uisetup� s ��r� )N)F)NFNT)]r- Z
__future__r r� r� Zmercurial.i18nr Zmercurial.noder r r Zmercurial.pycompatr Z mercurialr r r
r r r
r r r r r r rV r r r r r r r r r r r r r r rg r! r� r� r� ZcmdtablerH Z configtableZ
configitemZ
testedwithr) r/ r2 r8 Zrevsetpredicater> rG rK �objectrL Z
dryrunoptsZ
formatteroptsZ confirmoptsZCATEGORY_CHANGE_MANAGEMENTrM rH rK rN rX r� r� r� r r� r� r} r� r� r rY r� r� r� r� r� r r� r� r� r� r� r� r' r' r' r( �<module> s p!
�
L��������9�:�;�<�A
I?
N " 2N
; 6 I �
<E-