�
1�3\c@@s�dZd
dl
mZ
d
dlZd
dlmZ
d
dlmZmZm	Z	m
Z
mZmZm
Z
mZmZmZmZmZmZmZmZmZmZmZmZmZmZ
d
dlmZ
ej Z ej!Z!iZ"ej#e"�
Z#iZ$ej%e$�
Z%e%ddd	e&�

e%d
dd	d�

e%d
dd	e&�

e%d
d
d	d�

e%d
dd	e&�

dZ(iZ)e*�Z+e*�Z,e*�Z-e*�Z.d�Z/de0f
d��YZ1de0f
d��YZ2d�Z3d�Z4e&d�
Z5d�Z6d�Z7e&e&d�Z8e8ddged�
de9�
de2f
d ��Y�
Z:e8d!d"ged#�
de9�
d!e2f
d$��Y�
Z;e8d%d&ged'�
�d%e2f
d(��Y�
Z<e8d)d*ged+�
�d)e2f
d,��Y�
Z=e8d-g
ed.�
d/e9�
d-e<f
d0��Y�
Z>e8d1d2ged3�
�d4e<f
d5��Y�
Z?e8d6d7ged8�
�d6e2f
d9��Y�
Z@e8d:d;ged<�
de9�
d=e2f
d>��Y�
ZAde&dd?�ZBe#d
d@dAd@edB�
edC�
fdDdEe&edF�
fd@dGe&edH�
fdIdJe&edK�
fd@dLe&edM�
fdNdOe&edP�
fd&dQe&edR�
fd2dSgedT�
edU�
fgejCedV�
dWe#jD�
dX��
ZEdEZFdLZGdGZHdYZIdZ�ZJd[�ZKd\�ZLd]�ZMd^�ZNd_�ZOe&d`�
ZPda�ZQdb�ZRdc�ZSdd�ZTde�ZUd@df�
ZVdg�ZWdh�ZXdi�ZYdj�ZZdk�Z[dl�Z\e&dm�
Z]dn�Z^ej_edoe^�
dp�Z`dq�ZadS(rs�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 stop for amending
 #  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 stop for amending
 #  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

``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

i(
tabsolute_importN(
t
_(tbundle2tcmdutiltcontexttcopiestdestutilt	discoveryterrortexchanget
extensionsthgtlocktmerget	mergeutiltnodetobsoletetpycompatt	registrartrepairtscmutiltstatetutil(
t
stringutiltexperimentalshistedit.autoverbtdefaultthisteditt
defaultrevtdropmissingtlineleniPtsingletransactionsships-with-hg-corec	@s�td
�
}g��f
d�}x2t
t�
t
t�
t
t�
D]}||�

qBW�jd�

g}|jdd�r�|jd�

n||
|fjd�
�|}djg|D]}|r�d|nd	^q��
S(
s� 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
@s�t|}
|
j
jd
�
}t|
j�
rOdjt|
jdd��

�
}n�jd||df�

�jg|dD]}d^q{�

dS(	Ns

s, tkeyc

S@s
t|�
S(
N(
tlen(
t
v((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt<lambda>
ts %s = %sii
s  %s(	tactiontabletmessagetsplitR tverbstjointsortedtappendtextend(R!t
atlinest
l(
tactions(s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytaddverb
s




$

R#RRsKDeleting a changeset from the list will DISCARD it from the edited history!s

s# %s
s#
(	R
R)tprimaryactionstsecondaryactionsttertiaryactionsR*t
configboolR&R((	tuitfirsttlasttintroR0R!thintsR-R.((
R/s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytgeteditcomment�s	






!t
histeditstatecB@sheZ
dddddddd�Zd
�Zd�Zdd�
Zd�Zd�Zd�Z	d�Z
RS(	c		C@s�|
|_||_
||_||_||_||_||_d|_t	j
|
d
�|_|dkrug|_n	||_dS(Nshistedit-state(
trepoR/tkeepttopmostt
parentctxnodeRtwlocktNonet
backupfiletstatemodtcmdstatetstateobjtreplacements(	tselfR<R?R/R=R>RFRR@((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt__init__)
s	
	
	
	
	
	
	
	


c
C@s�|jj
�s+tj|jtd
�
�
n|j�}
|
d|_t|
d|�}||_	|
d|_
|
d|_|
d|_|
d|_
dS(	s;Load histedit state from disk and set fields appropriately.RR?trulesR=R>RFRBN(REtexistsRtwrongtooltocontinueR<R
t_readR?t
parserulesR/R=R>RFRB(RGtdataR/((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytread9
s



	






c
C@s�|jj
jd
�
}
|
jd�
rK|j�}|\}}}}}}n*tj|
�
}|\}}}}}d}djg|D]\}	}
d|	|
f^q��
}i|d6|d6|d6|d6|d	6|d
6S(Nshistedit-statesv1
s

s%s %sR?RIR=R>RFRB(	R<tvfsROt
startswitht_loadtpickletloadsRAR((RGtfpRNR?RIR=R>RFRBtverbtrest((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRLH
s






2

cC@sT|
r%|
jd
d|j
dd�

n+|jjd
d��}|j
|�

WdQXdS(Nshistedit-statetlocationtplaint
w(
shistedit-state(taddfilegeneratort_writeR<RP(RGttrt
f((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytwriteW
s




cC@sB
|
jd
�

|
jdt
j|j�
�

|
jdt
j|j�
�

|
jd|jr_dnd�

|
jdt|j�
�

x(|jD]}|
jd|j��

q�W|
jdt|j	�
�

xL|j	D]A}|
jdt
j|d�
dj
d	�|d
D�
�
f�

q�W|j}|s-
d}n|
jd|�

dS(Nsv1
s%s
tTruetFalses%d
s%s%s
iR#c
s@s|]}
tj
|
�
V
qdS(
N(Rthex(t.0t
r((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys	<genexpr>i
s
i
(R_RRbR?R>R=R R/ttostateRFR(RB(RGRUtactiontreplacementRB((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR\_
s




 





%

	

	
c
C@s|jj
d
d�}
g|
j�D]}|d ^q"}d}||
|d7}tj||�
}|d7}tj||�
}|d7}||dk}|d7}g}t||�
}	|d7}xRtj|	�
D]A}
||}|d7}||}|d7}|j||f�

