File: //usr/lib/python2.7/dist-packages/hgext/rebase.pyc
Xc @@ sN d Z d d l m 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 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 m Z m Z e j Z e j! Z! d Z" d Z# d Z$ d
Z% d Z& e$ e% e& f Z' i Z( e j) e( Z) d Z* d
Z+ d Z, d Z- d Z. e/ d Z0 e j1 Z1 e1 d d Z2 d e3 f d YZ4 e) d d d d e d e d f d d d e d e d f d d g e d! e d f d" d# d e d$ e d f d d% e5 e d& f d' d( d e d) e d* f d+ d, e5 e d- f d. d/ d e d0 e d1 f d2 d3 e5 e d4 f d d5 e5 e d6 f d7 d8 e5 e d9 f d: d; e5 e d9 f d< d= d e d> f d? d@ e5 e dA f dB dC e5 e dD f g e! e dE dF Z6 e/ e/ e/ g e/ dG Z7 dH Z8 e/ e/ e/ e5 e/ dI Z9 dJ Z: dK Z; dL Z< dM Z= dN Z> dO Z? dP Z@ dQ ZA dR ZB dS ZC dT ZD dU ZE dV ZF e/ dW ZG dX ZH e/ dY ZI dZ ZJ d[ ZK d\ ZL d] ZM d^ ZN d_ ZO d` ZP da ZQ d S(b s command to move sets of revisions to a different ancestor
This extension lets you rebase changesets in an existing Mercurial
repository.
For more information:
https://mercurial-scm.org/wiki/RebaseExtension
i ( t absolute_importN( t _( t hext nullidt nullrevt short( t bookmarkst cmdutilt commandst copiest destutilt errort
extensionst hgt lockt merget obsoletet patcht phasest registrart repairt repoviewt revsett scmutilt utiliiiiis ships-with-hg-corec C@ s d S( Ni ( ( ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _nothingtorebaseK s c C@ sf | j j d d } | d k r1 | | d <n | j j d d } | d k rb | | d <n d S( Nt sources intermediate-source( t extrat gett None( t ctxR t s( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt
_savegraftN s
c C@ s | j | d <d S( Nt branch( R! ( R R ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _savebranchV s c @ s f d } | S( s make an extrafn out of the given copy-functions.
A copy function takes a context and an extra dict, and mutates the
extra dict as needed based on the given context.
c @ s" x D] } | | | q Wd S( N( ( R R t c( t copiers( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt extrafn_ s
( ( R$ R% ( ( R$ s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _makeextrafnY s c
C@ s% t j | d d d | d t d | S( sh small wrapper around destmerge to pass the right extra args
Please wrap destutil.destmerge instead.t actiont rebaset sourcesett onheadcheckt destspace( R
t destmerget False( t repoR) R+ ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _destrebased s R/ c C@ sP d } | d k r3 t j | t j | | } n | t j t | | g @S( N( R R t getsett fullreposett basesetR/ ( R. t subsett xR) ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _revsetdestrebasem s !t
rebaseruntimec B@ sP e Z d Z d d Z d Z d Z d Z d Z d Z d Z
RS( s2 This class is a container for rebase runtime statec C@ s9 | d k r i } n | | _ | | _ | | _ d | _ t | _ i | _ d | _ d | _ d | _
t | _ t | _
| j d t | _ t j | | | _ | j d d | _ | j d } t g | _ | r | g | _ n | j d t | _ | j d t | _ | j d t | _ i | _ d S( Nt collapset dateR% t keept keepbranchest keepopen( R R. t uit optst
originalwdR t externalt statet activebookmarkt currentbookmarkst targett sett skippedt targetancestorsR R- t collapsefR t
logmessaget collapsemsgR8 R t extrafnst keepft
keepbranchesfR; t obsoletenotrebased( t selfR. R< R= t e( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt __init__| s0 c C@ s | j } d } d } t } t } d } i } y| j d } xt | j j D]\ } }
| d k r | |
j } qX | d k r | |
j } qX | d k r | |
j } qX | d k r t t
|
} qX | d k rt t
|
} qX | d k r$t t
|
} qX | d k rXt |
d k oKd
|
k rX|
} qX |
j d
\ }
} | t
t t
t t
t t
t f k rt
| | | |
j <qX | t k rt | | |
j <qX | | j | | |
j <qX WWnA t k
rC} | j t j k r* n t j | t d n X| d k rht j t d n t } | st | g } xX t | j D]A \ } } | t k r| | k r| j | n | j | qWn | j j! d
d j" d t | D pd | j j! d t# | | j$ | | _% | | _& | | _' | | _( | | _) | | _* | | _+ | | _, | | _- d S( s" Restore a previously stored statust rebasestatei i i i i i i iQ t :R( s .hg/rebasestate is incompletes computed skipped revs: %s
t c s@ s | ] } t | Vq d S( N( t str( t .0t r( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr> s s rebase status resumed
N(. R. R R- R t vfst enumeratet readt
splitlinest revt boolt intt lent splitRT t nullmerget
revignoredt revprecursort revprunedR t revtodot IOErrort errnot ENOENTR t wrongtooltocontinueR R t AbortRD t sortedt itemst addR< t debugt joint _setrebasesetvisibilityt keysR> RC R@ RE RG RK RL R? RA ( RN R. R: RC R7 R? RA R@ t ft it lR> R9 t oldrevt newrevt errRE t seent oldt new( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt
restorestatus sr % + & ' c C@ s i | _ | j j d d d t s( d St | } t | } t | j | | | _ t | j } t | j | j | | | d S( s Compute structures necessary for skipping obsolete revisions
rebaserevs: iterable of all revisions that are to be rebased
obsoleterevs: iterable of all obsolete revisions in rebaseset
target: a destination revision for the rebase operation
t experimentalt rebaseskipobsoletet defaultN( RM R< t
configboolt TrueRD t _computeobsoletenotrebasedR. t _checkobsrebase( RN t
rebaserevst obsoleterevsRC t rebasesett obsoletesett
skippedset( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _handleskippingobsolete s c C@ s y | j t | j | _ Wn~ t j k
r | rp t | j t | j | j j j t
d d St
d } t
d } t j | d | n X| r t | j | j
| j | j d | j Sd | j j D } | j | j j | | j d S( NsF rebase aborted (no revision is removed, only broken state is cleared)
i s# cannot continue inconsistent rebases- use "hg rebase --abort" to clear broken statet hintRA c s@ s' | ] \ } } | t k r | Vq d S( N( Rb ( RU RV t st( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr> s ( Rz t restorecollapsemsgR. RI R t RepoLookupErrort clearstatust clearcollapsemsgR< t warnR Ri t abortR> RC R@ RA Rk R Rp ( RN t isabortt msgR t obsrevs( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _prepareabortorcontinue s"
c C@ s | d k r t St j | j t j } | j p7 | rw | j j d | | rw t j t
d d t
d n t | j t | } | j
| | | t | j | | | j | j } | s | j j t
d t St | } | j r?| j | j r?t j t
d | j | d t
d n | \ | _ | _ | _ | j r| j j j | j g d t | _ t | j | j | j | _ n | j r| j r| j j t
d | n d S(
Ns first(children(%ld) - %ld)s; can't remove original changesets with unrebased descendantsR s& use --keep to keep original changesetss nothing to rebase
s can't rebase public changeset %ss see 'hg help phases' for detailst inclusives reopening closed branch head %s
( R R R t isenabledR. t allowunstableoptRK t revsR Ri R t _filterobsoleterevsRD R t
buildstateRG RM R< t statust mint mutableR> RC R@ t changelogt ancestorsR RF t externalparentR? t closesbranchRL ( RN t destR t
allowunstableR t resultt root( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _preparenewrebase s< c C@ s? | j | j | j } } } | j r | j j d t | j r t } xU | j D]G } | j
| | j t | d k rU t
j t d qU qU Wq n | j s | j j | j g d t | _ n | j j | _ | j p | j | _ | j rt j | n | j d | j } g | j j D] \ } } | t k r8| ^ q8} t | }
d } x| D]} | | } d | j | | j j! d d d f }
| j" | j# | j$ | j# } | r|
d d j% | 7}
n | j | t k r| d 7} | j& t d
|
| j' t d | d | | f t d
|
t( | | | j | j | j | j) \ } } } t* | | j+ | j | j | j | j, | j | j- | j t. | | j/ t | d j1 d k r| j j2 d n z{ | j3 d d | j4 d d d t5 | | | | | j | j | j } | r| d d k rt
j6 t d n Wd | j3 d d d d X| j s| t7 k } t8 j9 | d } t8 j: d | | } t; | | | | d t< | j d | d | j d | j= } n7 | j> j? | j@ | | j# | j> jA d } | d k r| | j | j | <| j2 d tB | q| j s| jC t d | | f | jD j
| n | | j | <| j2 d | qu| j | tE k r
| j2 d | qu| j | tF k r:| j& t d |
qu| j | tG k r| | j) | } d | j | | j j! d d d f } t d! } | j& | |
| f qu| j | tH k rt d" } | j& | |
qu| j& t d# |
| | j | f quW| j' t d d | jI t d$ d S(% Ni i s' cannot collapse multiple named branchesR s sort(%ld, -topo)s
%d:%s "%s"s
s (%s)RS s rebasing %s
t rebasings %d:%st
changesetsi s resuming interrupted rebase
R< t
forcemerget toolt R( i s@ unresolved conflicts (see hg resolve, then hg rebase --continue)t editformR% t editorR: R8 s rebased as %s
s3 note: rebase of %d:%s created no changes to commit
s next revision set to %s
s! ignoring null merge rebase of %s
s not rebasing ignored %s
s4 note: not rebasing %s, already in destination as %s
s+ note: not rebasing %s, it has no successor
s already rebased %s as %s
s rebase merging completed
(J R. R< R= RL RJ t insertR" RG RD R@ Rl R! R^ R Ri R RF R R RC R t
_bookmarkst copyRB RA t _activebookmarkR t
deactivateR t iteritemsRd R[ t descriptionR_ t nodetagst nodet
nodebookmarksRn R t progresst
defineparentsRM t storestatusR> RK R? t storecollapsemsgRI R t parentsRm t setconfigR t
rebasenodet InterventionRequiredR R t
mergeeditformt getcommiteditort concludenodeR& R8 t dirstatet beginparentchanget
setparentst endparentchangeR R RE R` Ra Rb Rc t note( RN R. R< R= t branchesR[ t
sortedrevst kt vt candst totalt posR t desct namest p1t p2t baset statst mergingR R t newnodet targetctxt
desctargetR ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _performrebase8 s " 4
(
c C@ s | j | j | j } } } | j r| j rt | t | j | j | j | j | j
\ } } } | j d } d } | j r | j } n] d } xN | j D]C }
|
| j
k r | j |
t k r | d | |
j 7} q q Wt } t j d | d | } t | j } t | | | | j d | d t | j d | d | j d
| j }
|
d k rt| j } n | |
j } x= | j j D]) } | j | t k r| | j | <qqWn d | j k rt | | j | j
| n | j ri } x | j j D]s \ } } | t k rJ| | j! | | | j! <q| t" k r| j
| } | | j! | | | j! <qqW| | j j! } n | j j | j# | j# } | t" k r| j
| j# } n | d k r| j# } n | g | d j$ D] } | j ^ qk rH| j% t& d
t' j( | | t) n | j* sd } | j ri|
} n t+ | | | j | j
| n | j, d J } | j rt- | | | | j | | j. | j/ k rd | _. qn Wd QXt0 | t1 | | j% t& d t2 j3 | j4 d d t | j
rXt5 | j
} | j% t& d | n | j. r| d j! | j/ | j. k rt6 j7 | | j. n d S( Nt edits rebase.collapses Collapsed revisions
* %sR t commitmsgR% R R: R8 t qtipi s0 update back to initial working directory parent
t bookmarks rebase completed
t undot
ignoremissings %d revisions have been skipped
t .(8 R. R< R= RG R; R R R@ RC RF RM R RI RE R` R R R R t maxR R? R& RJ RL R8 R R[ t iterkeyst tagst updatemqRB R R Rb R> R R R R
t
updaterepoR- RK t clearrebasedt transactiont updatebookmarksRA R R R R t
unlinkpatht sjoinR^ R t activate( RN R. R< R= R R t _baset editoptR R t rebasedR t
revtoreuseR Ru Rt t nstateR R t succt
targetnodet newwdR# t collapsedast trt
skippedlen( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt
_finishrebase s !
% /
N( t __name__t
__module__t __doc__R RP Rz R R R R R ( ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR6 z s # H ) oR( R R R s. rebase the specified changeset and descendantst REVt bR s= rebase everything from branching point of specified changesetRV R[ s rebase these revisionst dR s# rebase onto the specified changesetR7 s collapse the rebased changesetst mt messages# use text as collapse commit messaget TEXTRO R s invoke editor on commit messagesRs t logfiles& read collapse commit message from filet FILER R9 s keep original changesetsR: s keep original branch namest Dt detachs (DEPRECATED)Rr t interactivet tR s specify merge toolR# t continues continue an interrupted rebaset aR s abort an interrupted rebases# [-s REV | -b REV] [-d REV] [OPTION]c K@ s t | | | } d } } zU| j } | j } | j d d } | j d d } | j d d } | j d g } | j d }
| j d } | j d } | j d r y t j d r d
}
n Wn t k
r d }
n Xd |
} t d
| } t j
| n | j rH| j rHt j
t d n | sT| r| rx| rxt j
t d n | j rt j
t d n | s| s| rt j
t d n | r| j d t
r| j t d n | j | } | d k r\| SnI t | | | | | | d |
\ } } | j | | } | d k r\| S| j | j Wd t | | Xd S( s move changeset (and descendants) to a different branch
Rebase uses repeated merging to graft changesets from one part of
history (the source) onto another (the destination). This can be
useful for linearizing *local* changes relative to a master
development tree.
Published commits cannot be rebased (see :hg:`help phases`).
To copy commits, see :hg:`help graft`.
If you don't specify a destination changeset (``-d/--dest``), rebase
will use the same logic as :hg:`merge` to pick a destination. if
the current branch contains exactly one other head, the other head
is merged with by default. Otherwise, an explicit revision with
which to merge with must be provided. (destination changeset is not
modified by rebasing, but new changesets are added as its
descendants.)
Here are the ways to select changesets:
1. Explicitly select them using ``--rev``.
2. Use ``--source`` to select a root changeset and include all of its
descendants.
3. Use ``--base`` to select a changeset; rebase will find ancestors
and their descendants which are not also ancestors of the destination.
4. If you do not specify any of ``--rev``, ``source``, or ``--base``,
rebase will use ``--base .`` as above.
Rebase will destroy original changesets unless you use ``--keep``.
It will also move your bookmarks (even if you do).
Some changesets may be dropped if they do not contribute changes
(e.g. merges from the destination branch).
Unlike ``merge``, rebase will do nothing if you are at the branch tip of
a named branch with two heads. You will need to explicitly specify source
and/or destination.
If you need to use a tool to automate merge/conflict decisions, you
can specify one with ``--tool``, see :hg:`help merge-tools`.
As a caveat: the tool will not be used to mediate when a file was
deleted, there is no hook presently available for this.
If a rebase is interrupted to manually resolve a conflict, it can be
continued with --continue/-c or aborted with --abort/-a.
.. container:: verbose
Examples:
- move "local changes" (current commit back to branching point)
to the current branch tip after a pull::
hg rebase
- move a single changeset to the stable branch::
hg rebase -r 5f493448 -d stable
- splice a commit and all its descendants onto another part of history::
hg rebase --source c0c3 --dest 4cf9
- rebase everything on a branch marked by a bookmark onto the
default branch::
hg rebase --base myfeature --dest default
- collapse a sequence of changes into a single commit::
hg rebase --collapse -r 1520:1525 -d .
- move a named branch while preserving its name::
hg rebase -r "branch(featureX)" -d 1.3 --keepbranches
Returns 0 on success, 1 if nothing to rebase or there are
unresolved conflicts.
R R R R[ t
_destspaceR R R t histeditR s --config extensions.histedit=s hg%s help -e histeditsO interactive history editing is supported by the 'histedit' extension (see "%s")s+ message can only be specified with collapses" cannot use both abort and continues* cannot use collapse with continue or aborts4 abort and continue do not allow specifying revisionsR s tool option will be ignored
R+ N( R6 R t wlockR R R t findt KeyErrorR R Ri RI RG R- R R t _definesetsR R R t release( R< R. R= t rbsrtR R
t destft srcft baseft revfR+ t contft abortft enablehisteditt helpR t retcodeR R ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR( s^ n
c @ s | r$ | r$ t j t d n | rH | rH t j t d n | rl | rl t j t d n t j t j | r t j | } n | r t j | } | s| j t d d Sn| r2t j | g } | s| j t d d S j d | } | st nt j | pDd g }
|
sj| j t d d S| s t
|
d | } t | } n j d
|
| j } | d k r j d | |
| } n g } | st |
| j g k r7| r!| j t d | q| j t d
n j d |
| s| r| j t d d j f d |
D | f q| j t d | n6 | j t d d j f d |
D | f d S| s
t
| d | } t | } n | | f S( s@ use revisions argument to define destination and rebase set
s' cannot specify both a source and a bases) cannot specify both a revision and a bases+ cannot specify both a revision and a sources- empty "rev" revision set - nothing to rebase
s0 empty "source" revision set - nothing to rebase
s (%ld)::R s5 empty "base" revision set - can't compute rebase set
R+ s ancestor(%ld, %d)s (%d::(%ld) - %d)::s6 nothing to rebase - %s is both "base" and destination
sA nothing to rebase - working directory parent is also destination
s
%ld - ::%dsG nothing to rebase - "base" %s is already an ancestor of destination %s
t +c 3@ s | ] } t | Vq d S( N( RT ( RU RV ( R. ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr> s sV nothing to rebase - working directory parent is already an ancestor of destination %s
s nothing to rebase from %s to %s
c 3@ s | ] } t | Vq d S( N( RT ( RU RV ( R. ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr> s N( NN( NN( NN( NN( R Ri R R t checkunfinishedt
bailifchangedR t revsinglet revrangeR R R t AssertionErrorR/ RT t firstt listR[ Rn ( R< R. R R R R R+ R R t srcR t commonanc( ( R. s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR
sl
'c C@ s t } t | } xu | D]m } | | k r4 q n xR | | j D]@ } | j | k rE | j | k rE | j | j qE qE Wq W| s t St | d k r | j St j t
d t | d j d t
| D f d S( s Return the revision that should be used as the second parent
when the revisions in state is collapsed on top of targetancestors.
Abort if there is more than one parent.
i sK unable to collapse on top of %s, there is more than one external parent: %ss , c s@ s | ] } t | Vq d S( N( RT ( RU t p( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr> s N( RD R R R[ Rl R R^ t popR Ri R R Rn Rj ( R. R@ RF R R R[ R# ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR s
c C@ s t j | d } z| j | | j | | j | | }
| d k r^ |
j } n | o} | | j |
j k } i |
j d 6} | r | |
| n | j j d d }
z t
|
j t j
} | j j d d | d | r| j j d d t n | d k r,|
j } n | j d | d |
j d | d
| d | } Wd | j j |
X| j j | | j | j | SWd t | Xd S(
s Commit the wd changes with parents p1 and p2. Reuse commit info from rev
but also store useful information in extra.
Return node of committed revision.R( t
rebase_sourceR s
new-commitR< t allowemptycommitt textt userR8 R R N( R t
dirstateguardR R R R R! R R< t backupconfigR t phaseR t draftR R R8 t commitR( t
restoreconfigR t setbrancht closeR ( R. R[ R R R R R% R: R8 t dsguardR t
keepbranchR t backupt targetphaseR ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR s2 $
"
c
C@ s7 | d j | k rM | j j d | | | f t j | | t t n | j j d | j j | j | j j d | | | f | d
k r | j j d | | | f n t j | | t t | | d d d g } | rt j | | | n/ | | j
j } t j | | | d | | S( sF Rebase a single revision rev on top of p1 using base as merge ancestorR s update to %d:%s
s already in target
s merge against %d:%s
s detach base %d:%s
t labelsR R t skiprevN( R[ R< Rm R t updateR- R R t writet currenttransactionR R t duplicatecopiesR ( R. R[ R R R@ R7 RC R t p1rev( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR 4 s !c C@ sZ g | D] } | | t k r | ^ q } | j d | | } | rR | | j Sd Sd S( s8 return the nearest ancestors of rev in the rebase results max(%ld and (::%d))N( R` R R R ( R. R[ R@ RV R t
candidates( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt nearestrebasedQ s
)c
@ s | j d d } | | } | r | r f d | D } t d } t d } t j | d j | f d | n d S( s;
Abort if rebase will create divergence or rebase is noop because of markers
`rebaseobsrevs`: set of obsolete revision in source
`rebasesetrevs`: set of revisions to be rebased from source
`rebaseobsskipped`: set of revisions from source skipped because they have
successors in destination
R{ t allowdivergencec 3@ s | ] } t | Vq d S( N( RT ( RU RV ( R. ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr>l s s+ this rebase will cause divergences from: %ss@ to force the rebase please set experimental.allowdivergence=Truet ,R N( R~ R R Ri Rn (
R. R< t
rebaseobsrevst
rebasesetrevst rebaseobsskippedt divergenceokt divergencebasecandidatest divhashesR t h( ( R. s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR Z s
c @ s | | j } t } } d } | d j }
|
| k rE | } nx |
k r |
t k rj | } q |
t k r t | |
} | d k r | } q q |
} n | } |
} t | d k r| d j | k r| d j } | k rz| | k r3 | } | t k rw| | } qwq | t k rmt | | } | d k rw| } qwq | } q| t k rt j
t d | n | } n | j j
d | | p| j | | j f t f d | D sd } n | | j s-| | j j } nX xU | | j D]1 }
j |
j | k r>|
j } Pq>q>Wd } t d | p| | | f S( sG Return the new parent relationship of the revision that will be rebasedi i i s; cannot use revision %d as base, result would have 3 parentss future parents are %d and %d
c 3@ s! | ] } | j k Vq d S( N( R[ ( RU R# ( R@ ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr> s s7 no base found to rebase on (defineparents called wrong)N( R R R R[ R` t
revskippedR= R^ Rb R Ri R R< Rm t anyR R R R ( R. R[ RC R@ RF RM R R R t rp1t p1nt p2nR R# ( ( R@ s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR t sZ
(
( & c C@ sU t j j | j j | } x3 t j t | d D] } | j d r4 t Sq4 Wt S( s/ Return true if the given patch is in git formatt rbs
diff --git(
t ost pathRn t mqR t
linereadert filet
startswithR R- ( R. t patchnamet mqpatcht line( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt isagitpatch s
c K@ s i } | j } | j } t } x | j D]t } | | j j } | | k r | j j d | | j f | j t | | j f | | <q, | j
| j q, W| r| j | | j x t
| d t D] } | | k rV| | \ }
} | j j t d |
| | | | | f | j | d
d |
d | d t | | g q | j
| | d q Wg | D]+ } | j j | d d | k rv| ^ qv}
|
| j (t | _ | j n d S( s9 Update rebased mq patches - finalize and then import thems. revision %d is an mq patch (%s), finalize it.
t reverses updating mq patch %s to %s:%s
RS t gitR[ i i N( ( RO t
fullseriesRD t appliedR R[ R< Rm t nameRV Rl t finishRp Rj R R R t qimportRT t guard_reR_ t seriesdirtyt savedirty( R. R@ RE R= t mqrebaseRO t original_seriest skippedpatchesR# R[ R[ t isgitR t newseries( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR s4
"
+
c C@ sj | j } xM | j D]? \ } } | | k r | | | | <t j | | g | q q W| j | d S( sE Move bookmarks to their correct changesets, and delete divergent onesN( R R R t deletedivergentt recordchange( R. R R t originalbookmarksR t marksR R ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR s c C@ s= | p d } | j d d } | j d | | j d S( s, Store the collapse message to allow recoveryR s last-message.txtt ws %s
N( RW R8 R0 ( R. RI Rq ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR s c C@ s t j | j d d t d S( s Remove collapse message files last-message.txtR N( R R Rn R ( R. ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR s c C@ sv y/ | j d } | j j } | j Wn@ t k
rq } | j t j k rY n t j t d n X| S( s* Restore previously stored collapse messages last-message.txts no rebase in progress(
RW t readlinet stripR0 Re Rf Rg R Ri R ( R. Rq RI Rv ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR s c C@ sa | j d d } | j | | j d | j | | j d | j | | j d | j d t | | j d t | | j d t | | j d | p d x | j D]s \ }
} | |
j } | d k r| | j }
n! | t k r"t t }
n | }
| j d | |
f q W| j | j j d d
S( s* Store the current status to allow recoveryRQ Rj s
s %d
s %s
R i s %s:%s
s rebase status stored
N(
RW R8 R R] R Rd R R0 R< Rm ( R. R> RC R@ R7 R9 R: R? RA Rq R R Rt Ru ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR , s$
c C@ s* t | t j | j d d t d S( s Remove the status filesRQ R N( t _clearrebasesetvisibiliyR R Rn R ( R. ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR E s
c C@ s g | d j D] } | j ^ q } t | d k r? t St g | j D] \ } } | t k rO | ^ qO } | | k r t St S( s check whether we should `update --clean` away from a merge, or if
somehow the working dir got forcibly updated, e.g. by older hgi N( R R R[ R^ R- R R R R ( R. R@ R# R Rx Ry t firstunrebased( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt
needupdateJ s ) c @ sP z g | j D]$ } | d k r | k r | ^ q } g | D] } | j sA | ^ qA } t } | r j j t d d j f d | D d t d t } n t }
| r t j j
| }
n |
t | r j j t d t } n | rt } t f d | j } | rg j d | D] }
|
j ^ qS} t
g j d
| D] }
|
j ^ q d k } n | st | rt j | t t n | rt j j | qn | r | j k r t j | n Wd t t j j t d Xd S(
s Restore the repository to its original state. Additional args:
activebookmark: the name of the bookmark that should be active after the
restorei s- warning: can't clean up public changesets %s
s , c 3@ s | ] } t | Vq d S( N( RT ( RU RV ( R. ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr>j s R s see 'hg help phases' for detailss? warning: new changesets detected on target branch, can't strip
c @ s | d k o | k S( Ni ( ( R4 ( RC ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt <lambda>x s s
roots(%ld)s . & (%ld)Ns rebase aborted
( t valuesR R R< R R Rn R- RD R t descendantst filterR R^ Ro R R7 R Rl R R R R R ( R. R> RC R@ RA R t dstatesR t immutablet cleanupRr t shouldupdateR R# t strippoints( ( R. RC s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR [ s@ 7)
+7
c C@ s t | | d | j k re | j g | j j D] } | j ^ q5 k re t j t d n t | j d | } | s t j t d n | j
i } t } x| D]} | j | }
|
| k r t j t d n |
| k rN| j | j k } | rN| rN| | j
k rN| j j d d Sn | j j d | | f | j t j | t t | j d k r | j | j j |
j g | j g q q Wx' | D] } | | k rt | | <qqWt | d k rSt | j d | | }
x+ t |
t | D] } t | | <q<Wn x5 | D]- } | | d k r}t | | <qZt | | <qZW| d
j | j | f S( sy Define which revisions are going to be rebased and where
repo: repo
dest: context
rebaseset: set of rev
R s& cannot rebase onto an applied mq patchs
roots(%ld)s no matching revisionss! source is ancestor of destinations! source is a child of destination
s rebase onto %s starting from %s
i s %ld::%ldR N( Ro R R RO RZ R Ri R R RD t sortt ancestorR! t childrenR< Rm R R7 t dictt fromkeysRd R^ R R t findmissingrevsR[ R` R Ra Rc Rb ( R. R R R7 RM R t rootsR@ t detachsetR t
commonbaset
samebranchRV t rebasedomaint ignored( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR sH
%
&
c C@ s t j | t j r g } x t | j D]p \ } } | d k r. | | k r[ d } n) | d k rw | | f } n
| | f } | j | | | f q. q. W| rt j | | qn g | D] } | | t k r | ^ q } | rg }
xn | j d | D]Z } t | j
j | j g t | rM| j
t d q|
j | j qW|
rt j | | |
d qn d S( s dispose of rebased revision at the end of the rebase
If `collapsedas` is not None, the rebase was a collapse whose result if the
`collapsedas` node.i s
roots(%ld)sA warning: new changesets detected on source branch, not stripping
t allN( ( R R t createmarkersoptRj Rk R t appendt
createmarkersR` RD R Rr R[ R R R R Rl ( R< R. R@ RE R t markersR[ Ru t succsR t strippedR ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR s*
)+c O@ s d } | j d rd } } z| j } | j } | j d r` | d =| j d n t | } t j } d }
|
t _ z | | | | | } Wd | t _ Xt | } | | k rd | k r | d =n d | k r | d =n t | j j
d | } | | d <y t | | | Wqt j
k
rt j | \ }
} } |
| d
j k r| j t d q| j t d t j | | qXn Wd t | | Xn< | j d
rt j t d n | | | | | } | S( sC Call rebase after pull if the latter has been invoked with --rebaseR( R7 sC --update and --rebase are not compatible, ignoring the update flag
c _@ s d S( N( ( t argst kwargs( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _dummy s NR[ R t startR R s nothing to rebase
s% nothing to rebase - updating instead
R s% --tool can only be used with --rebase( R R R
R Rm R^ R t postincomingR R R R( R t NoMergeDestAbortR
t
destupdateR[ R R R7 R Ri ( t origR< R. R R= t retR
R t revsprepullt origpostincomingR t revspostpullR+ R[ t _at _b( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt
pullrebase sJ
c C@ sT | j } t | } | | _ | j j d t } | | @rP | j n d S( s store the currently rebased set on the repo object
This is used by another function to prevent rebased revision to because
hidden (see issue4505)t visibleN( t
unfilteredRD t
_rebasesett filteredrevcacheR t invalidatevolatilesets( R. R t hiddens( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyRo H s
c C@ s+ | j } d t | k r' | ` n d S( s# remove rebaseset data from the repoR N( R t varsR ( R. ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyRm U s c C@ s) | | } | j t | d d | S( s0 ensure rebased revs stay visible (see issue4505)R ( ( R7 t getattr( R R. t blockers( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _rebasedvisible[ s c @ s t f d | D S( s/ returns a set of the obsolete revisions in revsc 3@ s% | ] } | j r | Vq d S( N( R ( RU RV ( R. ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr>c s ( RD ( R. R ( ( R. s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR a s c
C@ s- i } i } | j } xt | D]l } | j | } xT t j | j | g D]: } y | j | | | j | <WqJ t k
r qJ XqJ Wq W| r)| j | | j g d t | d t } xf | D][ } | | k r | | | | <q | | | k r | j
j | d k r d | | <q q Wn | S( s return a mapping obsolete => successor for all obsolete nodes to be
rebased that have a successors in the destination
obsolete => None entries in the mapping indicate nodes with no succesort stoprevR i N(
R R R t
allsuccessorst obsstoreR[ t LookupErrorR R R Rq t countR (
R. R@ R RM R t clRV R R t ancs( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR e s*
c C@ s t j j | j d s d Sy) t | | i } | j | j } Wn. t j k
rx t d } | j
| d SXt g | j D] } | d k r | ^ q } | j
t d | j
t d d | | j
t d d t | | f d S( NRQ s8 rebase: (use "hg rebase --abort" to clear broken state)
i s# rebase: %s, %s (rebase --continue)
s
%d rebaseds rebase.rebaseds %d remainings rebase.remaining( RM RN t existsRn R6 Rz R@ R R R R8 R^ t
itervaluest label( R< R. R R@ R Rr t
numrebased( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt summaryhook s
1c C@ s t j t j d t } | d j d d d t d f | d j d d d t d f t j j
d t t j j d t
t
t d
t d g t j j d t d g t j t d
t d S( Nt pulli R R( s' rebase working directory to branch headR R s specify merge tool for rebaseRQ s rebase in progresss1 use 'hg rebase --continue' or 'hg rebase --abort's hg rebase --continuet _getdynamicblockers( R t wrapcommandR t tableR R R R R t summaryhooksRl R t unfinishedstatesR- t afterresolvedstatest wrapfunctionR R ( R< t entry( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt uisetup s (R R t
__future__R Rf RM t mercurial.i18nR t mercurial.nodeR R R R t mercurialR R R R R
R R R
R R R R R R R R R R R R t templateoptsRd R` Ra Rb Rc RG t cmdtablet commandt
testedwithR R R" R& R R/ t revsetpredicateR5 t objectR6 R- R( R
R R R R= R R RV R R R R R R R Ro R R R R Ro Rm R R R R R ( ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt <module> s "|
P # f )
6 ^ ! 8
#