| 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
�+�bX � @ s� d Z ddlmZ zddlZddlZW n ey> dZdZY n0 ddlZddlZddlZddl m
Z
ddl m Z m
Z
ddlmZmZmZ ddlmZmZmZmZmZmZmZmZmZm 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, ddl-m.Z.m/Z/m0Z0 e,j1Z1i Z2e&�3e2�Z3i Z4e&�5e4�Z5e5d d
d d � e5d
ddd � e5d
dd d � e5d
ddd � e5d
dd d � e5dddd � e5d
ddd � e5d
dd dd� dZ6i Z7e8� Z9e8� Z:e8� Z;e8� Z<dd � Z=G d d � d e>�Z?G d d � d e>�Z@d!d"� ZAd#d$� ZBd�d%d&�ZCd'd(� ZDd)d*� ZEd�d+d,�ZFeFd-d.ge
d/�dd0�G d1d2� d2e@��ZGeFd3d4ge
d5�dd0�G d6d7� d7e@��ZHeFd8d9ge
d:��G d;d<� d<e@��ZIeFd=d>ge
d?��G d@dA� dAe@��ZJeFdBge
dC�ddD�G dEdF� dFeI��ZKeFdGdHge
dI��G dJdK� dKeI��ZLeFdLdMge
dN��G dOdP� dPe@��ZMeFdQdRge
dS�dd0�G dTdU� dUe@��ZNd�dVdW�ZOz ddlPZPW n e�y\ dZPY n0 g dX�ZQdYdZd[�ZRd\\ZSZTZUZVZWd]\ZXZYZZd^\Z[Z\Z]d_\Z^Z_d`\Z`ZaZbZcZdda\ZeZfZgZhdbdcdcddddded
d
dfdgdh� egdidjdkdldmdndodpdqdpdqdrdsdrdsdtdu�efdvdvdwdxdydxdydpdqdz� ehi iZid{d|� ZjG d}d~� d~e>�Zkdd�� Zld�d�d��Zmd�d�� Znd�d�� ZoG d�d�� d�e>�Zpd�d�� Zqd�d�� Zre3d
d�d�d�e
d��e
d��fd�d�d e
d��fd�d�d e
d��fd�d�d e
d��fd�d�d e
d��fd�d�d e
d��fd9d�d e
d��fdHd�g e
d��e
d��fgejs e
d��e3jtd��d�d�� �Zud�d�� Zvd�Zwd�Zxd�Zyd�Zzd�d�� Z{d�d�� Z|d�d�� Z}d�d�� Z~d�d�� Zd�d�� Z�d�d�d��Z�d�d�� Z�d�d�� Z�d�d�� Z�d�d�� Z�d�d�� Z�d�dÄ Z�d�d�dńZ�d�dDŽ Z�d�dɄ Z�d�d˄ Z�d�d̈́ Z�d�dτ Z�d�dф Z�d�d�dӄZ�d�dՄ Z�e ��e'd�e�� d�d Z�d�dڄ Z�dS )�a� interactive history editing
With this extension installed, Mercurial gains one new command: histedit. Usage
is as follows, assuming the following history::
@ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42
| Add delta
|
o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42
| Add gamma
|
o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42
| Add beta
|
o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
Add alpha
If you were to run ``hg histedit c561b4e977df``, you would see the following
file open in your editor::
pick c561b4e977df Add beta
pick 030b686bedc4 Add gamma
pick 7c2fd3b9020c Add delta
# Edit history between c561b4e977df and 7c2fd3b9020c
#
# Commits are listed from least to most recent
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but allow edits before making new commit
# f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
# b, base = checkout changeset and apply further changesets from there
#
In this file, lines beginning with ``#`` are ignored. You must specify a rule
for each revision in your history. For example, if you had meant to add gamma
before beta, and then wanted to add delta in the same revision as beta, you
would reorganize the file to look like this::
pick 030b686bedc4 Add gamma
pick c561b4e977df Add beta
fold 7c2fd3b9020c Add delta
# Edit history between c561b4e977df and 7c2fd3b9020c
#
# Commits are listed from least to most recent
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but allow edits before making new commit
# f, fold = use commit, but combine it with the one above
# r, roll = like fold, but discard this commit's description and date
# d, drop = remove commit from history
# m, mess = edit commit message without changing commit content
# b, base = checkout changeset and apply further changesets from there
#
At which point you close the editor and ``histedit`` starts working. When you
specify a ``fold`` operation, ``histedit`` will open an editor when it folds
those revisions together, offering you a chance to clean up the commit message::
Add beta
***
Add delta
Edit the commit message to your liking, then close the editor. The date used
for the commit will be the later of the two commits' dates. For this example,
let's assume that the commit message was changed to ``Add beta and delta.``
After histedit has run and had a chance to remove any old or temporary
revisions it needed, the history looks like this::
@ 2[tip] 989b4d060121 2009-04-27 18:04 -0500 durin42
| Add beta and delta.
|
o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
| Add gamma
|
o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
Add alpha
Note that ``histedit`` does *not* remove any revisions (even its own temporary
ones) until after it has completed all the editing operations, so it will
probably perform several strip operations when it's done. For the above example,
it had to run strip twice. Strip can be slow depending on a variety of factors,
so you might need to be a little patient. You can choose to keep the original
revisions by passing the ``--keep`` flag.
The ``edit`` operation will drop you back to a command prompt,
allowing you to edit files freely, or even use ``hg record`` to commit
some changes as a separate commit. When you're done, any remaining
uncommitted changes will be committed as well. When done, run ``hg
histedit --continue`` to finish this step. If there are uncommitted
changes, you'll be prompted for a new commit message, but the default
commit message will be the original message for the ``edit`` ed
revision, and the date of the original commit will be preserved.
The ``message`` operation will give you a chance to revise a commit
message without changing the contents. It's a shortcut for doing
``edit`` immediately followed by `hg histedit --continue``.
If ``histedit`` encounters a conflict when moving a revision (while
handling ``pick`` or ``fold``), it'll stop in a similar manner to
``edit`` with the difference that it won't prompt you for a commit
message when done. If you decide at this point that you don't like how
much work it will be to rearrange history, or that you made a mistake,
you can use ``hg histedit --abort`` to abandon the new changes you
have made and return to the state before you attempted to edit your
history.
If we clone the histedit-ed example repository above and add four more
changes, such that we have the following history::
@ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan
| Add theta
|
o 5 140988835471 2009-04-27 18:04 -0500 stefan
| Add eta
|
o 4 122930637314 2009-04-27 18:04 -0500 stefan
| Add zeta
|
o 3 836302820282 2009-04-27 18:04 -0500 stefan
| Add epsilon
|
o 2 989b4d060121 2009-04-27 18:04 -0500 durin42
| Add beta and delta.
|
o 1 081603921c3f 2009-04-27 18:04 -0500 durin42
| Add gamma
|
o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42
Add alpha
If you run ``hg histedit --outgoing`` on the clone then it is the same
as running ``hg histedit 836302820282``. If you need plan to push to a
repository that Mercurial does not detect to be related to the source
repo, you can add a ``--force`` option.
Config
------
Histedit rule lines are truncated to 80 characters by default. You
can customize this behavior by setting a different length in your
configuration file::
[histedit]
linelen = 120 # truncate rule lines at 120 characters
The summary of a change can be customized as well::
[histedit]
summary-template = '{rev} {bookmarks} {desc|firstline}'
The customized summary should be kept short enough that rule lines
will fit in the configured line length. See above if that requires
customization.
``hg histedit`` attempts to automatically choose an appropriate base
revision to use. To change which base revision is used, define a
revset in your configuration file::
[histedit]
defaultrev = only(.) & draft()
By default each edited revision needs to be present in histedit commands.
To remove revision you need to use ``drop`` operation. You can configure
the drop to be implicit for missing commits by adding::
[histedit]
dropmissing = True
By default, histedit will close the transaction after each action. For
performance purposes, you can configure histedit to use a single transaction
across the entire histedit. WARNING: This setting introduces a significant risk
of losing the work you've done in a histedit if the histedit aborts
unexpectedly::
[histedit]
singletransaction = True
� )�absolute_importN)�_)�getattr�open)�bin�hex�short)�bundle2�cmdutil�context�copies�destutil� discovery�encoding�error�exchange�
extensions�hg�
logcmdutil�merge�
mergestate� mergeutil�obsolete�pycompat� registrar�repair� rewriteutil�scmutil�state�util)�dateutil�
stringutil�urlutil� experimental� histedit.autoverbF��default� histedits
defaultrev� dropmissing� linelen�P � singletransaction� uis interface.histedit� summary-templates {rev} {desc|firstline}� later-commits-firstT)r& Z experimentals ships-with-hg-corec s� t d�}g � � fdd�}tt�tt� tt� D ] }||� q0� �d� g }| �dd�rb|�d� |||f �d�� | }d�d d
� |D ��S ) z�construct the editor comment
The comment includes::
- an intro
- sorted primary commands
- sorted short commands
- sorted long commands
- additional hints
Commands are only included once.
s� Edit history between %s and %s
Commits are listed from least to most recent
You can reorder changesets by reordering the lines
Commands:
c sh t | }|j�d�}t|j�r6d�t|jdd� d��} � �d| |d f � � �dgt|�d � d S )
N�
� , c S s t | �S �N��len)�v� r5 �4/usr/lib64/python3.9/site-packages/hgext/histedit.py�<lambda>K � z1geteditcomment.<locals>.addverb.<locals>.<lambda>��keys %s = %sr s %s� ) � actiontable�message�splitr3 �verbs�join�sorted�append�extend)r4 �a�lines��actionsr5 r6 �addverbG s
z geteditcomment.<locals>.addverbr8 r' r( sK Deleting a changeset from the list will DISCARD it from the edited history!r/ c S s g | ]}|rd | nd�qS )s # %s
s #
r5 ��.0�lr5 r5 r6 �
<listcomp>` r8 z"geteditcomment.<locals>.<listcomp>) r rA �primaryactions�secondaryactions�tertiaryactionsrB �
configboolr> r@ )�ui�firstZlastZintrorH r4 �hintsrE r5 rF r6 �geteditcomment0 s( �
���
�rT c @ sN e Zd Zdd� Zdd� Zdd� Zddd �Zd
d � Zd d
� Zdd� Z dd� Z
dS )�
histeditstatec C sH || _ d | _d | _d | _d | _d | _d | _d | _t� |d�| _
g | _ d S �N� histedit-state) �reporG �keep�topmost�
parentctxnode�lock�wlock�
backupfile�statemodZcmdstate�stateobj� replacements)�selfrX r5 r5 r6 �__init__d s zhisteditstate.__init__c C sn | j �� s t�| jtd�� | �� }|d | _t|d | �}|| _ |d | _
|d | _ |d | _ |d | _
dS ) z;Load histedit state from disk and set fields appropriately.r' �
parentctxnode� rules� keep� topmost� replacements�
backupfileN)r` �existsr
ZwrongtooltocontinuerX r �_readr[ �
parserulesrG rY rZ ra r^ )rb �datarG r5 r5 r6 �readp s
zhisteditstate.readc C st | j j�d�}|�d�r2| �� }|\}}}}}}n t�|�}|\}}}}}d }d�dd� |D ��}||||||d�S )NrW � v1
r/ c S s g | ]\}}d ||f �qS )s %s %sr5 )rJ �verb�restr5 r5 r6 rL � r8 z'histeditstate._read.<locals>.<listcomp>)rd re rf rg rh ri )rX �vfsrn �
startswith�_load�pickle�loadsr@ ) rb �fprm r[ �rulesrY rZ ra r^ r5 r5 r6 rk s
�zhisteditstate._readNc C sV |r|j dd| jdd� n8| j�dd��}| �|� W d � n1 sH0 Y d S )NrW )rW s plain)�location� w)Zaddfilegenerator�_writerX rr )rb �tr�fr5 r5 r6 �write� s �zhisteditstate.writec
C s� |� d� |� dt| j� � |� dt| j� � |� d| jrBdnd � |� dt| j� � | jD ]}|� d|�� � qd|� dt| j� � | jD ]2}|� dt|d �d� d d
� |d D ��f � q�| j
}|s�d}|� d| � d S ) Nro s %s
� Trues Falses %d
s %s%s
r r8 c s s | ]}t |�V qd S r1 )r �rJ �rr5 r5 r6 � <genexpr>� r8 z'histeditstate._write.<locals>.<genexpr>r; ) r~ r r[ rZ rY r3 rG �tostatera r@ r^ )rb rw �action� replacementr^ r5 r5 r6 r{ � s(
���zhisteditstate._writec sb | j �dd�}dd� |�� D �}d}|| |d7 }t|| �}|d7 }t|| �}|d7 }|| dk}|d7 }g }t|| �}|d7 }t�|�D ]2} || }
|d7 }|| } |d7 }|�|
| f� q�g } t|| �}
|d7 }t�|
�D ]P} || � t� d d� �}� fd d�tdt � �d�D �}| �||f� |d7 }q�|| }|d7 }|�
� ||||| |fS )
NrW � rc S s g | ]}|d d� �qS )N���r5 rI r5 r5 r6 rL � r8 z'histeditstate._load.<locals>.<listcomp>r r; r �( c s g | ]}t � ||d � ��qS )r� )r )rJ �i�r� r5 r6 rL � s �) rX rr � readlinesr �intr �xrangerB �ranger3 �close)rb rw rE �indexr[ rZ rY rx Zrulelenr� Z
ruleaction�rulera Zreplacementlen�originalZsuccr^ r5 r� r6 rt � sF
�
zhisteditstate._loadc C s | � � r| jj�d� d S rV )�
inprogressrX rr �unlink�rb r5 r5 r6 �clear� s zhisteditstate.clearc C s | j j�d�S rV )rX rr rj r� r5 r5 r6 r� � s zhisteditstate.inprogress)N) �__name__�
__module__� __qualname__rc rn rk r~ r{ rt r� r� r5 r5 r5 r6 rU c s
1rU c @ sh e Zd Zdd� Zedd� �Zdd� Zdd� Zd d
� Zd d � Z d
d� Z
dd� Z dd� Z dd� Z
dd� ZdS )�histeditactionc C s || _ |j| _|| _d S r1 )r rX �node)rb r r� r5 r5 r6 rc � s zhisteditaction.__init__c C s� |� � �dd�d }z t|�}W n\ ty| z"t�|j|�}|�� }t|�}W n& tj yv t�
t d�| ��Y n0 Y n0 | ||�S )zCParses the given rule, returning an instance of the histeditaction.� r; r s invalid changeset %s) �stripr> r � TypeErrorr Z revsinglerX r r ZRepoLookupError�
ParseErrorr )�clsr r� Zruleid�revZ_ctxZrulehashr5 r5 r6 �fromrule� s zhisteditaction.fromrulec C sT | j }t| j�}t�||�| _| jdu rBt�td�|dd� ��| �|||� dS )z)Verifies semantic correctness of the ruleNs unknown changeset %s listed� ) rX r r� r Zresolvehexnodeidprefixr r� r �_verifynodeconstraints)rb �prev�expected�seenrX Zhar5 r5 r6 �verify s
zhisteditaction.verifyc C sV | j |vr0tjtd�| jt| j �f td�d��| j |v rRt�td�t| j � ��d S )Ns% %s "%s" changeset was not a candidates only use listed changesets��hints# duplicated command for changeset %s)r� r r� r rp r )rb r� r� r� r5 r5 r6 r� s
��
�z%histeditaction._verifynodeconstraintsc C s� | j | j }| j j}|�ddid��$ t�||�dd��}W d � n1 sN0 Y |rh|�� d nd}d| j||f }| j j� dd �}t
|d
�}t � ||�S ) z{build a histedit rule line for an action
by default lines are in the form:
<hash> <rev> <summary>
)s
templatealiass
label(l,x)� xr' r- Nr r8 s %s %s %sr) � )
rX r� rQ �configoverrider
�rendertemplate�config�
splitlinesrp Z configint�maxr! Zellipsis)rb �ctxrQ �summary�line�maxlenr5 r5 r6 �torule s � �"
zhisteditaction.torulec C s d| j t| j�f S )zPrint an action in format used by histedit state files
(the first line is a verb, the remainder is the second)
s %s
%s)rp r r� r� r5 r5 r6 r� 5 s zhisteditaction.tostatec C s | � � | �� | �� S )znRuns the action. The default behavior is simply apply the action's
rulectx onto the current parentctx.)� applychange�
continuedirty�
continuecleanr� r5 r5 r6 �run; s zhisteditaction.runc C s� | j }|| j }|j�� �$ tj|| jjdd� W d � n1 sD0 Y t|j||i �}|j �
|� � � |j r�t
jtd�| jt| j�f td�d��dS )zlApplies the changes from this action's rulectx onto the current
parentctx, but does not commit them.T��
quietemptyNs Fix up the change (%s %s)s hg histedit --continue to resumer� )rX r� rQ �silentr �updater r[ � applychanges�dirstateZ setbranch�branchZunresolvedcountr �InterventionRequiredr rp r )rb rX �rulectx�statsr5 r5 r6 r� B s
2�zhisteditaction.applychangec C sd | j }|| j }| �� }t||�}|j�dd�r:t�� }n|�� }||� � |�
� ||� � |d� dS )z�Continues the action when changes have been applied to the working
copy. The default behavior is to commit the dirty changes.� rewrite� update-timestamp)�text�user�date�extra�editorN) rX r� � commiteditor�
commitfuncforrQ rP r �makedater� � descriptionr� r� )rb rX r� r� �commitr� r5 r5 r6 r� Q s
�z histeditaction.continuedirtyc C s dS )z1The editor to be used to edit the commit message.Fr5 r� r5 r5 r6 r� e s zhisteditaction.commiteditorc C st | j d }|�� | jjkrH| j j�td�t| j� � || jt� fgfS |�� | jkr^|g fS || j|�� ffgfS )z�Continues the action when the working copy is clean. The default
behavior is to accept the current commit as the new version of the
rulectx.� .s$ %s: skipping changeset (no changes)
) rX r� r r[ rQ �warnr r �tuple)rb r� r5 r5 r6 r� i s
�z histeditaction.continuecleanN)r� r� r� rc � classmethodr� r� r� r� r� r� r� r� r� r� r5 r5 r5 r6 r� � s
r� c s �� � � � ��fdd�}|S )a= Build a commit function for the replacement of <src>
This function ensure we apply the same treatment to all changesets.
- Add a 'histedit_source' entry in extra.
Note that fold has its own separated logic because its handling is a bit
different and not easily factored out of the fold method.
c sn d� i}�j �|d��D | �di ��� }��� |d< || d< �jf i | ��W d � S 1 s`0 Y d S )N�s phasess
new-commitr' r� � histedit_source)rQ r� �get�copyr r� )�kwargs� overridesr� ��phaseminrX �srcr5 r6 �
commitfunc� s z!commitfuncfor.<locals>.commitfunc)�phase)rX r� r� r5 r� r6 r� y s
r� c C s� |� � �� |j� � krb| �� �2 tj| ||dd� t�dddd�}W d � q�1 sV0 Y nZzD|j� dd|�
dd�d � tj ||g d
�d �}W |j� dddd � n|j� dddd � 0 |S ) z@Merge changeset from ctx (only) in the current working directoryT��allr Nr, s
forcemerges toolr8 r' )s already editeds current changes parent of current change)�labels) �p1r� r� r� r
Zrevert�mergemodZ updateresultrQ Z setconfigr� Zgraft)rQ rX r� �optsr� r5 r5 r6 r� � s
0��
(r� c s< t | �d|�� ��� ��}|s"dS |D ]&}|�� s&t�td�t|�� � ��q&|� � � t� }|D ]}|�
|� � � q`t �
� ���� �fdd�|D �}��� ����fdd�} |�d�r�|d }
n|�� }
|�d �} |�d
�} |�d �}
|� � �� |�� �� f}d}|�stjd d
d�}tj| ||
|| | | |
|d� }| �|�S )z�collapse the set of revisions from first to last as new one.
Expected commit options are:
- message
- date
- username
Commit message is edited in all cases.
This function works in memory.s %d::%dN�! cannot fold into public change %sc s g | ]}t �|�� �s|�qS r5 )r
�samefile)rJ r} )�base�lastctxr5 r6 rL � r8 z collapse.<locals>.<listcomp>c
sN |�v rJ�| }|� � }tj| ||�� |�� d|v d|v � �|�d�}|S d S )N� lr� )�islinkZisexecZ
copysource)�flagsr Z
memfilectx�pathrm r� )rX r� r� Zfctxr� Zmctx)�copied�headmfr� r5 r6 � filectxfn� s � zcollapse.<locals>.filectxfn� message� user� date� extraTs
histedit.fold��editZeditform)�parentsr� �filesr� r� r� r� r� )�list�setr� �mutabler r� r r r� r� r� r� r Z
pathcopiesZmanifestr� r� Zp2r
�getcommiteditorr ZmemctxZ commitctx)rX Zfirstctxr� �
commitopts�
skipprompt�ctxs�cr� r� r� r= r� r� r� r� r� �newr5 )r� r� r� r� r6 �collapse� sL
�
� r c C s | d j dd�S )NT)�missing)Zdirty�rX r5 r5 r6 �
_isdirtywc� s r c C s t jtd�td�d��d S )Ns working copy has pending changessY amend, commit, or revert them and run histedit --continue, or abort with histedit --abortr� )r �
StateErrorr r5 r5 r5 r6 �
abortdirty� s ��r c s � ���fdd�}|S )Nc sr �d }�rt �|� n2� r(t�|� n"t��dkr@t�|� n
t�|� || _�| _�| _�D ] }| t |< q`| S �Nr r; )
rM �add�internalactionsr3 rN rO rp r? r= r< )r� rp ��internalr= �priorityr? r5 r6 �wrap s
zaction.<locals>.wrapr5 )r? r= r
r r r5 r r6 r� s r� � pick� ps
use commit)r
c s e Zd Z� fdd�Z� ZS )�pickc sN | j | j }|�� �� | jjkr@| j j�dt| j� � |g fS tt | ��
� S )Ns node %s unchanged
) rX r� r� r r[ rQ �debugr �superr r� )rb r� �� __class__r5 r6 r� s
zpick.run)r� r� r� r� �
__classcell__r5 r5 r r6 r s r � edit� es4 use commit, but allow edits before making new commitc @ s e Zd Zdd� Zdd� ZdS )r� c C sf | j }|| j }tj|| jjdd� t|j||i � td�}t j
td�t | j� |t | j� d��d S )NTr� s9 to edit %s, `hg histedit --continue` after making changess6 Editing (%s), commit as needed now to split the changer� ) rX r� r r� r r[ r� rQ r r r� r )rb rX r� r� r5 r5 r6 r� . s
� �zedit.runc C s t jddd�S )NTs
histedit.editr� �r
r� r� r5 r5 r6 r� : s zedit.commiteditorN)r� r� r� r� r� r5 r5 r5 r6 r� ( s r� � fold� fs- use commit, but combine it with the one abovec sL e Zd Z� fdd�Zdd� Zdd� Zdd� Zd d
� Zd d � Zd
d� Z � Z
S )�foldc sl t t| ��|||� | j}|s.|| j �� }n|jdvr<dS ||j }|�� sht� t
d�t |�� � ��dS )z.Verifies semantic correctness of the fold rule)r � baseNr� ) r r r� rX r� r� rp r� r r� r r )rb r� r� r� rX r r r5 r6 r� @ s
�z fold.verifyc C sD | j }|| j }t||�}|dt| j� |�� |�� |�� d� d S )Ns fold-temp-revision %s)r� r� r� r� )rX r� r� r r� r� r� )rb rX r� r� r5 r5 r6 r� O s
�zfold.continuedirtyc C s� | j }|d }|| j }| jj}|�� |krX|j�td�t| j� � || j|ffgfS || }dd� |�d|� � |� � �D �}|s�|j�td�t| j�t|�f � || j|�� ffgfS |�
� }|� |�� � | � |j||||�� |�S )Nr� s %s: empty changeset
c S s h | ] }|� � �qS r5 �r� �rJ r r5 r5 r6 � <setcomp>e s �z%fold.continueclean.<locals>.<setcomp>s (%d::. - %d)sI %s: cannot fold - working copy is not a descendant of previous commit %s
)
rX r� r r[ rQ r� r r r� r� r� �discard�
finishfold)rb rX r� r� r[ � parentctxZ
newcommitsZ
middlecommitsr5 r5 r6 r� [ s2
�����zfold.continuecleanc C s dS )z�Returns true if the rule should skip the message editor.
For example, 'fold' wants to show an editor, but 'rollup'
doesn't want to.
Fr5 r� r5 r5 r6 r� z s zfold.skippromptc C s dS )z�Returns true if the rule should merge messages of multiple changes.
This exists mainly so that 'rollup' rules can be a subclass of
'fold'.
Tr5 r� r5 r5 r6 �
mergedescs� s zfold.mergedescsc C s dS )z�Returns true if the rule should preserve the date of the first
change.
This exists mainly so that 'rollup' rules can be a subclass of
'fold'.
Fr5 r� r5 r5 r6 � firstdate� s zfold.firstdatec s� t �|�� � i }|�� |d< | �� s0|�� }n0d�|�� g� fdd�|D � |�� g �d }||d< | �� r~|�� |d< nt |�� |�� �|d< |�
dd �r�t � � |d< |�
� �� } d
|�� |�� f | d < | |d < t |�� |�� �}
d
|
i} � j�| d��* t� |� | || �� d�} W d � n1 �s20 Y | d u �rN|g fS t �� | � |�� |ff|�� | ff|| ffg}
|D ]}|
�|| ff� �q�� | |
fS )Nr� s
***
c s g | ]}� | � � �qS r5 )r� r� r r5 r6 rL � r8 z#fold.finishfold.<locals>.<listcomp>r/ r� r� r� r� s %s,%sr� r� r� r' )r� )r� r� r� r� r$ r� r@ r% r� r� rP r r� r� r� r r� rQ r� r r� r� rB )rb rQ rX r� ZoldctxZnewnodeZinternalchangesr� Z
newmessager� r� r� �nra Zichr5 r r6 r" � sX
����� �&
�zfold.finishfold) r� r� r� r� r� r� r� r$ r% r" r r5 r5 r r6 r > s r r � bs: checkout changeset and apply further changesets from therec @ s, e Zd Zdd� Zdd� Zdd� Zdd� Zd S )
r� c C s. | j d �� | jkr&t�| j | j � | �� S �Nr� )rX r� r� Z clean_updater� r� r5 r5 r6 r� � s zbase.runc C s
t � d S r1 )r r� r5 r5 r6 r� � s zbase.continuedirtyc C s | j d }|g fS r( r )rb Zbasectxr5 r5 r6 r� � s
zbase.continuecleanc C s8 | j |v r4td�}tj|| jt| j �f td�d��d S )Ns. %s "%s" changeset was an edited list candidates& base must only use unlisted changesetsr� )r� r r r� rp r )rb r� r� r� �msgr5 r5 r6 r� � s
�zbase._verifynodeconstraintsN)r� r� r� r� r� r� r� r5 r5 r5 r6 r� � s r� s
_multifoldav fold subclass used for when multiple folds happen in a row
We only want to fire the editor for the folded message once when
(say) four changes are folded down into a single change. This is
similar to rollup, but we should preserve both messages so that
when the last fold operation runs we can show the user all the
commit messages in their editor.
)r c @ s e Zd Zdd� ZdS )�
_multifoldc C s dS �NTr5 r� r5 r5 r6 r� � s z_multifold.skippromptN)r� r� r� r� r5 r5 r5 r6 r* � s r* � rollr� s9 like fold, but discard this commit's description and datec @ s$ e Zd Zdd� Zdd� Zdd� ZdS )�rollupc C s dS )NFr5 r� r5 r5 r6 r$ � s zrollup.mergedescsc C s dS r+ r5 r� r5 r5 r6 r� s zrollup.skippromptc C s dS r+ r5 r� r5 r5 r6 r% s zrollup.firstdateN)r� r� r� r$ r� r% r5 r5 r5 r6 r- � s r- � drop� ds remove commit from historyc @ s e Zd Zdd� ZdS )�dropc C s | j | jj }|| jt� fgfS r1 )rX r r[ r� r� )rb r# r5 r5 r6 r�
s zdrop.runN)r� r� r� r� r5 r5 r5 r6 r0 s r0 � mess� ms3 edit commit message without changing commit contentc @ s e Zd Zdd� ZdS )r= c C s t jddd�S )NTs
histedit.messr� r r� r5 r5 r6 r� s zmessage.commiteditorN)r� r� r� r� r5 r5 r5 r6 r= s r= c s� |du r i }t �d� | |�}|jp&|j}| �td�t �|� � t�� � |j g fd�\}}t�
� ||�} |r~� fdd�|D �}t j � | ||d�}
|
j
s�t�td���t� �d|
j
��} t| �d kr�td
�} td �}
tj| |
d ��� | d
�� S )zVutility function to find the first outgoing changeset
Used by initialization codeNr' s comparing with %s
c s g | ]}� � |��qS r5 )�lookup�rJ r� r r5 r6 rL ( r8 z findoutgoing.<locals>.<listcomp>)�forces no outgoing ancestors�
roots(%ln)r; s& there are ambiguous outgoing revisionss& see 'hg help histedit' for more detailr� r )r" Zget_unique_push_pathZpushloc�loc�statusr Z hidepasswordr Z
addbranchrevsr� Zpeerr Zfindcommonoutgoingr r r r� �revsr3 r� )rQ rX �remoter5 r� r� �destr9 Zcheckout�otherZoutgoing�rootsr) r� r5 r r6 � findoutgoing s$ r> )r r r r. r1 r, s ^folds ^roll)r r, )r; � � � � )� � � )� �
� )r; r? )r@ rA rB rC rD )r r; r? r@ � global� next-action� prev-action� quit� showpatch� help) � hs KEY_RIGHTr� s KEY_LEFT� q� c� C� v� ?s action-drops action-edits action-folds action-messs action-picks action-roll� select� down� up� move-down� move-up� goto)r/ r r r2 r r� r� � j� k� KEY_DOWN� KEY_UP� J� K� KEY_NPAGE� KEY_PPAGE� 0� page-down� page-up� line-down� line-up) r� ra rb r[ r\ r] r^ r_ r` c C s t �dt�dtjd��S )Ns hhr; s )�struct�unpack�fcntlZioctl�termiosZ
TIOCGWINSZr5 r5 r5 r6 � screen_sizev s rl c @ sJ e Zd Zd
dd�Zdd� Ze�e�Zedd� �Z e
j dd � �Z d
d � Z
d S )� histeditruler c C s( || _ || _|| _|| _|| _g | _d S r1 )rQ r� r� �origpos�pos� conflicts)rb rQ r� ro r� r5 r5 r6 rc { s zhisteditrule.__init__c C s d| j | jf S )Ns %s%s)�prefix�descr� r5 r5 r6 � __bytes__� s
zhisteditrule.__bytes__c C sN t �| j| j�}| j�� dd� }| j�� }dd| j �d�|�d�||f S )Nr r� s #%s %s %d:%s s %dr? rC )�
ACTION_LABELSr� r� r� r r� rn �ljust)rb r� �hr� r5 r5 r6 rq � s
�zhisteditrule.prefixc C s6 t �| j| j�dd��}|r |S | j�� �� d �� S )Nr' r- r )r
r� r� rQ r� r� r� r� )rb r� r5 r5 r6 rr � s �zhisteditrule.descc C sh |j | j krL|j| jkrLt|j�� �t| j�� �@ t� krL| j�|� | jS || jv rb| j�|� | jS r1 )ro rn r� r� r� rp rB �remove)rb r< r5 r5 r6 �checkconflicts� s "
zhisteditrule.checkconflictsN)r )r� r� r� rc rs r Z strmethod�__str__�propertyrq r Z
propertycacherr rx r5 r5 r5 r6 rm z s
rm c C s( g }| D ]} |� d| j| jf � q|S )z[Returns a list of commands consumable by histedit --commands based on
our list of ruless %s %s
)rB r� r� )rx Zcommandsr5 r5 r6 � makecommands� s r{ c C sv | � � \}}|d | }t|��|�d|� }|dk r>|| }|dk rN|| }|rd| �||||� n| �|||� dS )z�Add a line to the given window left padding but 100% filled with
whitespace characters, so that the color appears on the whole liner; Nr )�getmaxyx�bytesru �addstr)�win�y�xr� Zcolor�maxy�maxx�lengthr5 r5 r6 �addln� s r� c C s& t | �|kr| S d| |d d � S )Ns > r? r2 �r� r& r5 r5 r6 � _trunc_head� s r� c C s$ t | �|kr| S | d |d � d S )Nr? s >r2 r� r5 r5 r6 � _trunc_tail� s r� c @ s� e Zd Zdd� Zdd� Zdd� Zdd� Zd d
� Zd d � Zd
d� Z d'dd�Z
dd� Z dd� Z dd� Z
dd� Zdd� Zd d � Zd d � Zd d!� Zd(d"d#�Zd$d%� Zd&S ))�_chistedit_statec C sX || _ || _|| _|j�dd�| _d| _d | _ttf| _ d | _
t ddit ddii| _
d S )Nr' r. r � line_offset)rX rx �stdscrrQ rP � later_on_topro �selected� MODE_INIT�mode� page_height�
MODE_RULES�
MODE_PATCH�modes)rb rX rx r� r5 r5 r6 rc � s" �
���z_chistedit_state.__init__c C s | j | �| j� }|j}|�� |�� \}}|d }d|�� |�� dd� f }|�dd|d|� � d|� � }|�dd|d|� � | j
� |� � �}dd �
|� }|�dd|d|� � d
|�� �� d }|�d d|d|� � d
}|�dd|� dt|� } || d }
d} |d| d } |�� }
t|
�D ]r\}}t|
�| k�r�|| d k�r�|�| | td�
|
|d� �|
�� | d } �q�|�| | t||
�� | d } �q4|j}t|�d k�r�d�
tdd� |��}d| }nd}|�| d|d|� � |�� dS )zSRenders the commit window that shows the log of the current selected
commitr@ s changeset: %d:%sNr� r; s
user: %sr? s
bookmark: %sr� s
summary: %sr rA s files: rB � ,c S s | j �� d d� S )Nr� )r� r )r� r5 r5 r6 r7 # r8 z0_chistedit_state.render_commit.<locals>.<lambda>s changed files overlap with %ss
no overlap)rx �display_pos_to_rule_posro r� Zboxr| r� r r~ r� rX �
nodebookmarksr� r@ r� r� r3 r� � enumerater� r� rp �map� noutrefresh)rb r r� r� r� r� r� r� ZbmsZfnxZfnmaxxr� Zfnmaxnr� r� Zline1rp Z conflictstrr5 r5 r6 �
render_commit� sF "
z _chistedit_state.render_commitc C s8 | j d tkrd}n d}| jr(|d7 }n|d7 }|�� S )Nr s} ?: help, k/up: line up, j/down: line down, v: stop viewing patch
pgup: prev page, space/pgdn: next page, c: commit, q: abort
s� ?: help, k/up: move up, j/down: move down, space: select, v: view patch
d: drop, e: edit, f: fold, m: mess, p: pick, r: roll
pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort
s- Newer commits are shown above older commits.
s- Older commits are shown above newer commits.
)r� r� r� r� )rb �helpr5 r5 r6 � helplines+ s
z_chistedit_state.helplinesc C sP |� � \}}t| �� �D ]*\}}||kr, qDt||d|t�t�� q|�� d S �Nr )r| r� r� r� �curses�
color_pair�
COLOR_HELPr� )rb r r� r� r� r� r5 r5 r6 � render_help= s z _chistedit_state.render_helpc C sd | j �� \}}t| �� �}|| d }|dk rLtjtd�||f td�d��d|f||f||fd�S )Nr� r; s: terminal dimensions %d by %d too small for curses histedits7 enlarge your terminal or use --config ui.interface=textr� )� commitrN � main)r� r| r3 r� r �Abortr )rb r� r� ZhelplenZmainlenr5 r5 r6 �layoutE s ����z_chistedit_state.layoutc C s | j rt| j�d | S |S dS )a/ Converts a position in display order to rule order.
The `display_pos` is the order from the top in display order, not
considering which items are currently visible on the screen. Thus,
`display_pos=0` is the item at the top (possibly after scrolling to
the top)
r; N)r� r3 rx )rb � display_posr5 r5 r6 r� W s z(_chistedit_state.display_pos_to_rule_posc
C st | j t d }dd� | jD �}t|�dkrVdd�ttj|�� }t|dd|t �
t �� t |t| j��D � ]�}|| }|dk sf|| j
kr�qf| �|�}| j| }t|j�dkr�|�|ddt �
t �� n|�|ddt j� || jkr�t} t||d |t �
t�� n@|| jk�r(t} t||d |t �
t�t jB � nt} t||d |� |jd
krf|�|d t|j� |j t �
| �� qf|� � d S ) Nr� c S s g | ]}|j r|j�qS r5 )rp r� r� r5 r5 r6 rL g r8 z1_chistedit_state.render_rules.<locals>.<listcomp>r s potential conflict in %sr� r� r� r? r, ) r� r� rx r3 r@ r� r Zbytestrr� r� r� �
COLOR_WARNr� r� r� rp r~ � COLOR_BLACKr� �COLOR_ROLL_SELECTED�COLOR_SELECTEDro �COLOR_ROLL_CURRENT�
COLOR_CURRENTZA_BOLD�
COLOR_ROLLr� rq rr r� )
rb Zrulesscr�startrp r� r� r� Zrule_posr� Z rollcolorr5 r5 r6 � render_rulesd sL
�
�
�z _chistedit_state.render_rulesFc C s� |� � \}}t|d t|��}td|�D ]�}|| }|r�|r`|d dkr`|�|d|t�t�� q�|r�|d dkr�|�|d|t�t�� q�|� d�r�|�|d|t�t
�� q�|�|d|� q(|�|d|� q(|� � d S )Nr; r � +� -s @@ ) r| �minr3 r� r~ r� r� �COLOR_DIFF_ADD_LINE�COLOR_DIFF_DEL_LINErs �COLOR_DIFF_OFFSETr� ) rb r �output�
diffcolorsr� r� r� r� r� r5 r5 r6 �
render_string� s$ ��
z _chistedit_state.render_stringc C s8 | j t d }| j t d }| j|||d � dd� d S )Nr� �
patchcontentsT)r� )r� r� r� )rb r r� Zcontentr5 r5 r6 � render_patch� s z _chistedit_state.render_patchc s� | j }� tjdfv rtS � }� dur@d� kr8dkr@n nd}| j\}}t| �|td �|��}|du rpdS |dv r�t|d t| j �d �}| �
||� | j dus�|dkr�| � ||� �n�|d v �rt
d
|d �}| �
||� | j dus�|d k�r�| � ||� �n�|d k�r"| j|d
d� �n||dk�r>| j|dd� �n`|dk�rn| j du �rX|nd| _ | �| j � �n0|dk�r�t� �t| j � k �r�dk�r�n nBt� fdd�| j D ��}| �
||j � | j du�r�| � ||j � n�|�d��r| �||dd� � n�|dk�r&| �|tk�r tn|� nx|dk�rJ| �|tk�rBtn|� nT|dk�rXtS |dk�rftS |d k�rttS |d k�r�tS |d k�r�tS |d k�r�t S dS ) z�Change state based on the current character input
This takes the current state and based on the current character input from
the user we change the state.
s
KEY_RESIZENrc � 9rI )rV rX r; rX )rW rY r rY rJ T)�nextrK FrU rZ rG c 3 s | ]}|j t� �kr|V qd S r1 )rn r� r� ��chr5 r6 r� � r8 z)_chistedit_state.event.<locals>.<genexpr>s action-rD rM rN rL r' rd re rf rg ) ro r� Z
KEY_RESIZE�E_RESIZEr� �KEYTABLEr� r� r3 rx � move_cursorr� �swapr� � cycle_action�make_selectionr� r� rs �
change_action� change_moder� � MODE_HELP�E_QUIT�
E_HISTEDIT�
E_PAGEDOWN�E_PAGEUP�
E_LINEDOWN�E_LINEUP) rb r� �oldposZ lookup_ch�curmodeZprevmoder� �newposZnewruler5 r� r6 �event� sh
�
0
z_chistedit_state.eventc C s� | j }| j| �| j� }tj|j|ddd�dd�}ddi}|jj|dd��$ |�|j � |�
� W d � n1 st0 Y |j |j � � �
� S )NTs status)s patchs template)Zbuffered)r, s verboser' )�source)rX rx r� ro r ZchangesetdisplayerrQ r� Zshowr� r� Zhunkr� r� )rb rX r� Z displayerr� r5 r5 r6 �patch_contents� s � &z _chistedit_state.patch_contentsc C sr || _ | j\}}|tkr`| jt }||d k r8||d< n(||d | j d kr`|| j d |d< d| jt d< dS )z�Change the rule/changeset that the cursor is pointing to, regardless of
current mode (you can switch between patches from the view patch window).r� r; r N)ro r� r� r� r� r� )rb r� r� r� r Z modestater5 r5 r6 r� � s
z _chistedit_state.move_cursorc C s2 | j \}}||f| _ |tkr.| �� | jt d< d S )Nr� )r� r� r� r� )rb r� r� r r5 r5 r6 r� s
z _chistedit_state.change_modec C s
|| _ d S r1 )r� )rb ro r5 r5 r6 r� s z _chistedit_state.make_selectionc C s� | � |�}| � |�}| j}|| || ||< ||< ||| _||| _t||�}t||�}t�||d �D ](}|| �|| � || �|| � ql| jr�| � |� dS )zWSwap two positions and calculate necessary conflicts in
O(|newpos-oldpos|) timer; N)
r� rx ro r� r� r r� rx r� r� ) rb r� r� Z old_rule_posZ new_rule_posrx r� �endr� r5 r5 r6 r� s
�
z_chistedit_state.swapc C s || j | _dS )z?Change the action state on the given position to the new actionN)rx r� )rb ro r� r5 r5 r6 r� 2 s z _chistedit_state.change_actionc C sH | j | j}t�|�}|r$|d7 }n|d8 }| �|t|tt� � dS )zUChanges the action state the next or the previous action from
the action listr; N)rx r� �KEY_LISTr� r� r3 )rb ro r� �currentr� r5 r5 r6 r� 7 s
z _chistedit_state.cycle_actionc C s� | j \}}|tkrdS | j| }t|d �}| j}|dkr>|nd}d|d | }|d | } |d || }
tdt| |
��|d< dS )z�Change the region of whatever is being viewed (a patch or the list of
changesets). 'delta' is an amount (+/- 1) and 'unit' is 'page' or 'line'.Nr� � pager; r� r )r� r� r� r3 r� r� r� ) rb Zdelta�unitr� r Z
mode_stateZ num_linesr� Z num_pagesZ
max_offset�newliner5 r5 r6 � change_viewF s
z _chistedit_state.change_viewN)F)F)r� r� r� rc r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r5 r5 r5 r6 r� � s$ 1
/
>
r� c C s z t �� W n t jy Y n0 t �tt jt j� t �tt jt j� t �t t jt j
� t �t t jt j � t �t
t jt j� t �tt j d� t �tt jd� t �tt jd� t �tt jd� t �tt jt j� t �tt jt j� zt �d� W n t j�y Y n0 dd� }t| ||�}d }|�� |�� |j\}}|tk�rL|� t � |� |�}|t k�rddS |t k�rt|j!S |t"k�r�t#� } | |�$� k�r�t j%| � |�&� }
|j\} }| |k�r�|
d d |_'|�(|j)|j)� d\} }
||
d | |
�\}} }
||
d | |
�\}} }
||
d | |
�\}} }
|t*t+t,t-fv �r�|t*k�rJ|�.d
d � nF|t+k�rb|�.dd � n.|t,k�rz|�.d
d � n|t-k�r�|�.dd � |�/� |�/� |�/� | t0k�r�|�1|� n4| t2k�r�|�3|t4�5� �6� � n|�7|� |�8|� |�9|� t �:� t;�<|�=� �}�q.d S )
Nr� r c S s. t �| d | d ||�}|| d 7 }|||fS r )r� Znewwin)�sizer� r� r r5 r5 r6 � drawvertwinq s z#_chisteditmain.<locals>.drawvertwinFr� )r r rN r� r; r� s line)>r� Zuse_default_colorsr Z init_pairr� Z COLOR_WHITEZ
COLOR_BLUEr� r� r� Z COLOR_YELLOW�COLOR_OKZ COLOR_GREENr� Z
COLOR_MAGENTAr� r� Z COLOR_REDr� r� r� r� Zcurs_setr� r� Zrefreshr� r� r� r� r� r� r� rx r� rl r| Z
resizetermr� r� r� ro r� r� r� r� r� Zeraser� r� r� r� �__doc__r� r� r� r� r� Zdoupdater Z
strtolocalZgetkey)rX rx r� r� r r� ZoldmodeZunused�er� Zsizesr� r� r� ZhelpwinZmainwinZ commitwinr5 r5 r6 �_chisteditmainV s�
�
r� c C sB t du rt�td���d| _�z
|�d�}|�dg �dd� }t�|� t�|� |� |� |s~t
� | |�}|dur~|� |� t
|�dkr�t�td���t|�dt�||���}t
|�dkr�t�td���|d �� }|j�� } t||| |�}|�s
t�td
�t|� ��g }
t|�D ] \} } |
� t| || | �� �qt�� �$ t � t � t ||
��}
W d � n1 �sl0 Y t � � t �!� |
d u �r�| �"td �� W d S t#|
�tu �r&| �$td
�� t%|
�}
|�&dd��0}|
D ]} |�"| � �q�|j'|d< W d � n1 �s 0 Y t(| |||�W S W n t)�y< Y n0 dS )z�interactively edit changeset history via a curses interface
Provides a ncurses interface to histedit. Press ? in chistedit mode
to see an extensive help. Requires python-curses to be installed.Ns Python curses library requiredrf � revr; �/ histedit requires exactly one ancestor revision�
roots(%ld)�9 The specified revisions must have exactly one common rootr �* %s is not an ancestor of working directoryFs histedit aborted
s performing changes
s chistedits w+� commandsr� )*r� r r� r Z
_colormoder� r
�checkunfinished�
bailifchangedrC r
� desthisteditrB r3 �
InputErrorr� r� r �revranger� r� r� �betweenr r� rm r Z
with_lc_ctype�wrapper� functools�partialr� ZechoZendwinr~ �typer8 r{ rr �name�
_texthistedit�KeyboardInterrupt)rQ rX �freeargsr� rY r9 �
defaultrev�rr�rootrZ rx r� r� �rcrw r5 r5 r6 �
_chistedit� sh
� ��
�
4
*r� r8 r� s* read history edits from the specified files FILErQ � continues$ continue an edit already in progress� edit-plans edit remaining actions listr\ rf s, don't strip old nodes after edit is complete� aborts abort an edit in progress� o� outgoings# changesets not found in destination� forces. force outgoing even for unrelated repositoriesr� s first revision to be editeds REVs) [OPTIONS] ([ANCESTOR] | --outgoing [URL]))Z helpcategoryc O s@ t �|�}| �d�dkr2t|�tkr2t| |||�S t| |||�S )a<
interactively edit changeset history
This command lets you edit a linear series of changesets (up to
and including the working directory, which should be clean).
You can:
- `pick` to [re]order a changeset
- `drop` to omit changeset
- `mess` to reword the changeset commit message
- `fold` to combine it with the preceding changeset (using the later date)
- `roll` like fold, but discarding this commit's description and date
- `edit` to edit this changeset (preserving date)
- `base` to checkout changeset and apply further changesets from there
There are a number of ways to select the root changeset:
- Specify ANCESTOR directly
- Use --outgoing -- it will be the first linear changeset not
included in destination. (See :hg:`help config.paths.default-push`)
- Otherwise, the value from the "histedit.defaultrev" config option
is used as a revset to select the base revision when ANCESTOR is not
specified. The first revision returned by the revset is used. By
default, this selects the editable history that is unique to the
ancestry of the working directory.
.. container:: verbose
If you use --outgoing, this command will abort if there are ambiguous
outgoing revisions. For example, if there are multiple branches
containing outgoing revisions.
Use "min(outgoing() and ::.)" or similar revset specification
instead of --outgoing to specify edit target revision exactly in
such ambiguous situation. See :hg:`help revsets` for detail about
selecting revisions.
.. container:: verbose
Examples:
- A number of changes have been made.
Revision 3 is no longer needed.
Start history editing from revision 3::
hg histedit -r 3
An editor opens, containing the list of revisions,
with specific actions specified::
pick 5339bf82f0ca 3 Zworgle the foobar
pick 8ef592ce7cc4 4 Bedazzle the zerlog
pick 0a9639fcda9d 5 Morgify the cromulancy
Additional information about the possible actions
to take appears below the list of revisions.
To remove revision 3 from the history,
its action (at the beginning of the relevant line)
is changed to 'drop'::
drop 5339bf82f0ca 3 Zworgle the foobar
pick 8ef592ce7cc4 4 Bedazzle the zerlog
pick 0a9639fcda9d 5 Morgify the cromulancy
- A number of changes have been made.
Revision 2 and 4 need to be swapped.
Start history editing from revision 2::
hg histedit -r 2
An editor opens, containing the list of revisions,
with specific actions specified::
pick 252a1af424ad 2 Blorb a morgwazzle
pick 5339bf82f0ca 3 Zworgle the foobar
pick 8ef592ce7cc4 4 Bedazzle the zerlog
To swap revision 2 and 4, its lines are swapped
in the editor::
pick 8ef592ce7cc4 4 Bedazzle the zerlog
pick 5339bf82f0ca 3 Zworgle the foobar
pick 252a1af424ad 2 Blorb a morgwazzle
Returns 0 on success, 1 if user intervention is required (not only
for intentional "edit" command, but also for resolving unexpected
conflicts).
r' s curses)r Z byteskwargsZ interface�_getgoal�goalnewr� r� )rQ rX r� r� r5 r5 r6 �histedit� s
r c C sx t |�}|�� �T}|�� �,}||_||_t| ||||� W d � n1 sL0 Y W d � n1 sj0 Y d S r1 )rU r] r\ � _histedit)rQ rX r� r� r r] r\ r5 r5 r6 r� � s
r� s newc C s. | � d�rtS | � d�r tS | � d�r*tS tS )Nr� r� � edit_plan)r� � goalcontinue� goalabort� goaleditplanr )r� r5 r5 r6 r � s
r c C st |dkr>| � d�� | j�� W d � S 1 s20 Y n2t|d��}|�� W d � S 1 sf0 Y d S )Nr� r' s rb)ZtimeblockedsectionZfinrn r )rQ r� r} r5 r5 r6 � _readfile� s
* r c
C sl t |dd �}|r$|jr$t�td���|�d�}|�d�} |�d�}
|�d�} | rb|sbt�td���|dkr�t||
|||| f�r�t�td ���n�|dkr�t||||| f�r�t�td
���n�|d kr�t|||f�r�t�td ���n�|�r|r�t�td
���t|�dk�rht�td���nT|� |� t|�dk�rLt
� | |�} | d u�rL|� | � t|�dk�rht�td���d S )N�mqs source has mq patches appliedr� r r� r� s$ --force only allowed with --outgoingr� s$ no arguments allowed with --continues! no arguments allowed with --abortr� s1 only --commands argument allowed with --edit-plans$ no revisions allowed with --outgoingr; s. only one repo argument allowed with --outgoingr r� )
r Zappliedr r r r� r� �anyr3 rC r
r� rB )
rQ rX r� r� �goalrx r9 r �outgZeditplan�abortr5 r� r5 r5 r6 �
_validateargs� sL
���
�r c sf | � d|�}|�� t|�}|�dg �}| �dd� }|�dd�} |�dd�|_t| � |||| |� d}
|r�t�� |�}� fd d
�|D �} | D ]"} d d
� | � � D �}
|
s�t
|
�}
q�|
r�| j t d �d
d�r�t
�t d���|tkr�|�� t| ||�}nL|tk�rt| � || � d S |tk�r.t| � ||d� d S t| � ||||� t| � |� t| � ||� |�� d S )Nr' r� r� �
backup-bundler� r8 rf Fc s g | ] }� | �qS r5 r5 r4 r r5 r6 rL � r8 z _histedit.<locals>.<listcomp>c S s g | ]}|d kr|�qS )s tipr5 )rJ �tagr5 r5 r6 rL � r8 s{ warning: tags associated with the given changeset will be lost after histedit.
do you want to continue (yN)? $$ &Yes $$ &Nor; r% s histedit cancelled
��nobackup)� formatterZ startitemr r� rP rY r r r� �tagsr3 Z promptchoicer r Z
CanceledErrorr rn �bootstrapcontinuer �_edithisteditplanr �_aborthistedit� _newhistedit�_continuehistedit�_finishhisteditr� )rQ rX r r� r� �fmr r9 r rx Zhastagsr� r� r r5 r r6 r � sJ
��
r c C sp |j dd� }tt||dd� dg ��D ]0\}\}}|jdkr*|r*|jdkr*t|j | _q*|�� d}| �dd�r~|�d�}| j t
d�t
d�t |j �d�}|�� t �
|��� |j �r$|j|d � |j d
} |j| �� d � | �d | j| �� f � | �� \}
} |
�� |_|j�| � |j �d
� q�W d � n1 �s:0 Y W d � n1 �sZ0 Y |�� dS )
z�This function runs after either:
- bootstrapcontinue (if the goal is 'continue')
- _newhistedit (if the goal is 'new')
Nr; r r' r+ s editings changes)r� �total)r| r )�items histedit: processing %s %s
)rG r� �ziprp r* r r~ rP � transactionZ makeprogressr r3 r ZacceptinterventionZ incrementr� r r� r� r[ ra rC �pop) rQ rX r rG �idxr� Znextactr| Zprogress�actobjr# Z replacement_r5 r5 r6 r s0 (
�
�
Nr c s� t �||j � t|�\}}}}|r�t�|�D ]r\}} | sN| �dt|� � q.| �dt|�t| d �f � t| �dkr.d}
| dd� D ]} | �|
t| � � q�q.|j s�|r�t
||j |� ni }|D ]} | |v r�d|| < q�|� � j
jj��fdd �|�� D �}t�||d
� |j�|j� |j} | � �fd d �t�|�D �d d
d�}
|j|
d� |�� tj�|�d���rzt� |�d�� |j �d��r�|j � d� dS )z7This action runs when histedit is finishing its sessions histedit: %s is dropped
s histedit: %s is replaced by %s
r r; s' histedit: %sNr5 c s4 i | ],\}}� |�rt � fd d�|D ��r||�qS )c 3 s | ]}� |�V qd S r1 r5 �rJ r& ��has_noder5 r6 r� V r8 z-_finishhistedit.<locals>.<dictcomp>.<genexpr>r� )rJ �kr4 r$ r5 r6 �
<dictcomp>S s �z#_finishhistedit.<locals>.<dictcomp>r' c s0 i | ](\}}�|�� �fd d�|D �dd��qS )c s g | ] }� |��qS r5 r5 r# )�hfr5 r6 rL ^ r8 z._finishhistedit.<locals>.<dictcomp>.<listcomp>s node)r� r5 )rJ ZoldnZnewn)�flr( r5 r6 r' ] s �s oldnodes newnodes)r: �value)� nodechangess undo� histedit-last-edit.txt) r� r� r[ �processreplacementr � iteritemsr r r3 rY �movetopmostbookmarksrZ �
unfiltered� changelogr� r% �itemsr Z cleanupnodesZhexfuncZ
formatlistZ
formatdictrm r� �osr� rj Zsjoinr� rr )rQ rX r r �mapping�tmpnodesZcreatedZntm�prec�succs�mr& �fdr+ r5 )r) r% r( r6 r 3 sV ��
� �� r c C sP �z>�z |� � t|�\}}}}| �dt|j� � |j|vr�|jr�|j�|j�}t� | |�}t
� | ||�} |� d��(}
t
j|| |
dd| d� W d � n1 s�0 Y t�|� |�� �d|j||B �r�tj||jddd� t| |||d � t| |||d � W n. t�y4 |�� �r.| �td
�� � Y n0 W |�� n
|�� 0 d S ) Ns restore wc to old parent %s
s histedit.abortr' s bundle:)r� �urls parents() and (%n or %ln::)T)Z
show_statsr� r sr warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up
)rn r- r r rZ r^ rr r@ r Zopenpathr Z
readbundler r Z applybundler3 rw r0 r9 r[ Zclean� cleanupnode� Exceptionr� r� r r� ) rQ rX r r �__Zleafsr5 r^ r} �genr| r5 r5 r6 r m sD �$
�
��
r c C s� t |�}| �dd� }|�� �T}|�� �,}||_||_t| |||d� W d � n1 sZ0 Y W d � n1 sx0 Y d S )Nr� r r )rU rP r] r\ r )rQ rX r r r] r\ r5 r5 r6 �hgaborthistedit� s r? c s� |� � |s6t| t|j�t|j��}t� | |j|�}n
t| |�}t||�}� fdd�|jD �}t | � |||� ||_|�
� d S )Nc s g | ]}|j r� |j �qS r5 r �rJ �actr r5 r6 rL � r8 z%_edithisteditplan.<locals>.<listcomp>) rn rT r r[ rZ �
ruleeditorrG r rl �warnverifyactionsr~ )rQ rX r rx �commentrG r� r5 r r6 r � s �
r c s* |� d�}|� dd�}|� d�}t�� � t�� � � j�� } |rf|rP|d }
nd }
t| � |
||�} n>t� �dt �
� |���} t | �dkr�t �
td���| d �� } t� | | �j�}|s�t �
td �t| � ��� fd
d �|D �}
� d }� d g}|
d �� g|
D ]N}z tj� |||d
d
d
d
d� W n( t j�yN t �td�| ��Y n0 �q|�s�t| t| �t| ��}�fdd �|D �}t� | ||�}n
t| |�}t|��}t| � |�|
� � | �� �� }|�_ |�_ | �_ g �_ | j ddt |�t |�d� d }t!�"� t!j#��s t$�%� |g| g| d�}|�_&d S )Nr� r� r8 r� r r� r; r� r� c s g | ] }� | �qS r5 r5 r� r r5 r6 rL � r8 z _newhistedit.<locals>.<listcomp>r� F)Z branchmerger5 Z acceptremoteZ followcopiess> untracked files in working directory conflict with files in %sc s g | ]}t � |��qS r5 )r r� �r r5 r6 rL � r8 r' s %d actions to histedit
)Zhistedit_num_actions)'r� r
r� r� r� r� r> r� r� r r� r3 r r� r r� r� rY r r� Zcalculateupdatesr� r rT rB r rl rC r[ rG rZ ra �logr � isenabled�createmarkersoptr Z backupbundler^ )rQ rX r r9 r� r� r rx r5 rZ r: r� r� r� ZwctxZancsr rD rG r[ r^ r5 )rX r r6 r � s�
�� �
�
���
��r c C s | � � p
d}|r |�� d }|S )Nr8 r )r� r� )r� r� r5 r5 r6 � _getsummary s rI c C sr |j }tj�|�}t�|� |jrn|j�d�}t|�rL|� � t|�rLt
� |� � \}}|� � |_
|j�|� |S r� )rX �
mergestatemodr rn r ZcheckunresolvedrG r r r� r r� r� r[ ra rC )rQ r r� rX �msr" r# ra r5 r5 r6 r s
r c C sN | � d||�}|r>|s>t�| |d� | � d|�r>t�td���t�| jj |�S )zoselect and validate the set of revision to edit
When keep is false, the specified set can't have children.s %n::%nr s (%ld) and merge()s( cannot edit history that contains merges)
r9 r Zprecheckr r r r Zmaplistr1 r� )rX �oldr rY r9 r5 r5 r6 r� 3 s �r� c C s� | j �dd��rt�� }|D ]�}| |j }t|�}|�dd�d �� }d} |�d�r�|dd � }|t t
B t B v r�||_ |t
|�d d� �� }
ttt�|���D ]4\} } | | j }
t|
�}||
kr�d
} | �|� q�q�| s g ||< q g }t�|�D ]\} } |�| � || 7 }q�d �d d
� |D ��}|d7 }||7 }|j||�� ddi| jdd�}| �dd��}|�|� W d � n1 �s~0 Y |S )zeopen an editor to edit rules
rules are in the format [ [act, ctx], ...] like in state.rules
r# r$ r� r; r F� !Nr� Tr/ c S s g | ] }|� � �qS r5 )r� r@ r5 r5 r6 rL h r8 z ruleeditor.<locals>.<listcomp>s
s prefixr' )Zrepopathr� r, s wb)rQ rP r Zsortdictr� rI r> �lower�endswithrM rN rO rp r3 �lstrip�reversedr� r r. rB r@ r� �usernamer� rr r~ )rX rQ rG Z editcommentZnewactrA r� r� ZfwordZaddedZtsumZnarK ZactxZasumrx r} r5 r5 r6 rB A sL
� *rB c C s� dd� dd� | � � D �D �} g }| D ]b}d|vrBt�td�| ��|�dd�\}}|tvrlt�td�| ��t| �||�}|�|� q$|S ) z@Read the histedit rules string and return list of action objectsc S s g | ]}|r|� d �s|�qS )� #)rs rI r5 r5 r6 rL ~ s �z parserules.<locals>.<listcomp>c s s | ]}|� � V qd S r1 )r� r� r5 r5 r6 r� � r8 z parserules.<locals>.<genexpr>r� s malformed line "%s"r; s unknown action "%s")r� r r� r r> r< r� rB )rx r rG r� rp rq r� r5 r5 r6 rl | s � rl c C sF zt |||� W n0 tjy@ |j�d�r:| �td�� � Y n0 d S )Nr, s= warning: histedit rules saved to: .hg/histedit-last-edit.txt
)�
verifyactionsr r� rr rj r� r )rQ rX rG r r� r5 r5 r6 rC � s ��rC c s
dd� |D �}t � }d}| rB| d jdv rBt�td�| d j ��| D ],}|�|||� |}|jdurF|�|j� qFt|| �}� j j
� dd�r�t | �dkr�tjtd �td
�d ��� fd d
�|D �}|| dd�< n4|�rtjtd�t
|d � td�t
|d � d ��dS )z�Verify that there exists exactly one action per given changeset and
other constraints.
Will abort if there are to many or too few rules, a malformed rule,
or a rule on a changeset outside of the user-given range.
c S s h | ] }|� � �qS r5 r r r5 r5 r6 r � r8 z verifyactions.<locals>.<setcomp>Nr )r, r s$ first changeset cannot use verb "%s"r' r( s no rules provideds% use strip extension to remove commitsr� c s g | ]}t � |��qS r5 )r0 r# rE r5 r6 rL � r8 z!verifyactions.<locals>.<listcomp>s missing rules for changeset %ss@ use "drop %s" to discard, see also: 'hg help -e histedit.config')r� rp r r� r r� r� r rA rX rQ rP r3 r ) rG r r� r� r� r� r� r Zdropsr5 rE r6 rT � s< �
��
��rT c C s� t �| t j�s|S | �� }|jjj}| j}t|�}dd� |D �}t � j
|� }t|�}|r�|� � } || �du }
|j �
| d�} |
r�| s�|�| df� | D ]@} | d }
|�| |
f� |
D ] }||vr�|�|� |�|� q�q�qT|S )a Adjust replacements from obsolescence markers
Replacements structure is originally generated based on
histedit's state and does not account for changes that are
not recorded there. This function fixes that by adding
data read from obsolescence markersc S s g | ] }|d �qS )r; r5 r� r5 r5 r6 rL � r8 z1adjustreplacementsfrommarkers.<locals>.<listcomp>Nr5 r; )r rG rH r0 r1 r� �get_rev�obsstorer� r� �unionr Z
successorsr� rB r )rX ZoldreplacementsZunfirU rV ZnewreplacementsZoldsuccsZ seensuccsZ succstocheckr& r ZmarkersZmarkerZnsuccsZnsuccr5 r5 r6 � adjustreplacementsfrommarkers� s2
�
rX c C s� t | j| j�}t� }t� }i }|D ]<}|�|d � |�|d � |�|d t� ��|d � q"|| }||@ }t|�}i } |r�t|�D ]Z}
||
} t| �D ]2} | |v r� q�q�| | v r�| �| � | �| | � q�| | |
< |�|
� q�q||D ]
}
| |
= q�| jj j
j }| � � D ]\}} t
| |d�| |< �q
|�rDt
|| jj jd�d }n4| �sPd}n(| jj j}| jt
| |d�d �� �� }| |||fS )z�process the list of replacements to return
1) the final mapping between original and created nodes
2) the list of temporary node created by histedit
3) the list of new commit created by histeditr; r r9 r� N)rX rX ra r� r� r �
setdefaultr� rw r1 r� rU r2 rA r� r� r� )r ra ZallsuccsZreplacedZ fullmappingZrepr r5 Z toproceed�finalr� r7 �sr& rU r6 �
newtopmostr� r5 r5 r6 r- � sF
r- c C s� |r|s dS | � |�}|r�| �� �j | �d��@}| j}g }|D ]}|�||f� q>|�| ||� W d � n1 st0 Y W d � n1 s�0 Y dS )z�Move bookmark from oldtopmost to newly created topmost
This is arguably a feature and we may only want that for the active
bookmark. But the behavior is kept compatible with the old version for now.
Nr' )r� r\ r Z
_bookmarksrB r� )rX Z
oldtopmostr\ Z oldbmarksr| ZmarksZchangesr� r5 r5 r6 r/ 0
s
r/ c s� |� � �j |�� }|jjj� t� fdd�|D ��}dd� |�d|�D �}|rd| }tj| |||d� W d � n1 sx0 Y dS )zdstrip a group of nodes from the repository
The set of node to strip may contains unknown nodes.c 3 s | ]}� |�r|V qd S r1 r5 r# r$ r5 r6 r� N
r8 z cleanupnode.<locals>.<genexpr>c S s g | ] }|� � �qS r5 r r r5 r5 r6 rL O
r8 z cleanupnode.<locals>.<listcomp>r6 )�backupN) r\ r0 r1 r� r% rA r� r r� )rQ rX Znodesr r= r] r5 r$ r6 r; B
s
r; c O s� t |t�r|g}t|�}|�� rj|�� dd� |jD �}|t|�@ }|rjt�t d�d�
dd� |D �� ��| |||g|�R i |��S )Nc S s h | ]}|j r|j �qS r5 r )rJ r� r5 r5 r6 r [
s z stripwrapper.<locals>.<setcomp>s$ histedit in progress, can't strip %sr0 c s s | ]}t |�V qd S r1 )r )rJ r� r5 r5 r6 r� b
r8 z stripwrapper.<locals>.<genexpr>) �
isinstancer} rU r� rn rG r� r r� r r@ ) ZorigrQ rX Znodelist�argsr� r Zhistedit_nodesZ common_nodesr5 r5 r6 � stripwrapperU
s
� ��r` s stripc C sN t |�}|�� sd S |�� |jrJ| �td�| �td�d�t|j� � d S )Ns! hist: %s (histedit --continue)
s %d remainings histedit.remaining)rU r� rn rG r~ r Zlabelr3 )rQ rX r r5 r5 r6 � summaryhookj
s ���ra c C s& t j�dt� tjddddtd� d S )Nr' rW T)�fnameZ allowcommitZ continueflagZ abortfunc)r
Z summaryhooksr ra r_ Z
addunfinishedr? )rQ r5 r5 r6 �extsetupz
s �rc )F)FF)NFN)N)F)r8 )F)�r� Z
__future__r rj rk � ImportErrorr� r3 rh Zmercurial.i18nr Zmercurial.pycompatr r Zmercurial.noder r r Z mercurialr r
r r r
r r r r r r r r r� r rJ r r r r r r r r r_ r Zmercurial.utilsr r! r" ru ZcmdtableZcommandZ configtableZ
configitemZ
testedwithr< r� rM rN rO r
rT �objectrU r� r� r� r r r r� r r� r r� r* r- r0 r= r> r� r� rt r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� r� rl rm r{ r� r� r� r� r� r� Z
formatteroptsZCATEGORY_CHANGE_MANAGEMENTr r� r r r r r r r r r r r r? r r rI r r� rB rl rC rT rX r- r/ r; r` Z wrapfunctionra rc r5 r5 r5 r6 �<module> s� ;
d
�������3
L
�
��
�� �
�
� �� �-?
z_D������
m
00,:
- a
;-&>