File: //lib64/python2.7/site-packages/hgext/histedit.pyc
�
Hq�Qc
@ s
d Z y d d l Z Wn e k
r5 d d l Z n Xd d l Z d d l Z d d l m Z d d l m Z d d l m Z d d l m
Z
d d l m Z d d l m Z d d l m
Z d d
l m Z d d l m Z d d l m Z d d
l m Z d d l m Z d d l m Z d d l m Z i Z e j e � Z d Z e d � Z d � Z d � Z d � Z d � Z d � Z d � Z! d � Z" d � Z# d � Z$ d e& i d � Z' i
e d 6e d 6e d 6e d 6e! d! 6e! d" 6e# d# 6e# d$ 6e$ d% 6e$ d& 6Z( e d' d( d) d( e d* � f d+ d, e& e d- � f d. d/ e& e d0 � f d( d1 e& e d2 � f d3 d4 e& e d5 � f d! d6 e& e d7 � f d8 d9 g e d: � f g e d; � � d< � � Z) d= � Z* d> � Z+ d? � Z, d@ � Z- dA � Z. dB � Z/ dC � Z0 dD � Z1 dE � Z2 d S(F s` 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
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# f, fold = use commit, but fold into previous commit (combines N and N-1)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
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
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# f, fold = use commit, but fold into previous commit (combines N and N-1)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
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. 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. You'll be prompted for a
new commit message, but the default commit message will be the
original message for the ``edit`` ed revision.
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.
i����N( t cmdutil( t discovery( t error( t copies( t context( t hg( t lock( t node( t repair( t scmutil( t util( t obsolete( t merge( t _t internals& # Edit history between %s and %s
#
# Commands:
# p, pick = use commit
# e, edit = use commit, but stop for amending
# f, fold = use commit, but fold into previous commit (combines N and N-1)
# d, drop = remove commit from history
# m, mess = edit message without changing commit content
#
c s% � j � � � � � f d � } | 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 have its own separated logic because its handling is a bit
different and not easily factored out of the fold method.
c s� � j j d d � } zY � j j d d � � | j d i � j � } � j � | d <| | d <� j | � SWd � j j | � Xd S( Nt phasess
new-committ extrat histedit_source( t uit backupconfigt setconfigt gett copyt hext committ
restoreconfig( t kwargst phasebackupR ( t phasemint repot src( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt
commitfunc� s
( t phase( R R R ( ( R R R s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt
commitfuncfor� s
c C s | j j � d } | j � j � | k rY t j | | | | t j f d t �d } n� zV | j j
d d | j d d � � t j
| | j � t t t | j � j � � } Wd | j j
d d d � X| j | t j � | j j � t j | | j � | j � j � � | S( s@ Merge changeset from ctx (only) in the current working directoryi t allR t
forcemerget toolt N( t dirstatet parentst p1R R t revertt nullidt Truet NoneR R R t mergemodt updatet Falset
setparentst writet duplicatecopiest rev( R R t ctxt optst wcpart stats( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt applychanges� s % "
%c s� t | j d | � � � } | s% d
S| j � d � t � } x! | D] } | j | j � � qE Wt j | � � � � � f d � } g | D] } | | � s� | ^ q� } � j � � � � � f d � } | j d � r� | d }
n | j
� }
| j d � } | j d � } | j d � }
| j � j � | j
� j � f } t j | d | d
|
d | d | d | d | d |
�} t j | | g � | _ | 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::%di c s� | � j � k rw � j | � } | � j � k rp � j | � } | j � | j � k oo | j � | j � k St Sn | � j � k Sd S( N( t manifestt filectxt datat flagsR/ ( t ft at b( t baset last( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt samefile� s c
sx | � k rk � | } | j � } t j | j � | j � d d | k d d | k d � j | � �} | St � � d S( Nt islinkt lt isexect xt copied( R< R t
memfilectxt pathR; R t IOError( R R4 RI t fctxR< t mctx( RG t headmfRA ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt filectxfn
s
t messaget usert dateR R' t textt filesRN N( t listt setR, R' R. RS R t
pathcopiesR9 R t descriptionR( R t p2R t memctxR t commitforceeditort _textt commitctx( R t firstRA t
commitoptst ctxsRS R4 RB R= RN RO RP RQ R R' t new( ( R@ RG RM RA s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt collapse� s:
%
$ c
C s8 | | } | j � d | k r; | j d | � | g f St j | | j � � t | | | | � } | r� | d d k r� t j t d � � � n t | | � } | d | j
� d | j � d | j � d | j
� � } | d k r| j t d � t j | � � | g f S| | } | | j � | f f g f S(
Ni s node %s unchanged
i s0 Fix up the change and run hg histedit --continueRR RP RQ R s %s: empty changeset
( R' t debugR R. R R8 R t InterventionRequiredR
R! RW RP RQ R R, t warnR (
R R R4 t haR5 t oldctxR7 R t nR` ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt pick) s"
c C sL | | } t j | | j � � t | | | | � t j t d � � � d S( Ns| Make changes as needed, you may commit or record as needed now.
When you are finished, run hg histedit --continue to resume.( R R. R R8 R Rc R
( R R R4 Re R5 Rf ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt edit? s
c
C s� | | } t j | | j � � t | | | | � } | rc | d d k rc t j t d � � � n | j d d | d | j � d | j � d | j
� � } | d k r� | j t d � t j
| � � | g f St | | | | | | g � S(
Ni i s0 Fix up the change and run hg histedit --continueRR s fold-temp-revision %sRP RQ R s %s: empty changeset( R R. R R8 R Rc R
R RP RQ R R, Rd R t
finishfold( R R R4 Re R5 Rf R7 Rg ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt foldG s
c C s& | j � d j � } t j | | � | j � } | j � | j � k rY | j � } n | j � } | | d <d j | j � g g | D] }
| |
j � ^ q� | j � g � d } | | d <t | j
� | j
� � | d <| j � j � } d | j � | j � f | d <| | d <| j
j d
d � }
zN t | j � | j � � } | j
j d
d | � t | | | | | � } Wd | j
j |
� X| d k r�| g f St j | | � | j � | f f | j � | f f | | f f g } x$ | D] } | j | | f f � q�W| | | f S( Ni RP s
***
s
RO RQ s %s,%sR R R s
new-commit( R' R R R. R RP t usernamet joinRW t maxRQ R R R R R R Ra R R, t append( R R R4 Rf t newnodeR5 t internalchangest parentR^ Rl t rt
newmessageR R R Rg t replacementst ich( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyRj V s<
-
c C s | | | j � d f g f S( N( ( R ( R R R4 Re R5 ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt drop� s c
C s | | } t j | | j � � t | | | | � } | rc | d d k rc t j t d � � � n | j � d } | j | | j � � } t
| | � } | d | d | j � d | j � d | j
� � } | | }
| j � |
j � k r |
| j � | f f g f S|
g f S( Ni i s0 Fix up the change and run hg histedit --continues
RR RP RQ R ( R R. R R8 R Rc R
RW Ri Rl R! RP RQ R ( R R R4 Re R5 Rf R7 RO R R` t newctx( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyRO � s
$
c C s� | j | p d | p d � } t j | d � d \ } } | j t d � t j | � � t j | | | d � \ } } t j | | | � } | r� g | D] } | j
| � ^ q� } n t j | | | d | �}
|
j
s� t j t d � � � n |
j
d S( sV utility function to find the first outgoing changeset
Used by initialisation codes default-pusht defaulti s comparing with %s
t forces no outgoing ancestorsi N( t
expandpathR t parseurlR, t statusR
R
t hidepasswordt
addbranchrevst peert lookupR t findcommonoutgoingt missingt Abort( R R t remoteRz R5 t destt revst checkoutt otherR3 t outgoing( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt findoutgoing� s % t pRh t eRi R= Rk t dRw t mt messt histeditR% t commandss+ Read history edits from the specified file.t ct continues$ continue an edit already in progresst kt keeps, don't strip old nodes after edit is completet aborts abort an edit in progresst oR� s# changesets not found in destinationRz s. force outgoing even for unrelated repositoriesRs R3 s first revision to be editeds [PARENT]c + s- t � d d � } | r9 | j r9 t j t d � � � n | j d � } | j d � } | j d � } | j d � } | j d d � } | j d g � }
d
} | r� | r� t j t d � � � n | r t j | | |
| | f � r t j t d � � � n d } n| rKt j | |
| | f � rBt j t d
� � � n d } n� t j j
t j j � j d � � r�t j t d � � � n | r�|
r�t j t d � � � n t | � d k rt j t d � � � qn7 |
j
| � t |
� d k rt j t d � � � n | d k r�t � � \ } } }
} } � j j � \ } } � | } t | � | | | � \ } } | j
| � n| d k r8t � � \ } } }
} } t � | � \ } } } } | j d t j | � � t j � | � t | � d | � t | � d | � t j t j j � j d � � d St j � � � j j � \ } } | r�| rs| d } n d } t | � | | | � } n" |
d } t j � | � j � } | j d t � }
t � | | |
� }
|
st j t d � t j | � � � n g |
D] } � | ^ q} | s�d j g | D] } t! | � ^ q8� } | d 7} | t" t j | � t j | � f 7} | j# | | j$ � � } t% � j d � d � } | j& | � | j' � n: | d k r�t( j) } n t% | � } | j* � } | j' � g d � | j+ � D� D]# } | r | d d! k r | ^ q } t, | � | � } � | j � d } | j d t � }
g } x� | rt- � | j � | |
| | � | j. d � \ } }! | j d" | |! f � t/ | }" |" | � | |! | � \ } }# | j
|# � q�Wt j0 � | j � � t � | � \ } } }$ }% | rx� | j1 � D]� \ }& }' |' s�| j d# t j |& � � qV| j d$ t j |& � t j |' d � f � t |' � d k rVd% }( x/ |' d D] }) | j |( t j |) � � q�WqVqVWn |
s�| r(t2 | � | | |% � n t3 j4 r�g }* xW t5 | d& � j6 j7 �D]= }& | |& }' |* j8 � |& t9 � f d' � |' D� � f � qPW|* r�t3 j: � |* � q�q�t | � d( | � n t | � d | � t j t j j � j d � � t j j
� j; d) � � r)t j � j; d) � � n d S(* s) interactively edit changeset history
t mqs source has mq patches appliedR� R� R� Rz R� R% R3 R` s$ --force only allowed with --outgoings$ no arguments allowed with --continues! no arguments allowed with --aborts histedit-states; history edit already in progress, try --continue or --aborts$ no revisions allowed with --outgoingi s. only one repo argument allowed with --outgoings- histedit requires exactly one parent revisions restore wc to old parent %s
t createdt tempNi R� s* %s is not an ancestor of working directorys
s
s histedit-last-edit.txtt wt -c s s | ] } | j � Vq d S( N( t strip( t .0Rs ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pys <genexpr>( s t #s histedit: processing %s %s
s histedit: %s is dropped
s histedit: %s is replaced by %s
s' histedit: %st keyc 3 s | ] } � | Vq d S( N( ( R� t s( R ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pys <genexpr>R s t replacedt undo(< t getattrR, t appliedR
R� R
R t anyt osRI t existsRm t lent extendt readstateR& R' t bootstrapcontinuet processreplacementRb R t shortR t cleant cleanupnodet unlinkR t
bailifchangedR� R t revsingleR/ t betweent makedesct editcommentRi Rl t openR1 t closet syst stdint readt
splitlinest verifyrulest
writestatet popt actiontableR. t iteritemst
movebookmarksR t _enabledt sortedt changelogR3 Ro t tuplet
createmarkerst sjoin(+ R R t freeargsR5 R� t outgt contR� Rz t rulesR� t goalt
parentctxnodeR� t topmostRu t
currentparentt wantnullt parentctxt replt mappingt tmpnodest leafst _ntmt emptyR� t rootRs R_ R� R= RD t actionRe t actfunct replacement_R� t ntmt prect succsR� Rg t markers( ( R s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� � s�
$
(
&
#
$(
$ c C s~ | j d � \ } } | | } g | j d | � D] } | j � ^ q2 } | j � t j k r� | s� t d � }
t d � | } t j |
| d | �� n | j d � n d } | j � d \ }
} } } |
s� | s� | s� | r�| d k r d | } n | j � d
} | d k r(t
j } n t } t
| | � } | d | d | j � d | j � d | j � d | � } | d k r�| j | � q�n g } | j � | k r�| j | j � t | � f � n | d k r]| r8| d k r�| d } n
| j � t | | | | | | | � \ } } | j | � qt| j | j � | j � f f � n | rt| | d } n | | f S( Ni s (%d::.)s* %s is not an ancestor of working directorysA update to %s or descendant and run "hg histedit --continue" againt hinti R= Rk s fold-temp-revision %ss
R� Ri R� R� RR RP RQ R t editori����( R= s fold( R� s editR� R� ( R= s fold( R� RU R R* R
R
R� R, R} RW R RZ R/ R! RP RQ R Ro R� Rj R� ( R R R� R� R5 R� t currentnodeR4 R� t newchildrent msgR� R` R� R> Rs R� RO R� R Ru R� ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� ^ sP
+
"
%c C s� t | j d | | � � } | r� | r� t j r_ | j d | | � r_ t j t d � � � n | d } | j � s� t j t d � | � � q� n g | D] } | j � ^ q� S( so select 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+ cannot edit history that would orphan nodesi s# cannot edit immutable changeset: %s(
RT RU R R� R� R
R� R
R R ( R t oldR` R� R_ R� R� ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� � s
c C sN t t j j | j d � d � } t j | | | | | f | � | j � d S( Ns histedit-stateR� ( R� R� RI Rm t picklet dumpR� ( R t
parentnodeR� R� R� Ru t fp( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� � s ! c C s+ t t j j | j d � � } t j | � S( sI Returns a tuple of (parentnode, rules, keep, topmost, replacements).
s histedit-state( R� R� RI Rm R� t load( R R� ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� � s c C sL d } | j � r+ | j � j � d } n d | | j � | f } | d S( sl build a initial action line for a ctx `c`
line are in the form:
pick <hash> <rev> <summary>
R% i s
pick %s %d %siP ( RW R� R3 ( R� t summaryt line( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� � s
c C s� g } t d � | D� � } t � } xB| D]:} d | k rZ t j t d � | � � n | j d d � \ } } | j � j d d � d } y t | | � } Wn- t j k
r� t j t d � | � � n X| | k r� t j t d � � � n | | k r t j t d � | � � n | j | � | t
k rSt j t d � | � � n | j | | g � q, Wt | | � }
|
r�t j t d
� |
d d t d � �� n | S(
s� Verify that there exists exactly one edit rule per given changeset.
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 | ] } t | � Vq d S( N( t str( R� R� ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pys <genexpr>� s t s malformed line "%s"i i s unknown changeset %s listeds1 may not use changesets other than the ones listeds# duplicated command for changeset %ss unknown action "%s"s missing rules for changeset %sR� s# do you want to use the drop action?(
RU R
R� R
t splitR� R� R t RepoErrort addR� Ro R� ( R� R R_ t parsedt expectedt seenRs R� t restRe R� ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� � s4
c C s� t � } t � } i } xT | D]L } | j | d � | j | d � | j | d t � � j | d � q W| | } | | @} t | � } i } x� | r-x� t | � D]{ }
| |
} xh t | � D]C } | | k r� Pq� | | k r� | j | � | j | | � q� q� W| | |
<| j |
� q� Wq� Wx | D]
}
| |
=q5W| j j } x3 | j � D]% \ } } t | d | j
�| | <q_W| r�t | d | j j �d } n; | s�d } n, | t | d | j j �d j
� j � } | | | | f S( 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 i R� i����N( RU R. R� t
setdefaultRT t removeR� t nodemapt itemsR� R R3 R, R( R ( R Ru t allsuccsR� t fullmappingt repR` R� t toproceedt finalRF R� R� Rg t nmR� t
newtopmost( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� � sB
(
,c C sQ | s
d Sg } x� t | j j � � D]� \ } } | | k rW | j | | f � q& n | } | j | d � } | d k r� q& n x5 | s� | | j � j � } | j | | f � } q� W| j | | d f � q& W| rM| j }
xZ | D]R \ } } |
| } | j t d � | t j
| � t j
| � f � | |
| <q� W|
j � n d S( s, Move bookmark from old to newly created nodeNi����s, histedit: moving bookmarks %s from %s to %s
( R� t
_bookmarksR� Ro R R, R( R t noteR
R� R1 ( R R R� t
oldtopmostR t movest bkR� R@ R` t markst mark( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� $ s. "
#c C s� | j d | d j g | D] } t j | � ^ q � f � d } z� | j � } | j j } g | D] } | | k rd | ^ qd } g | j d | � D] } | j � ^ q� } x! | D] } t j
| | | � q� WWd t j | � Xd S( sd strip a group of nodes from the repository
The set of node to strip may contains unknown nodes.s should strip %s nodes %s
s , s
roots(%ln)N(
Rb Rm R R� R, R R� R� RU R R� t lockmodt release( R R t namet nodesRg R R R� t roots( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyR� F s 3 %+
(3 t __doc__t cPickleR� t ImportErrorR� R� t mercurialR R R R R R R R
R R R R
R R R- t mercurial.i18nR
t cmdtablet commandt
testedwithR� R! R8 Ra Rh Ri Rk Rj Rw RO R, R/ R� R� R� R� R� R� R� R� R� R� R� R� ( ( ( s4 /usr/lib64/python2.7/site-packages/hgext/histedit.pyt <module>� s�
F +
� B
! ; "