File: //usr/lib/python2.7/dist-packages/hgext/histedit.pyc
Xc @@ s d Z d d l m Z d d l Z d d l Z d d l Z d d l m Z d d l 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 m Z m Z m Z m Z e j Z e j Z i Z e
j e Z d Z i Z e! Z" e! Z# e! Z$ e! Z% d Z& d e' f d YZ( d
e' f d YZ) d Z* d
Z+ e, d Z- d Z. d Z/ e, e, d Z0 e0 d d g e d d e1 d e) f d Y Z2 e0 d d g e d d e1 d e) f d Y Z3 e0 d d g e d d e) f d Y Z4 d e) f d YZ5 e0 d! g e d" d# e1 d! e4 f d$ Y Z6 e0 d% d& g e d' d( e4 f d) Y Z7 e0 d* d+ g e d, d* e) f d- Y Z8 e0 d. d/ g e d0 d e1 d1 e) f d2 Y Z9 d e, d d3 Z; e d4 d5 d6 d5 e d7 e d8 f d9 d: e, e d; f d5 d< e, e d= f d> d? e, e d@ f d5 dA e, e dB f dC dD e, e dE f d dF e, e dG f d& dH g e dI e dJ f g e dK dL Z< d: Z= dA Z> d< Z? dM Z@ dN ZA dO ZB dP ZC dQ ZD dR ZE dS ZF dT ZG dU ZH dV ZI dW ZJ dX ZK dY ZL d5 dZ ZM d[ ZN d\ ZO d] ZP d^ ZQ d_ ZR d` ZS da ZT db ZU e jV e dc eU dd ZW de ZX 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
#
# 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
# d, drop = remove commit from history
# m, mess = edit commit 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
#
# 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
# d, drop = remove commit from history
# m, mess = edit commit 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.
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
i ( t absolute_importN( t _( t bundle2t cmdutilt contextt copiest destutilt discoveryt errort exchanget
extensionst hgt lockt merget nodet obsoletet repairt scmutilt utils ships-with-hg-corec @ s t d } g f d } x2 t t t t t t D] } | | qB W j d g } | j d d r | j d n | | | f j d | } d j g | D] } | r d | n d ^ 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 j d } t | j rO d j t | j d d } n j d | | d f j g | d D] } d ^ q{ d S( Ns
s , t keyc S@ s
t | S( N( t len( t v( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt <lambda> s s %s = %si i s %s( t actiontablet messaget splitR t verbst joint sortedt appendt extend( R t at linest l( t actions( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt addverb s
$t t histeditt dropmissingsK Deleting a changeset from the list will DISCARD it from the edited history!s
s # %s
s #
( R R t primaryactionst secondaryactionst tertiaryactionsR t
configboolR R ( t uit firstt lastt introR# R t hintsR R! ( ( R" s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt geteditcomment s
!t
histeditstatec B@ sS e Z d d d d d d d d Z d Z d Z d Z d Z d Z RS( c C@ sm | | _ | | _ | | _ | | _ | | _ | | _ | | _ d | _ | d k r` g | _ n | | _ d S( N(
t repoR" t keept topmostt
parentctxnodeR t wlockt Nonet
backupfilet replacements( t selfR2 R5 R" R3 R4 R9 R R6 ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt __init__ s c
C@ s; y | j j j d } WnD t k
r_ } | j t j k rC n t j | j t d n X| j d r | j
} | \ } } } } } } n* t j | } | \ } } } } } d } | | _ d j g | D] \ }
} d |
| f ^ q } t | | } | | _ | | _ | | _ | | _ | | _ d S( s; Load histedit state from disk and set fields appropriately.s histedit-stateR% s v1
s
s %s %sN( R2 t vfst readt IOErrort errnot ENOENTR t wrongtooltocontinueR t
startswitht _loadt picklet loadsR7 R5 R t
parserulesR" R3 R4 R9 R8 (
R: t statet errt dataR5 t rulesR3 R4 R9 R8 t verbt restR" ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR= s( 2 c C@ sU | j j d d } | j d | j d t j | j | j d t j | j | j d | j | j d t | j x( | j D] } | j d | j
q W| j d t | j xL | j D]A } | j d t j | d d j d | d
D f q W| j
} | s6d } n | j d | | j d S( Ns histedit-statet ws v1
s %s
s %d
s %s%s
i R$ c s@ s | ] } t j | Vq d S( N( R t hex( t .0t r( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pys <genexpr>: s i ( R2 R< t writeR RN R5 R4 R3 R R" t tostateR9 R R8 t close( R: t fpt actiont replacementR8 ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRQ / s"
% c C@ s | j j d d } g | j D] } | d ^ q" } d } | | | d 7} t j | | } | d 7} t j | | } | d 7} | | d k } | d 7} g } t | | } | d 7} xO t | D]A }
| | } | d 7} | | } | d 7} | j | | f q Wg }
t | | } | d 7} x t | D] }
| | } t j | d } g t d t | d D] }
t j | |
|
d ! ^ q} |
j | | f | d 7} qCW| | } | d 7} | j
| | | | |
| f S( Ns histedit-stateRP ii i t Truei( ( R2 R< t readlinesR t bint intt xrangeR t rangeR RS ( R: RT R! R t indexR5 R4 R3 RJ t rulelent it
ruleactiont ruleR9 t replacementlenRV t originalt succR8 ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRC B sD #
<
c C@ s& | j r" | j j j d n d S( Ns histedit-state( t
inprogressR2 R< t unlink( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt clearq s c C@ s | j j j d S( Ns histedit-state( R2 R< t exists( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRe u s N( t __name__t
__module__R7 R; R= RQ RC Rg Re ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR1 s / t histeditactionc B@ sq 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
RS( c C@ s" | | _ | j | _ | | _ d S( N( RG R2 R ( R: RG R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR; z s c C@ sc | j j d d d } y t j | } Wn$ t k
rU t j d | n X| | | S( sL Parses the given rule, returning an instance of the histeditaction.
t i i s invalid changeset %s( t stripR R RY t TypeErrorR t
ParseError( t clsRG Ra t rulehasht rev( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt fromrule s
c C@ s | j } t j | j } y | | j | _ Wn1 t j k
re t j t d | d n X| j d k r | j | | | n d S( s* Verifies semantic correctness of the rules unknown changeset %s listedi N( R2 R RN R t RepoErrorRo R R7 t _verifynodeconstraints( R: t prevt expectedt seenR2 t ha( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt verify s c C@ s | j | k rL t j t d | j t j | j f d t d n | j | k r t j t d t j | j n d S( Ns% %s "%s" changeset was not a candidatet hints only use listed changesetss# duplicated command for changeset %s( R R Ro R RK t short( R: Rv Rw Rx ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRu s c C@ sx | j | j } t | } d | j | | j | f } | j j j d d d d } t | d } t j | | S( s{ build a histedit rule line for an action
by default lines are in the form:
<hash> <rev> <summary>
s %s %s %d %sR% t linelent defaultiP i (
R2 R t _getsummaryRK Rr R+ t configintt maxR t ellipsis( R: t ctxt summaryt linet maxlen( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt torule s c C@ s d | j t j | j f S( 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( RK R RN ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRR s c C@ s | j | j | j S( sn Runs the action. The default behavior is simply apply the action's
rulectx onto the current parentctx.( t applychanget
continuedirtyt
continueclean( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt run s
c C@ s | j } | | j } | j j d t d t t j | | j j d t t | j | | i } | r | d d k r | j j
} | j j | t j
t d | j t j | j f d t d n
| j j
d S(
sl Applies the changes from this action's rulectx onto the current
parentctx, but does not commit them.R t labeledt
quietemptyi i s Fix up the change (%s %s)R{ s hg histedit --continue to resumeN( R2 R R+ t
pushbufferRW R t updateRG R5 t applychangest popbufferRQ R t InterventionRequiredR RK R| ( R: R2 t rulectxt statst buf( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s
c C@ sr | j } | | j } | j } t | | } | d | j d | j d | j d | j d | d S( s Continues the action when changes have been applied to the working
copy. The default behavior is to commit the dirty changes.t textt usert datet extrat editorN( R2 R t commiteditort
commitfuncfort descriptionR R R ( R: R2 R R t commit( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s
c C@ s t S( s1 The editor to be used to edit the commit message.( t False( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s c C@ s | j d } | j | j j k rg | j j j t d t j | j | | j t f g f S| j | j k r | g f S| | j | j f f g f S( 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)
( R2 R RG R5 R+ t warnR R| t tuple( R: R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s
( Ri Rj R; t classmethodRs Rz Ru R RR R R R R R ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRk y s 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 has 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 } z\ j j d d d | j d i j } j | d <| | d < j | SWd j j | Xd S( Nt phasess
new-commitR% R t histedit_source( R+ t backupconfigt setconfigt gett copyRN R t
restoreconfig( t kwargst phasebackupR ( t phaseminR2 t src( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt
commitfunc s
( t phase( R2 R R ( ( R R2 R s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s
c C@ s | j j d } | j j | k rY t j | | | | t j f d t d } nj zM | j j
d d | j d d d t j
| | | j d d g } Wd | j j
d d d d X| S(
s@ Merge changeset from ctx (only) in the current working directoryi t allR+ t
forcemerget toolR$ R% t localN( t dirstatet parentst p1R R t revertt nullidRW R7 R+ R R t mergemodt graft( R+ R2 R t optst wcparR ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s % (c @ s t | j d | } | s% d SxE | D]= } | j s, t j t d t j | j q, q, W| j d } t } x! | D] } | j
| j q Wt j
| g | D]! }
t j |
| s |
^ q } j f d } | j d r'| d } n | j } | j d }
| j d } | j d } | j j | j j f } d } | st j d t d
d } n t j | 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 %si c @ sr | k rn | } | j } t j | | j | j d d | k d d | k d j | } | Sd S( Nt islinkR! t isexect xt copied( t flagsR t
memfilectxt pathRI R R7 ( R2 R R t fctxR t mctx( R t headmfR- ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt filectxfn7 s
R R R R t editt editforms
histedit.foldR R t filesR R N( t listt setR7 t mutableR Ro R R R| R R R R t
pathcopiesR t samefilet manifestR R R t p2t getcommiteditorRW R t memctxt commitctx( R2 R, R- t
commitoptst
skippromptt ctxst ct baseR R t fR R R R R R R t new( ( R R R- s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt collapse sF
)
.
$ c C@ s | d j d t S( Nt missing( R7 t dirtyRW ( R2 ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt
_isdirtywcZ s c C@ s% t j t d d t d d S( Ns working copy has pending changesR{ sY amend, commit, or revert them and run histedit --continue, or abort with histedit --abort( R t AbortR ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt
abortdirty] s c @ s f d } | S( Nc @ s s s t d } r4 t j | nE rJ t j | n/ t d k rl t j | n
t j | | | _ | _ | _ x D] } | t
| <q W| S( Ni i ( t AssertionErrorR' t addt internalactionsR R( R) RK R R R ( Rp RK ( t internalR t priorityR ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt wrapc s
( ( R R R R R ( ( R R R R s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRU b s t pickt ps
use commitR c B@ s e Z d Z RS( c C@ sr | j | j } | j d j | j j k r_ | j j j d t j | j | g f St t | j
S( Ni s node %s unchanged
( R2 R R RG R5 R+ t debugR| t superR R ( R: R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR { s
"#
( Ri Rj R ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR w s R t es! use commit, but stop for amendingc B@ s e Z d Z d Z RS( c C@ s} | j } | | j } t j | | j j d t t | j | | i t j
t d t j | j d t d d S( NR s5 Editing (%s), you may commit or record as needed now.R{ s hg histedit --continue to resume(
R2 R R R RG R5 RW R R+ R R R R| ( R: R2 R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s
c C@ s t j d t d d S( NR R s
histedit.edit( R R RW ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s ( Ri Rj R R ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s
t foldR s- use commit, but combine it with the one abovec B@ s> e Z d Z d Z d Z d Z d Z d Z RS( c C@ s t t | j | | | | j } | sE | | j j d } n | j d k rX d S| | j } | j s t j t
d t j | j n d S( s/ Verifies semantic correctness of the fold rulei R R Ns! cannot fold into public change %s( R R ( R R Rz R2 R R RK R R Ro R R| ( R: Rv Rw Rx R2 R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRz s
c C@ sj | j } | | j } t | | } | d d t j | j d | j d | j d | j d S( NR s fold-temp-revision %sR R R ( R2 R R R| R R R ( R: R2 R R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s
c C@ sJ | j } | d } | | j } | j j } | j | k r} | j j t d t j | j | | j | f f g f S| | } t d | j d | | D } | s| j j t d t j | j t j | f | | j | j f f g f S| j } | j
| j | j | j | | | | j | S( NR s %s: empty changeset
c s@ s | ] } | j Vq d S( N( R ( RO R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pys <genexpr> s s (%d::. - %d)sI %s: cannot fold - working copy is not a descendant of previous commit %s
( R2 R RG R5 R+ R R R| R R t discardt
finishfold( R: R2 R R R5 t parentctxt
newcommitst
middlecommits( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s&
# c C@ s t S( 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.
( R ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s c C@ s t S( 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'.
( RW ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt
mergedescs s c C@ sQ | j d j } | j j t j | | | j j i } | j | d <| j sq | j } nJ 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 } z] t | j | j }
| j j d
d |
d t | | | | | d
| j } Wd | j j | X| d k r| g f S| j j t j | | | j j | j | f f | j | f f | | f f g } x$ | D] } | j | | f f q#W| | | f S( Ni R s
***
s
R R s %s,%sR R R s
new-commitR% R ( R R R+ R R R R R R R R R R R R RN R R R R R R R7 R ( R: R+ R2 R t oldctxt newnodet internalchangest parentR t
newmessageRP R R R t nR9 t ich( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR sD
-
( Ri Rj Rz R R R R R ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s R c B@ s, e Z d Z d Z d Z d Z RS( c C@ sE | j d j | j k r; t j | j | j t t n | j S( NR ( R2 R R R R RW R ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s c C@ s t d S( N( R ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s c C@ s | j d } | g f S( NR ( R2 ( R: t basectx( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s
c C@ sV | j | k rR t d } t j | | j t j | j f d t d n d S( Ns. %s "%s" changeset was an edited list candidateR{ s& base must only use unlisted changesets( R R R Ro RK R| ( R: Rv Rw Rx t msg( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRu s
( Ri Rj R R R Ru ( ( ( s2 /usr/lib/python2.7/dist-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@ s e Z d Z RS( c C@ s t S( N( RW ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR ) s ( Ri Rj R ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s t rollRP s0 like fold, but discard this commit's descriptiont rollupc B@ s e Z d Z d Z RS( c C@ s t S( N( R ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR / s c C@ s t S( N( RW ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR 2 s ( Ri Rj R R ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR , s t dropt ds remove commit from historyc B@ s e Z d Z RS( c C@ s, | j | j j } | | j t f g f S( N( R2 RG R5 R R ( R: R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR 8 s ( Ri Rj R ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR 5 s t messt ms3 edit commit message without changing commit contentR c B@ s e Z d Z RS( c C@ s t j d t d d S( NR R s
histedit.mess( R R RW ( R: ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR @ s ( Ri Rj R ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR < s c C@ sw | d
k r i } n | 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 t | j d |
j
} d t | k rft d } t d
}
t j | d |
n | j
| d S( sV utility function to find the first outgoing changeset
Used by initialization codes default-pushR~ i s comparing with %s
t forces no outgoing ancestorss
roots(%ln)i s& there are ambiguous outgoing revisionss& see 'hg help histedit' for more detailR{ i N( R7 t
expandpathR t parseurlt statusR R t hidepasswordt
addbranchrevst peert lookupR t findcommonoutgoingR R R R t revsR ( R+ R2 t remoteR R t destR t checkoutt otherRr t outgoingt rootsR R{ ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt findoutgoingC s$ % R% R$ t commandss* read history edits from the specified filet FILER t continues$ continue an edit already in progresss edit-plans edit remaining actions listt kR3 s, don't strip old nodes after edit is completet aborts abort an edit in progresst oR s# changesets not found in destinationR s. force outgoing even for unrelated repositoriesRr s first revision to be editedt REVs) [OPTIONS] ([ANCESTOR] | --outgoing [URL])c O@ 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
- `roll` like fold, but discarding this commit's description
- `edit` to edit this changeset
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( R1 R6 R t _histeditt release( R+ R2 t freeargsR RG ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR% ^ s n R c C@ s= | j d r t S| j d r& t S| j d r9 t St S( NR R t edit_plan( R t goalcontinuet goalabortt goaleditplant goalnew( R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt _getgoal s c C@ s? | d k r t j j St | d } | j SWd QXd S( Nt -t rb( t syst stdinR= t open( R R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt _readfile s
c C@ sh t | d d } | r9 | j r9 t j t d n | j d } | j d }
| j d } | j d } | r | r t j t d n | d k r t | | | | | |
f rdt j t d qdn| d k r!t | | | | |
f rdt j t d
qdnC| d k r]t | | | f rdt j t d qdnt j j
t j j | j d
rt j t d n | r| rt j t d n t | d k rdt j t d qdnz | j
| t | d k r:t j | | }
|
d k r:| j |
q:n t | d k rdt j t d n d S( Nt 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 --aborts edit-plans1 only --commands argument allowed with --edit-plans histedit-states; history edit already in progress, try --continue or --aborts$ no revisions allowed with --outgoingi s. only one repo argument allowed with --outgoingi s/ histedit requires exactly one ancestor revision( t getattrR7 t appliedR R R R t anyt osR Rh R R R R t desthisteditR ( R+ R2 RG R R t goalRJ R R, t outgt editplanR R t
defaultrev( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt
_validateargs sD
$
c O@ s t | } | j d g } | j d d } | j d t | _ t | | | | | | | | | t k r | j t | | | } n\ | t k r t | | | | d S| t
k r t | | | d St | | | | | | t
| | | t | | | d S( NRr R R$ R3 ( R% R R R3 R6 R! R= t bootstrapcontinueR# t _edithisteditplanR" t _aborthisteditt _newhisteditt _continuehisteditt _finishhistedit( R+ R2 RG R R R2 R RJ ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s"
c C@ sc | j } xk t t | | d d g D]I \ } \ } } | j d k r+ | r+ | j d k r+ t | j | _ q+ q+ Wt | j } d } x | j r>| j | j j d } | d 7} | j
t d | | j t d | | j
d | j | j f | j \ }
} |
j | _ | j j | q W| j | j
t d d d S( s This function runs after either:
- bootstrapcontinue (if the goal is 'continue')
- _newhistedit (if the goal is 'new')
i R i t editingt changess histedit: processing %s %s
N( R" t enumeratet zipR7 RK R t __class__R RQ t popt progressR R R R R R5 R9 R ( R+ R2 RG R" t idxRU t nextactt totalt post actobjR t replacement_( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR; / s(
-$
c
@ s j j t j | j d t j j t | \ } } } } | r x | j D] \ } } | s | j d t
j | q^ | j d t
j | t
j | d f t | d k r^ d } x/ | d D] }
| j | t
j |
q Wq^ q^ Wn t
j t
j } | rOt
j f d t | D n t | d | | j s%| rt | | | j | n | rg } xW t | d j j D]= } | | } | j | t f d
| D f qW| r"t
j | q"q%t | d | n | j t j j j d rct j j d n j j d
r j j d
n d S( s7 This action runs when histedit is finishing its sessionR s histedit: %s is dropped
s histedit: %s is replaced by %s
i i s' histedit: %sc 3@ s+ | ]! } | k r | d f Vq d S( N( ( ( RO t t( R2 ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pys <genexpr>b s t tempR c 3@ s | ] } | Vq d S( N( ( RO t s( R2 ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pys <genexpr>q s t replacedt undos histedit-last-edit.txtN(! R+ R R R R5 RW R t processreplacementt iteritemsR R R| R R t isenabledt createmarkersoptt
createmarkersR t cleanupnodeR3 t
movebookmarksR4 t changelogRr R R Rg R0 R Rh t sjoinRf R< (
R+ R2 RG t mappingt tmpnodest createdt ntmt prect succsR R t supportsmarkerst markers( ( R2 s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR< L sF
$()
$
c
C@ s zy| j t | \ } } } } | j d t j | j | j | k r"| j r"| j | j } t j | | } t
j | | | } | j d k } t
| t j s | j | d d | n t
| t j r t j | | | d d d d | n Wd QXt j | n | j j d | j | | B rft j | | j d t d t n t | | d
| t | | d | Wn6 t k
r| j r| j t d n n XWd | j Xd S(
Ns restore wc to old parent %s
s histedit.abortR% s bundle:t sourcet urls parents() and (%n or %ln::)t
show_statsR RZ RK sr warning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up
( R= RO R R R| R4 R8 R R t openpathR t
readbundlet transactiont
isinstanceR t
unbundle20t applyt applybundleR0 t removet
unfilteredR R5 t cleanRW RT t ExceptionRe R R Rg (
R+ R2 RG t __t leafsRY R8 R t gent tr( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR9 } s8
"
c C@ s | j | sU t | t j | j t j | j } t | | | j | } n t | } t | | } g | j D] } | j rz | | j ^ qz } t
| | | | | | | _ | j d S( N( R= R0 R R| R5 R4 t
ruleeditorR" R+ RF t warnverifyactionsRQ ( R+ R2 RG RJ t commentR" t actR ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR8 s
) c C@ sv | j d } | j d d } | j d } t j | t j | | j j \ } }
| r | rx | d } n d } t | | | | | } n^ t | j d t
j | | }
t |
d k r t
j t d n |
d j } t | | | | j } | s:t
j t d t j | n g | D] } | | ^ qA} | st | t j | t j | } g | D] } t | | ^ q} t | | | | } n t | } t | | } t | | | | | | | j d j } | | _ | | _ | | _ g | _ d } t j | t j sit! j" | | g | g | d
} n | | _# d S( NR R R$ R i s
roots(%ld)i s9 The specified revisions must have exactly one common roots* %s is not an ancestor of working directoryR% ($ R R t checkunfinishedt
bailifchangedR R R7 R R R R t revrangeR R R R R t betweenR3 R| R0 R Rr R+ RF Rs R5 R" R4 R9 R RQ RR R t _bundleR8 ( R+ R2 RG R R R R3 RJ R R4 t emptyR t roott rrRP R Rt R" R5 R8 ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR: sJ
$ $" c C@ s/ | j p d } | r+ | j d } n | S( NR$ i ( R t
splitlines( R R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR s c C@ s | j } | j r | j j d } t | rS | j t | rS t qS n | j \ } } | j | _ | j j
| n | S( Ni ( R2 R" RB R R R R R R5 R9 R ( R+ RG R R2 RH R R9 ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR7 s
c C@ s t | j d | | } | r | r t j | t j rk | j d | | rk t j t d n | j d | r t j t d n | d } | j s t j t d | d 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? can only histedit a changeset together with all its descendantss (%ld) and merge()s( cannot edit history that contains mergesi s cannot edit public changeset: %sR{ s see 'hg help phases' for details( R R R RQ t allowunstableoptR R R R R R ( R2 t oldR R3 R R| R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRy s
c C@ s | j j d d rxt j } x| D]} | | j } t | } | j d d d j } t } | j d r$| d } | t
t Bt Bk r$| | _
| t | d j }
xe t t | j D]H \ } } | | j }
t |
} | |
k r t } | j | Pq q Wq$n | s( g | | <q( q( Wg } x4 | j D]# \ } } | j | | | 7} qNWn d j g | D] } | j ^ q } | d 7} | | 7} | j | | j i d
d 6 } t | j d d
} | j | | j | S( se open an editor to edit rules
rules are in the format [ [act, ctx], ...] like in state.rules
t experimentals histedit.autoverbRl i i t !is
s
R% t prefixs histedit-last-edit.txtRM ( R+ R* R t sortdictR R R t lowerR t endswithR' R( R) RK R t lstript reversedR RP RW R R R R t usernameR* RQ RS ( R2 R+ R" t editcommentt newactRu R R t fwordt addedt tsumt naR! t actxt asumRJ R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRr sB
%
(
"
c C@ s g d | j D D]" } | r | j d r | ^ q } g } x | D] } d | k rz t j t d | n | j d d \ } } | t k r t j t d | n t | j | | } | j | qL W| S( sA Read the histedit rules string and return list of action objects c s@ s | ] } | j Vq d S( N( Rm ( RO RP ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pys <genexpr>G s t #Rl s malformed line "%s"i s unknown action "%s"( R~ RB R Ro R R R Rs R ( RJ RG R! R" RP RK RL RU ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRF E s "
c C@ sZ y t | | | Wn? t j k
rU | j j d rO | j t d n n Xd S( Ns histedit-last-edit.txts= warning: histedit rules saved to: .hg/histedit-last-edit.txt
( t
verifyactionsR Ro R< Rh R R ( R+ R2 R" RG R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRs V s c
C@ sN t d | D } t } d
} xI | D]A } | j | | | | } | j d
k r, | j | j q, q, Wt | | } | j j j d d r t | d k r t
j t d d t d n g | D] } t
| | ^ q } | | d *nL | rJt
j t d t j | d d t d t j | d n d
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 Vq d S( N( R ( RO R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pys <genexpr>f s R% R& i s no rules providedR{ s% use strip extension to remove commitss missing rules for changeset %ss@ use "drop %s" to discard, see also: 'hg help -e histedit.config'N( R R7 Rz R R R R2 R+ R* R R Ro R R R| (
R" RG R Rw Rx Rv RU R R t drops( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyR _ s(
"
c C@ sS t j | t j s | S| j } | j j } | j } t | } g | D] } | d ^ qM } t j | } t | } x | rN| j
}
| j |
d k } | j
j |
d } | r | r | j |
d f n xe | D]] }
|
d } | j |
| f x7 | D]/ } | | k r| j | | j | qqWq Wq W| S( s Adjust replacements from obsolescense 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 obsolescense markersi N( ( ( R RQ RR Rk RV t nodemapt obsstoreR R t unionRB R R7 t
successorsR R ( R2 t oldreplacementst unfit nmR t newreplacementsRP t oldsuccst seensuccst succstocheckR R R_ t markert nsuccst nsucc( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt adjustreplacementsfrommarkers s.
c C@ s t | j | j } t } t } i } xT | D]L } | j | d | j | d | j | d t j | d q4 W| | } | | @} t | } i } x | rBx t | D]{ }
| |
} xh t | D]C } | | k r Pq | | k r | j | | j | | q q W| | |
<| j |
q Wq Wx | D]
}
| |
=qJW| j j j
} x3 | j D]% \ } } t | d | j
| | <qwW| rt | d | j j j d } nG | sd } n8 | j j j } | j t | d | 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 iN( R R2 R9 R R R t
setdefaultR Rj RV R t itemsR R Rr R7 R R ( RG R9 t allsuccsRM t fullmappingt repR RY t toproceedt finalR R] RL R R R\ t
newtopmostRP ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRO sF
(
" )c C@ s | 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| rd }
} z | j }
| j d } | j } xZ | D]R \ }
} | |
} | j
t d |
t j | t j | f | | |
<qW| j
| | j Wd t | |
Xn d S( s, Move bookmark from old to newly created nodeNiR% s, histedit: moving bookmarks %s from %s to %s
( R t
_bookmarksRP R R R7 R R R Re t noteR R| t recordchangeRS R ( R+ R2 RX t
oldtopmostR t movest bkR R R R Rq t markst mark( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRU s: "
#
c @ s | j d | d j g | D] } t j | ^ q f | j | j } | j j t f d | D } g | j d | D] } | j ^ q } x! | D] } t
j | | | q WWd QXd 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 , c 3@ s! | ] } | k r | Vq d S( N( ( RO R ( R ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pys <genexpr> s s
roots(%ln)N( R R R R| R Rk RV R R R R Rm ( R+ R2 t namet nodesR R R ( ( R s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyRT s 3
+
c
O@ s t | t r | g } n t j j t j j | j d r t | } | j t g | j D] } | j
rb | j
^ qb } | t | @} | r t j t
d d j d | D q n | | | | | | S( Ns histedit-states$ histedit in progress, can't strip %ss , c s@ s | ] } t j | Vq d S( N( R R| ( RO R ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pys <genexpr>* s ( Rf t strR0 R Rh R R1 R= R R" R R R R (
t origR+ R2 t nodelistt argsR RG RU t histedit_nodest common_nodes( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt stripwrapper s $
(#Rm c C@ s{ t j j | j d s d St | } | j | j rw | j t d | j t d d t
| j n d S( Ns histedit-states! hist: %s (histedit --continue)
s %d remainings histedit.remaining( R0 R Rh R R1 R= R" RQ R t labelR ( R+ R2 RG ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt summaryhook/ s
c C@ s t j j d t t j j d t t t d t d g t j j d t d g | j
d d r t d d g t d
t t
d <n d S( NR% s histedit-states histedit in progresss5 use 'hg histedit --continue' or 'hg histedit --abort's hg histedit --continueR t
histeditngR t bs: checkout changeset and apply further changesets from there( R t summaryhooksR R t unfinishedstatesR R RW R t afterresolvedstatesR* RU R t globals( R+ ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt extsetup: s (Y t __doc__t
__future__R R? R0 R( t mercurial.i18nR t mercurialR R R R R R R R R
R R R
R R R R R R RD R t cmdtablet commandt
testedwithR R R' R( R) R R0 t objectR1 Rk R R R R R R RU RW R R R R R R R R R7 R R% R! R" R# R$ R% R+ R6 R R; R< R9 R8 R: R R7 Ry Rr RF Rs R R RO RU RT R t wrapfunctionR R ( ( ( s2 /usr/lib/python2.7/dist-packages/hgext/histedit.pyt <module> s p -tt C p !j - 1 % 3 5 ! # = )