q�Wg}
t||�
}|d7}x�tj|�
D]}
||}tj|d �
}gt	dt
|�
d�D] }
tj||
|
d!�
^q�
}|
j||f�

|d7}qI
W||}|d7}|
j�
|||||
|fS(Nshistedit-stateRdi����ii
R`i((R<RPt	readlinesRtbintintRtxrangeR*trangeR tclose(RGRUR.R-tindexR?R>R=RItrulelent
it
ruleactiontruleRFtreplacementlenRgtoriginaltsuccRB((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRRp
sD

#






























<





c

C@s&|j�r"|j
jjd
�

ndS(Nshistedit-state(t
inprogressR<RPtunlink(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytclear�
s

c

C@s|jj
jd
�
S(Nshistedit-state(R<RPRJ(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRv�
s
N(t__name__t
__module__RARHRORLR_R\RRRxRv(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR;(
s
	
				/	thisteditactioncB@sqeZ
d�Zed
��
Zd�Zd�Zd�Zd�Zd�Z	d�Z
d�Zd	�Zd
�Z
RS(cC@s"|
|_|
j
|_
||_dS(
N(RR<R(RGRR((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRH�
s
	

cC@s�|j�j
d
d�d}ytj|�
}Wnutk
r�


y4tj|
j|�}|j�}tj|�
}Wq�t	j
k
r�


t	jtd�
|�
�
q�Xn
X||
|�S(sLParses the given rule, returning an instance of the histeditaction.
        t
 i
isinvalid changeset %s(
tstripR&RRit	TypeErrorRt	revsingleR<RbRtRepoLookupErrort
ParseErrorR
(tclsRRrtruleidtrevt_ctxtrulehash((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytfromrule�
s








!
cC@sv|j}t
j|j
�
}tj||�|_
|j
dkr_tjtd
�
|d �
�
n|j	|
||�
dS(s* Verifies semantic correctness of the rulesunknown changeset %s listediN(
R<RRbRtresolvehexnodeidprefixRARR�R
t_verifynodeconstraints(RGtprevtexpectedtseenR<tha((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytverify�
s	



 
cC@s�|j|krLt
jtd
�
|jtj|j�
fdtd�
�

�
n|j|kr�t
jtd�
tj|j�
�
�
ndS(Ns%%s "%s" changeset was not a candidatethintsonly use listed changesetss#duplicated command for changeset %s(RRR�R
RVtshort(RGR�R�R�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��
s




c
C@sr|j|j
}
t|
�
}d
|j|
|
j�|f}|jjjdd�}t|d�}tj	||�S(s{build a histedit rule line for an action

        by default lines are in the form:
        <hash> <rev> <summary>
        s%s %s %d %sRRi(
R<Rt_getsummaryRVR�R5t	configinttmaxRtellipsis(RGtctxtsummarytlinetmaxlen((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyttorule�
s



c

C@sd
|jt
j|j
�
fS(s�Print an action in format used by histedit state files
           (the first line is a verb, the remainder is the second)
        s%s
%s(RVRRb(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRe�
sc


C@s|j�
|j
�
|j�S(
snRuns the action. The default behavior is simply apply the action's
        rulectx onto the current parentctx.(tapplychanget
continuedirtyt
continueclean(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytrun�
s



c
C@s�|j}
|
|j
}|
jjd
tdt�
tj|
|jjdt�

t	|
j|
|i�}|
j
j|j��

|j
r�|
jj�}|
jj|�

tjtd�
|jt
j|j
�
fdtd�
�

�
n
|
jj�
dS(slApplies the changes from this action's rulectx onto the current
        parentctx, but does not commit them.Rtlabeledt
quietemptysFix up the change (%s %s)R�s hg histedit --continue to resumeN(R<RR5t
pushbufferR`RtupdateRR?tapplychangestdirstatet	setbranchtbranchtunresolvedcountt	popbufferR_RtInterventionRequiredR
RVR�(RGR<trulectxtstatstbuf((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��
s	






	



	

c
C@sr|j}
|
|j
}|j�}t|
|�}|d
|j�d|j�d|j�d|j�d|�
dS(s�Continues the action when changes have been applied to the working
        copy. The default behavior is to commit the dirty changes.ttexttusertdatetextrateditorN(R<Rtcommiteditort
commitfuncfortdescriptionR�R�R�(RGR<R�R�tcommit((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�s	



c


C@stS(
s1The editor to be used to edit the commit message.(
Ra(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�sc
C@s�|jd
}
|
j
�|jjkrg|jjjtd�
t
j|j
�
�

|
|j
t�fg
fS|
j
�|j
kr�|
gfS|
|j
|
j
�f
fg
fS(s�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.t
.s$%s: skipping changeset (no changes)
(	R<RRR?R5twarnR
R�ttuple(RGR�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�s







(RyRzRHtclassmethodR�R�R�R�ReR�R�R�R�R�(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR{�
s
										c@s%�j����
�fd
�}|S(s=
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@sli
�d6}
�
jj
|
d��D
|jdi�j�}�j�|d<||d<�
j|�SWdQXdS(Ntphasess
new-commitRR�thistedit_source(R�s
new-commit(R5tconfigoverridetgettcopyRbR�(tkwargst	overridesR�(tphaseminR<tsrc(s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt
commitfunc+s







(
tphase(R<R�R�((R�R<R�s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR� s

cC@s�|
jj
�d
}|j�j�|krktj||
||tjfdt�

tj	d
d
d
d
�}njzM|
j
jdd|jdd�d�
tj
|
||j�ddg�}Wd	|
j
jdddd�
X|S(
s@Merge changeset from ctx (only) in the current working directoryitallR5t
forcemergettoolR#RtlocalN(R�tparentstp1RRtreverttnullidR`tmergemodtupdateresultR5t	setconfigR�tgraft(R5R<R�toptstwcparR�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�4s
%


(
c@st|j
d
|
j��j���
}|s1dSxE|D]=}|j�s8tjtd�
tj	|j��
�
�
q8q8W|
j
�d}t
�}x!|D]}	|j|	j��

q�Wt
j|���g|D]!}
tj|
�|�s�|
^q�}�j��
��
�fd�}|jd�
r3
|d}n|
j�}|jd�
}
|jd�
}|jd�
}|
j�j�|
j�j�f}d}|s�
tjd	td
d�}ntj|d|d
|d|d|d|
d|d|d|�
}|j|�
S(s�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::%ds!cannot fold into public change %sic@su|�
krq�|}|j�}t
j||
|j�|j�d
d|kdd|kd�j|�
�}|SdS(NtislinkR.tisexect
xtcopied(tflagsRt
memfilectxtpathRNR�RA(R<R�R�tfctxR�tmctx(R�theadmftlastctx(s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt	filectxfnfs










R%R�R�R�teditteditforms
histedit.foldR�R�tfilesR�R�N(tlisttsetR�RAtmutableRR�R
RR�R�R�R�Rt
pathcopiesRtsamefiletmanifestR�R�R�tp2tgetcommiteditorR`Rtmemctxt	commitctx(R<tfirstctxR�t
commitoptst
skipprompttctxst
ctbaseR�R�R^R�R%R�R�R�R�R�tnew((R�R�R�s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytcollapseFsF
'






)
	


.





$











	
c

C@s|dj
d
t�
S(Ntmissing(RAtdirtyR`(
R<((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt
_isdirtywc�s
cC@s%tj
td
�
dtd�
�

�
dS(Ns working copy has pending changesR�sYamend, commit, or revert them and run histedit --continue, or abort with histedit --abort(RtAbortR
(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt
abortdirty�s

c@s��
��fd
�}|S(Nc
@s��s�st�
�d
}
�r4t
j|
�

nE�rJtj|
�

n/t��
dkrltj|
�

n
tj|
�

|
|_�|_�
|_	x�D]}
|t
|
<q�W|S(Nii
(tAssertionErrorR1taddtinternalactionsR R2R3RVR'R%R$(R�RV(tinternalR%tpriorityR'(s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytwrap�s









	
	
	



((R'R%R�R�R�((R�R%R�R's4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRf�s
tpickt
ps
use commitR�c
B@seZ
d�ZRS(
c
C@sr|j|j
}
|
j�d
j
�|jjkr_|jjjdt
j|j
�
�

|
gfStt	|�j
�S(Nisnode %s unchanged
(R<RR�RR?R5tdebugR�tsuperR�R�(RGR�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��s


"
#

(RyRzR�(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��sR�t
es!use commit, but stop for amendingc
B@seZ
d�Zd
�ZRS(c
C@s}|j}
|
|j
}tj|
|jjd
t�

t|
j|
|i�
t	j
td�
t
j|j
�
dtd�
�

�
dS(NR�s5Editing (%s), you may commit or record as needed now.R�s hg histedit --continue to resume(
R<RRR�RR?R`R�R5RR�R
R�(RGR<R�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��s
	





	

c

C@stj
d
tdd�S(NR�R�s
histedit.edit(RR�R`(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��s
(RyRzR�R�(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��s	
tfoldR^s-use commit, but combine it with the one abovec
B@sGeZ
d�Zd
�Zd�Zd�Zd�Zd�Zd�ZRS(cC@s�tt
|�j|
||�
|j}|
sE||jj�d
}n |
jdkrXdS||
j}|j�s�tj	t
d�
tj|j��
�
�
ndS(s/ Verifies semantic correctness of the fold ruleiR�R�Ns!cannot fold into public change %s(R�R�(R

R
R�R<RR�RVR�RR�R
R�(RGR�R�R�R<R�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��s
	







c
	C@sj|j}
|
|j
}t|
|�}|d
dt
j|j
�
d|j�d|j�d|j��
dS(NR�sfold-temp-revision %sR�R�R�(R<RR�R�R�R�R�(RGR<R�R�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��s
	




c
C@sV
|j}
|
d
}|
|j
}|jj}|j
�|kr}|
jjtd�
t
j|j
�
�

||j
|f
fg
fS|
|}td�|
jd|j	�|j	��D�
�
}|s
|
jjtd�
t
j|j
�
t
j|�
f�

||j
|j
�f
fg
fS|j
�}|j|j
��

|j|
j|
|||j
�|�S(NR�s%s: empty changeset
c
s@s|]}
|
j�V
qdS(
N(
R(RcR�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys	<genexpr>�ss(%d::. - %d)sI%s: cannot fold - working copy is not a descendant of previous commit %s
(
R<RRR?R5R�R
R�R�R�R�tdiscardt
finishfold(RGR<R�R�R?t	parentctxt
newcommitst
middlecommits((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��s(
	











	


#


c


C@stS(
s�Returns true if the rule should skip the message editor.

        For example, 'fold' wants to show an editor, but 'rollup'
        doesn't want to.
        (
Ra(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR��sc


C@stS(
s�Returns true if the rule should merge messages of multiple changes.

        This exists mainly so that 'rollup' rules can be a subclass of
        'fold'.
        (
R`(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt
mergedescssc


C@stS(
s�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'.
        (
Ra(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt	firstdatescC@s+|j�d
j
�}tj||dt�

i}|j�|d<|j�s]|j�}	nJdj|j�g
g|D]}
||
j�^qv|j�g
�
d}	|	|d<|j	�r�|j
�|d<nt|j
�|j
��|d<|j�j
�}d|j�|j�f|d	<||d
<t|j�|j��}i
|d6}
|jj|
d
��*
t|||||d|j��
}WdQX|dkr�
|gfStj||dt�

|j
�|f
f|j
�|f
f||f
fg}x$|D]}|j||f
f�

q�
W|||fS(Nit	overwriteR�s
***
s

R%R�s%s,%sR�R�R�s
new-commitRR�(R�s
new-commit(R�RRt
updaterepoRaR�R	
R�R(R

R�R�R�R�RbR�R5R�R�R�RAR*(RGR5R<R�toldctxtnewnodetinternalchangestparentR�t
newmessageRdR�R�R�t
nRFtich((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR
s<



-




 

















(	RyRzR�R�R�R�R	
R

R
(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR
�s								R�t
bs:checkout changeset and apply further changesets from therec
B@s,eZ
d�Zd
�Zd�Zd�ZRS(c

C@sK|jd
j
�|j
krAtj|j|j
dtdt�
n|j�S(NR�tbranchmergetforce(R<RR�R�RaR`R�(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�?s

%
c


C@st�
dS(
N(
R�(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�Ds
c
C@s|jd
}
|
gfS(NR�(
R<(RGtbasectx((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�Gs


cC@sV|j|krRt
d
�
}tj||jtj|j�
fdt
d�
�

�
ndS(Ns.%s "%s" changeset was an edited list candidateR�s&base must only use unlisted changesets(RR
RR�RVR�(RGR�R�R�tmsg((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�Ks




(RyRzR�R�R�R�(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�;s			t
_multifoldsv
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
B@seZ
d�ZRS(
c


C@stS(
N(
R`(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�_s
(RyRzR�(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR
SstrollRds9like fold, but discard this commit's description and datetrollupc
B@s#eZ
d�Zd
�Zd�ZRS(c


C@stS(
N(
Ra(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR	
es
c


C@stS(
N(
R`(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�hs
c


C@stS(
N(
R`(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR

ks
(RyRzR	
R�R

(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR
bs		tdropt
dsremove commit from historyc
B@seZ
d�ZRS(
c
C@s,|j|j
j}
|
|jt�fg
fS(
N(R<RR?RR�(RGR
((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�qs

(RyRzR�(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR
nstmesst
ms3edit commit message without changing commit contentR%c
B@seZ
d�ZRS(
c

C@stj
d
tdd�S(NR�R�s
histedit.mess(RR�R`(
RG((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�ys
(RyRzR�(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR%uscC@sx
|d
kri}n|j
|p$d
|p-d�}tj|d
�d \}}|jtd�
tj|�
�

tj|
|
|d
�\}}tj	|
||�}	|r�g|D]}
|
j
|
�
^q�}ntj|
|	|d|�
}|j
s	
tjtd�
�
�
nt|
jd|j
��
}t|�
dkrf
td	�
}
td
�
}tj|
d|�

�
n|
|dj�S(sVutility function to find the first outgoing changeset

    Used by initialization codesdefault-pushRiscomparing with %s
R
sno outgoing ancestorss
roots(%ln)i
s&there are ambiguous outgoing revisionss&see 'hg help histedit' for more detailR�iN(RAt
expandpathRtparseurltstatusR
Rthidepasswordt
addbranchrevstpeertlookupRtfindcommonoutgoingR�RR�R�trevsR R(R5R<tremoteR
R�tdesttbranchesR(
tcheckouttotherR�toutgoingtrootsR
R�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytfindoutgoing|s$
	


 

%
	






R#tcommandss*read history edits from the specified filetFILER�tcontinues$continue an edit already in progresss	edit-plansedit remaining actions listt
kR=s,don't strip old nodes after edit is completetabortsabort an edit in progresst
oR.
s#changesets not found in destinationR
s.force outgoing even for unrelated repositoriesR�sfirst revision to be editedtREVs)[OPTIONS] ([ANCESTOR] | --outgoing [URL])thelpcategorycO@s_t|
�
}z8|
j
�|_
|
j�|_t||
|||�
Wd
t|j|j
�
Xd
S(s<
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).
    N(R;R@Rt	_histedittrelease(R5R<tfreeargsR�R((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�sr



R�c

C@s=|jd
�
rt
S|jd�
r&tS|jd�
r9tStS(NR3
R5
t	edit_plan(R�tgoalcontinuet	goalaborttgoaleditplantgoalnew(
R�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt_getgoals






cC@sX|
d
kr2|jd�
�
|j
j�SWdQXn"t|
d��}|j�SWdQXdS(Nt
-Rtrb(ttimeblockedsectiontfinROtopen(R5R�R^((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt	_readfiles




cC@sPt|
d
d�}|r9|jr9tjtd�
�
�
n|jd�
}	|jd�
}
|jd�
}|jd�
}|r�|	r�tjtd�
�
�
n|dkr�t|	|||||
f�
rLtjtd	�
�
�
qLnm
|dkr!
t|	||||
f�
rLtjtd
�
�
�
qLn+
|dkr]
t|	||f�
rLtjtd�
�
�
qLn�|j�r�
tjtd
�
�
�
n|	r�
|r�
tjtd�
�
�
nt	|�
dkrLtjtd�
�
�
qLnz|j
|�

t	|�
dkr"tj||
�}
|
dk	r"|j
|
�

q"nt	|�
dkrLtjtd�
�
�
ndS(Ntmqssource has mq patches appliedR.
R<
R5
R
s$--force only allowed with --outgoingR3
s$no arguments allowed with --continues!no arguments allowed with --aborts	edit-plans1only --commands argument allowed with --edit-plans;history edit already in progress, try --continue or --aborts$no revisions allowed with --outgoingi
s.only one repo argument allowed with --outgoingis/histedit requires exactly one ancestor revision(tgetattrRAtappliedRR�R
R�tanyRvR R+RtdesthisteditR*(R5R<RR;
R�tgoalRIR(
RH
toutgteditplanR5
R
R((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt
_validateargs&sD





























c
	O@s`
tj
|�
}|jd
|�}|j�
t|�
}|jdg�}|jdd�}|jdd�}	|jdt�|_t	||
|||||	|�
|t
kr�|j�
t|||�}nb|t
kr�t||
||	�
dS|tkr
t||
|d|�

dSt||
||||�
t||
|�
t||
||�
|j�
dS(	NRR�R5shistory-editing-backupR1
R#R=tnobackup(Rtbyteskwargst	formattert	startitemRA
R�R4RaR=RP
R=
ROtbootstrapcontinueR?
t_edithisteditplanR>
t_aborthisteditt_newhisteditt_continuehisteditt_finishhistedittend(
R5R<RR;
R�tfmRM
R(
RQ
RI((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR9
Ss,


















cC@s�
|j}xkt
t||d
d
g
��
D]I\}\}}|jdkr+|r+|jdkr+t|j|_q+q+W|j�
d
}|jdd�r�|
j	d�
}n|j
td�
dtd�
dt|j�
�
}|��
t
j|�
��
x�|jr�
|jd	|�

|jd
}	|jd|	j��

|jd|	j|	j�f�

|	j�\}
}|
j�|_|jj|�

|jjd
�

q�WWd
QXWd
QX|j�
d
S(s�This function runs after either:
    - bootstrapcontinue (if the goal is 'continue')
    - _newhistedit (if the goal is 'new')
    i
R
RRteditingtunittchangesttotalR]ititemshistedit: processing %s %s
N(R/t	enumeratetzipRARVR
t	__class__R_R4ttransactiontmakeprogressR
R Rtacceptinterventiont	incrementR�R
R�RR?RFR+tpop(R5R<RR/tidxRftnextactR]tprogresstactobjR
treplacement_((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRY
rs0


-
$















 c@sMtj
|
|jd
t�

t|�
\}}}}|r�x�|j�D]�\}}	|	ss|jdtj|�
�

qD|jdtj|�
tj|	d�
f�

t	|	�
dkrDd}
x/|	dD] }|j|
tj|�
�

q�WqDqDWn|j
s
|r
t|
|j|�
q
ni}x'|D]}||
kr&
d||<q&
q&
W|
j
�jj��f
d�|j�D�
}tj|
|d�
|j�
|j�|j}|��
fd	�|j�D�
d
ddd
�
}
|jd|
�

|j�
tjj|
jd�
�
r$tj|
jd�
�

n|
jjd�
rI|
jjd�

ndS(s7This action runs when histedit is finishing its sessionR
shistedit: %s is dropped
shistedit: %s is replaced by %s
ii
s'histedit:                            %sc
@sGi|]=\}
}|
�krt�f
d�|D�
�
r||
�qS(
c
3@s|]}
|
�kV
qdS(
N((RcR
(
tnodemap(s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys	<genexpr>�s(
R�(RcR4
R!(
Ro
(s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys
<dictcomp>�s		
Rc
@sJi|]@\}
}�g|D]}�
|�
^qdd
�

�
|
�
�qS(tnameR((RctoldntnewnR
(tflthf(s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys
<dictcomp>�s	
Rtoldnodetvaluetnewnodestnodechangestundoshistedit-last-edit.txtN((RR
R?Ratprocessreplacementt	iteritemsR
RR�R R=tmovetopmostbookmarksR>t
unfilteredt	changelogRo
titemsRtcleanupnodesthexfunct
formatlistt
formatdictRNRxtosR�RJtsjoinRwRP(R5R<RR\
tmappingttmpnodestcreatedtntmtprectsuccsR
R
tfdRx
((Rs
Rt
Ro
s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRZ
�sD



	
$



(	






	
	
	








c
C@s�
z�
yR
|j�
t
|�
\}}}}|jd
tj|j�
�

|j|
kr�|jr�|
jj|j�
}t	j
||�}tj|||�}	|
j
d�
�*}
tj|
|	|
dddd|�
WdQXtj|�

n|
j�jd|j||B�r(
t	j|
|jdtd	t�
nt||
|d
|�

t||
|d
|�

Wn6tk
r�



|j�r�
|jtd�
�

n�n
XWd|j�
XdS(Nsrestore wc to old parent %s
shistedit.aborttsourceRturlsbundle:sparents() and (%n  or %ln::)t
show_statsR�RQ
srwarning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up
(RORz
R
RR�R>RBRPR(RtopenpathR	t
readbundleRe
RtapplybundleR�
tremoveR}
R(
R?tcleanR`tcleanupnodet	ExceptionRvR�R
Rx(R5R<RRQ
t__tleafsR�
RBR^tgenR]((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRW
�s0




	








"





cC@s�|j�
|sUt
|tj|j�
tj|j�
�}t|
||j|�}nt||�}t	||�}g|jD]}|jr}|
|j^q}}t
||
|||�
||_|j�
dS(
N(ROR:RR�R?R>t
ruleeditorR/RG
RMtwarnverifyactionsR_(R5R<RRItcommentR/tactR�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRV
�s









)

	
cC@s�|jd
�
}|jdd�}|jd�
}t
j|
�

t
j|
�

|
jj�\}	}
|r�|rx|d}nd}t||
|||�}n^t|
j	dt
j|
|���
}
t|
�
dkr�t
jtd�
�
�
n|
dj�}t|
||	|j�}|s:
t
jtd	�
tj|�
�
�
ng|D]}|
|^qA
}|s�
t|tj|�
tj|	�
�}g|D]}t||�^q�
}t|
|||�}nt||�}t||�}t||
|||�
|
|j�dj�}||_||_|	|_g|_|jd
dt|�
dt|�
�

d}tj |
tj!�s�t"j#|
|g
|	g
|d
�}n||_$dS(
NR.
R1
R#R
is
roots(%ld)i
s9The specified revisions must have exactly one common roots*%s is not an ancestor of working directoryRs%d actions to histeditthistedit_num_actions(%R�Rtcheckunfinishedt
bailifchangedR�R�RAR0
R�R�RtrevrangeR RR�R
RtbetweenR=R�R:R�R�
RG
RMR�
R?R/R>RFtlogRt	isenabledtcreatemarkersoptRtbackupbundleRB(R5R<RR(
R;
R�RN
RIR
R>temptyR)
troottrrRdR�R�
R/R?RB((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRX
�sN










$






$
"


	
	
	
	





c
C@s/|j�pd
}
|
r+|
j
�d}
n|
S(NR#i(R�t
splitlines(R�R�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�2s


cC@s�|
j}t
jj|�
}tj|�

|
jr�|
jjd
�
}t|�
rr|j	�
t|�
rrt
�
qrn|j�\}}|j�|
_
|
jj|�

n|
S(Ni(R<R�t
mergestateRORtcheckunresolvedR/Ri
R�R�R�R�RR?RFR+(R5RR�R<tmsRm
R
RF((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRU
:s
	

	






cC@s�|jd
|
|�}|r�|r�t
j|t
j�re|jd||�retjtd�
�
�
n|jd|�r�tjtd�
�
�
n||j�}|j�s�tjtd�
|dtd�
�

�
q�nt	j
|jj|�S(	soselect and validate the set of revision to edit

    When keep is false, the specified set can't have children.s%n::%ns(%ld::) - (%ld)s?can only histedit a changeset together with all its descendantss(%ld) and merge()s(cannot edit history that contains mergess cannot edit public changeset: %sR�s see 'hg help phases' for details(
R(
RR�
tallowunstableoptRR�R
R6R�RtmaplistR~
R(R<toldR�R=R(
R�
((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�
Os










cC@s|jj
d
d�rx
tj�}x
|D]
}||j}t|�
}|jdd�dj�}t}	|j	d�
r$
|d }|t
tBtBkr$
||_
|t|�
dj�}
xett|j��
�
D]H\}}||j}
t|
�
}||
kr�t}	|j|�

Pq�q�Wq$
n|	s(g||<q(q(Wg}x4|j�D]#\}}|j|�

||7}qN
Wndjg|D]}|j�^q�
�
}|d	7}||7}|
j||
j�i
d
d6d|jd
d
�}|jdd��}|j|�

WdQX|S(seopen an editor to edit rules

    rules are in the format [ [act, ctx], ...] like in state.rules
    Rshistedit.autoverbR|i
it
!i����s

s

RtprefixtrepopathRfshistedit-last-edit.txttwbN(R5R4RtsortdictRR�R&tlowerRatendswithR1R2R3RVR tlstriptreversedR�R{
R`R*R(R�R�tusernameR�RPR_(R<R5R/teditcommenttnewactR�
R�R�tfwordtaddedttsumtnaR.tactxtasumRIR^((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�
asB











	%












(






cC@s�gd
�|j�D�
D]"}|r|j
d�
r|^q}g}x�|D]�}d|krztjtd�
|�
�
n|jdd�\}}|tkr�tjtd�
|�
�
nt|j|
|�}|j|�

qLW|S(sARead the histedit rules string and return list of action objects c
s@s|]}
|
j�V
qdS(
N(
R}(RcRd((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys	<genexpr>�st
#R|smalformed line "%s"i
sunknown action "%s"(	R�
RQRR�R
R&R$R�R*(RIRR.R/RdRVRWRf((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRM�s
"








cC@sZyt|||�
Wn?t
jk
rU


|
jjd
�
rO|jtd�
�

n�n
XdS(Nshistedit-last-edit.txts=warning: histedit rules saved to: .hg/histedit-last-edit.txt
(t
verifyactionsRR�RPRJR�R
(R5R<R/RR�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�
�s




c
C@s�
td
�|D�
�
}t�}d
}|ra|djdkratjtd�
|dj�
�
nxI|D]A}|j|||�
|}|jd
k	rh|j|j�

qhqhWt	||�
}|
j
jjdd�r:
t
|�
dkr
tjtd�
d	td
�
�

�
ng|D]}t|
|�^q
}	|	|d*nL|r�
tjtd�
tj|d�
d	td�
tj|d�
�

�
nd
S(s�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|]}
|
j�V
qdS(
N(
R(RcR�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys	<genexpr>�siR
R
s$first changeset cannot use verb "%s"RRsno rules providedR�s%use strip extension to remove commitssmissing rules for changeset %ss@use "drop %s" to discard, see also: 'hg help -e histedit.config'N(R
R
(R�RARVRR�R
R�RR�R)R<R5R4R R
R�(
R/RR�R�R�R�RfR�R
tdrops((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�
�s.
	











"




	cC@sS
tj
|tj�s|
S|j�}|jj}|j}t|
�
}g|
D]}|d
^qM}t�j	|�}t|�
}	x�|	rN
|	j
�}
|j|
�
dk}|j
j|
d�}|r�|r�|j|
df�

nxe|D]]}
|
d
}|j|
|f�

x7|D]/}||kr
|j|�

|	j|�

q
q
Wq�Wq�W|S(s
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 markersi
N(((RR�
R�
R}
R~
Ro
tobsstoreR�R�tunionRi
R�RAt
successorsR*R�(R<toldreplacementstunfitnmR�
tnewreplacementsRdtoldsuccst	seensuccstsuccstocheckR
R�tmarkerstmarkertnsuccstnsucc((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytadjustreplacementsfrommarkers�s.


	



	















c
C@st|j
|j�}
t�}t�}i}xT|
D]L}|j|d
�

|j|d�

|j|dt��j|d
�

q4W||}||@}t|�
}i}	x�|rB
x�t|�
D]{}
||
}xht|�
D]C}||kr�Pq�||	kr�|j|�

|j|	|�

q�q�W||	|
<|j|
�

q�Wq�Wx|D]
}
|	|
=qJ
W|j
j	j
}x3|	j�D]%\}}t|d|j
�

|	|<qw
W|r�
t|d|j
j	j�

d}nG|	s�
d}n8|j
j	j}|j
t|	d|�

dj�j�}|	|||fS(s�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 histediti
iRi����N(R�
R<RFR�R�R�t
setdefaultR�R�
R~
Ro
R
R)R�R�RAR�R(RRFtallsuccstreplacedtfullmappingtrepR�R�
t	toproceedtfinalR�R�
t
sR
R�
R�
t
newtopmostRd((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyRz
�sF
	
	




(





	














"
	
)cC@s�|
s|rd
S|j|
�
}|r�|j
��c
|jd�
�M}|j}g}x!|D]}|j||f�

q\W|j|||�
Wd
QXWd
QXnd
S(s�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(t
nodebookmarksRRe
t
_bookmarksR*R�(R<t
oldtopmostR�
t	oldbmarksR]tmarksR_
Rp
((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR|
6s





	




c
@s�|
j���
|
j
�}
|
jj�t�f
d
�|D�
�
}g|
jd|�D]}|j�^qT}|r�|}tj||
|d|�

nWdQXdS(sdstrip a group of nodes from the repository

    The set of node to strip may contains unknown nodes.c
3@s!|]}
|
�kr|
V
qdS(
N((RcR
(
R�
(s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys	<genexpr>Sss
roots(%ln)tbackupN(	RR}
R~
Ro
R)R�RRR}(R5R<tnodesRQ
R�R/
R�
((
R�
s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyR�
Gs


+


c	O@s�t|t
�r|g
}nt|�
}|j�r�|j�
d
�|jD�
}|t|�
@}|r�tjt	d�
dj
d�|D�
�
�
�
q�n||
||||�S(Nc
S@s"h|]}
|
jr|
j�qS((
R(RcRf((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys	<setcomp>_s	
s$histedit in progress, can't strip %ss, c
s@s|]}
tj
|
�
V
qdS(
N(RR�(RcR�((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pys	<genexpr>ds(t
isinstancetstrR;RvROR/R�RR�R
R((	torigR5R<tnodelisttargsR�Rthistedit_nodestcommon_nodes((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytstripwrapperYs












#
R}cC@slt|
�
}|j
�sdS|j�
|jrh|jtd
�
|jtd�
d�t|j�
�

ndS(Ns!hist:   %s (histedit --continue)
s%d remainingshistedit.remaining(R;RvROR/R_R
tlabelR (R5R<R((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytsummaryhookis





	

c

C@s^tj
jd
t�
tjjdtttd�
td�
g�

tj	jdtd�
g�

dS(NRshistedit-stateshistedit in progresss5use 'hg histedit --continue' or 'hg histedit --abort'shg histedit --continue(
RtsummaryhooksR�R�
tunfinishedstatesR*RaR`R
tafterresolvedstates(
R5((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pytextsetupts

	


	
(bt__doc__t
__future__RR�
tmercurial.i18nR
t	mercurialRRRRRRRR	R
RRR
R�RRRRRRRRRCRtmercurial.utilsRRSR:
tcmdtabletcommandtconfigtablet
configitemRaRAt
testedwithR$R�R1R2R3R�R:tobjectR;R{R�R�R�R�R�RfR`R�R�R
R�R
R
R
R%R0
t
formatteroptstCATEGORY_CHANGE_MANAGEMENTRR=
R>
R?
R@
RA
RG
RP
R9
RY
RZ
RW
RV
RX
R�RU
R�
R�
RMR�
R�
R�
Rz
R|
R�
R�
twrapfunctionR�
R�
(((s4/usr/lib64/python2.7/site-packages/hgext/histedit.pyt<module>�s�
�	
	









	
	
	
		-y		C		

	
	

	


v

	
	
	







	

	



	



	

!


l


				-		*	/!		6			5				&	#	=