| Disable Functions: Path : /usr/lib64/python2.7/site-packages/hgext/ |
| Current File : //usr/lib64/python2.7/site-packages/hgext/rebase.pyc |
�
Hq�Qc @ s d Z d d l m Z m Z m Z m Z m Z m Z m Z d d l m Z m
Z
m Z m Z m
Z
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 Z d d l Z d Z d
Z i Z e j e � Z d Z 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 e e d � f d d d e d � e d � f d! d" e e d# � f d$ d% d e d& � e d' � f d d( e e d) � f d d* e e d+ � f d, d- e e d. � f d/ d0 d e d1 � f d2 d3 e e d4 � f d5 d6 e e d7 � f g e e d8 � � d9 � � Z d: � Z e! e! e! d; � Z" d< � Z# d= � Z$ d> � Z% d? � Z& d@ � Z' dA � Z( dB � Z) dC � Z* dD � Z+ dE � Z, dF � Z- e! dG � Z. dH � Z/ dI � Z0 d S(J 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:
http://mercurial.selenic.com/wiki/RebaseExtension
i����( t hgt utilt repairt merget cmdutilt commandst bookmarks( t
extensionst patcht scmutilt phasest obsoletet error( t templateopts( t nullrev( t release( t _Ni����i����t internalt rebaset st sourcet s# rebase from the specified changesett REVt bt basesa rebase from the base of the specified changeset (up to greatest common ancestor of base and dest)t rt revs rebase these revisionst dt dests# rebase onto the specified changesett collapses collapse the rebased changesetst mt messages# use text as collapse commit messaget TEXTt et edits invoke editor on commit messagest lt logfiles& read collapse commit message from filet FILEt keeps keep original changesetst keepbranchess keep original branch namest Dt detachs (DEPRECATED)t tt tools specify merge toolt ct continues continue an interrupted rebaset at aborts abort an interrupted rebases# [-s REV | -b REV] [-d REV] [OPTION]c 1 K sM
d3 } } d3 } t } i } t � } t � } d3 }
| j d � rO t j }
n d3 } } z� | j � } | j � } | j d d3 � }
| j d d3 � } | j d d3 � } | j d g � } | j d � } | j d � } | j d t � } t j | | � } | j d � } | j d
t � } | j d t � } | j d t � } | rh| rht
j t d
� � � n | st| rK| r�| r�t
j t d � � � n | r�t
j t d � � � n | s�| s�|
r�t
j t d � � � n | j d t � r| j
t d � � n t | � \ } } } } } } } } } | r�t | | | | � Snj| ro| rot
j t d � � � n | r�| r�t
j t d � � � n | r�| r�t
j t d � � � n t j | � |
s�| d3 j � } | | } n t j | |
� } | r| j d | � } nc | rDt j | | g � } | j d | � } n3 t j | | pVd g � } | j d | | | � } | r�t | � } n d3 } | s�| j j d � d3 } n^ | p�t j r�| j d | | � r�t
j t d � d t d � �� n t | | | | � } | s,| j t d � � d S| rp| | j � rpt
j t d! � | | d t d" � �� nE | \ } } } | r�| j j | g d# t �} t! | | | � } n | r>| s�t" d$ � � d% � } | r>t � } xR | D]G }! | j# | |! j � � t$ | � d k r�t
j t d& � � � q�q�Wq>n | sb| j j | g d# t �} n | j% j& � }" | p}| j' } | r�t( j) | � n t* | � }# t$ |# � }$ d' }% x|# D]}! |% d 7}% | |! d( k r�| j+ t d) � |% d* |! | |! f t d+ � |$ � t, | | | | | | | | | � t- | |! | | | � \ }& }' t$ | j. � � d, k ry| j j d- � n� zi | j/ d. d/ | j d d0 � � t0 | |! |& | | � }( |( r�|( d1 d' k r�t1 j2 t d2 � � � n Wd3 | j/ d. d/ d0 � Xt j3 | |! | � | s6t4 | |! |& |' d | d4 |
�}) n | j5 | |& j6 � � d3 }) |) d3 k rv| |) j7 � | |! <q�| s�| j8 t d5 � |! � | j d6 |& � | j# |! � n |& | |! <q�q�W| j+ t d) � d3 � | j8 t d7 � � | r�| r�t- | t | � | | | � \ }& }' | r.| }* ni d8 }* xE | D]= }+ |+ | k r;| |+ t9 k r;|* d9 | |+ j: � 7}* q;q;W| j; |* | j j< � � }* t4 | |! |& | d: |* d | d4 |
�}) n d; | j= � k r�t> | | | | � n |" rR i }, xG | j? � D]9 \ }- }. |. t9 k r | |. j6 � |, | |- j6 � <q q W| | j6 � }/ n | s� d3 }0 | rm |) }0 n t@ | | | | |0 � n |" r� tA | |/ |, |" � n tB | � | j8 t d< � � t
jC | jD d= � d> t �| r
| j8 t d? � t$ | � � n | r7
| d@ j6 � | j% | k r7
t( jE | | � n Wd3 tF | | � Xd3 S(A 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.
You should not rebase changesets that have already been shared
with others. Doing so will force everybody else to perform the
same rebase or they will end up with duplicated changesets after
pulling in your rebased changesets.
In its default configuration, Mercurial will prevent you from
rebasing published changes. See :hg:`help phases` for details.
If you don't specify a destination changeset (``-d/--dest``),
rebase uses the tipmost head of the current named branch as the
destination. (The destination changeset is not modified by
rebasing, but new changesets are added as its descendants.)
You can specify which changesets to rebase in two ways: as a
"source" changeset or as a "base" changeset. Both are shorthand
for a topologically related set of changesets (the "source
branch"). If you specify source (``-s/--source``), rebase will
rebase that changeset and all of its descendants onto dest. If you
specify base (``-b/--base``), rebase will select ancestors of base
back to but not including the common ancestor with dest. Thus,
``-b`` is less precise but more convenient than ``-s``: you can
specify any changeset in the source branch, and rebase will select
the whole branch. If you specify neither ``-s`` nor ``-b``, rebase
uses the parent of the working directory as the base.
For advanced usage, a third way is available through the ``--rev``
option. It allows you to specify an arbitrary set of changesets to
rebase. Descendants of revs you specify with this option are not
automatically included in the rebase.
By default, rebase recreates the changesets in the source branch
as descendants of dest and then destroys the originals. Use
``--keep`` to preserve the original source changesets. Some
changesets in the source branch (e.g. merges from the destination
branch) may be dropped if they no longer contribute any change.
One result of the rules for selecting the destination changeset
and source branch is that, unlike ``merge``, rebase will do
nothing if you are at the latest (tipmost) head of a named branch
with two heads. You need to explicitly specify source and/or
destination (or ``update`` to the other head, if it's the head of
the intended source branch).
If a rebase is interrupted to manually resolve a merge, it can be
continued with --continue/-c or aborted with --abort/-a.
Returns 0 on success, 1 if nothing to rebase.
R" R R R R R- R/ R t extrafnR& R' t keepopens+ 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
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 %lrs (%ld)::t .s+ (children(ancestor(%ld, %d)) and ::(%ld))::s base is ancestor of destination
s first(children(%ld) - %ld)s; can't remove original changesets with unrebased descendantst hints& use --keep to keep original changesetss nothing to rebase
i s# can't rebase immutable changeset %ss see hg help phases for detailst inclusives( cannot use both keepbranches and extrafnc S s | j � | d <d S( Nt branch( R5 ( t ctxt extra( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyR0 � s s' cannot collapse multiple named branchesi i����t rebasings %d:%st
changesetsi s resuming interrupted rebase
t uit
forcemergeR i s@ unresolved conflicts (see hg resolve, then hg rebase --continue)Nt editors no changes, revision %d skipped
s next revision set to %s
s rebase merging completed
s Collapsed revisions
* %st commitmsgt qtips rebase completed
t undot
ignoremissings %d revisions have been skipped
t tip(G t NoneR t sett getR t commitforceeditort wlockt lockt Falset
logmessageR t AbortR t warnt
restorestatusR/ t
bailifchangedR5 R t revsinglet revst revranget minR: t debugR t _enabledt
buildstatet statust mutablet changelogt ancestorst Truet
checkexternalt AssertionErrort addt lent
_bookmarkst copyt _bookmarkcurrentR t unsetcurrentt sortedt progresst storestatust
defineparentst parentst setconfigt
rebasenodeR t InterventionRequiredt duplicatecopiest concludenodet
setparentst nodeR t notet nullmerget descriptionR" t usernamet tagst updatemqt iteritemst clearrebasedt updatebookmarkst clearstatust
unlinkpatht sjoint
setcurrentR (1 R: t repot optst
originalwdt targett activebookmarkt externalt statet skippedt targetancestorsR< RG RF t destft srcft baseft revft contft abortft collapseft collapsemsgR0 t keepft
keepbranchesfR1 R5 R t rebasesett srcR t roott resultt branchesR t currentbookmarkst sortedstatet totalt post p1t p2t statst newrevR= t rebasedt nstatet kt vt
targetnodet collapsedas( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyR s\ R
'
"
#
%
c C s� t } t | � } x� | D]� } | | k r1 q n xo | | j � D]] } | j � | k rB | j � | k rB | t k r� t j t d � � � n | j � } qB qB Wq W| S( ss Check whether one or more external revisions need to be taken in
consideration. In the latter case, abort.
s: unable to collapse, there is more than one external parent( R RQ Rf R R RJ R ( R{ R� R� R� R R t p( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRZ [ s
c C s< y| j | | j � | | j � � | | } | d k rL | j � } n i | j � d 6} | ru | | | � n | j d | d | j � d | j � d | d | � } | j j | | j
� � t | j � t
j � }
| | j � } | r t
j | |
| g � n | SWn$ t j k
r7| j j � � n Xd S( s8 Commit the changes and store useful information in extrat
rebase_sourcet textt usert dateR7 R< N( Rl Rm RB Rp t hext commitR� R� t dirstatet setbranchR5 t maxt phaseR
t draftt retractboundaryR RJ t
invalidate( R{ R R� R� R= R< R0 R6 R7 R� t targetphaset newnode( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRk n s& $
c C s
| d j � | | j � k rd | j j d | | j � | | f � t j | | t t t � n | j j d � | j j � | j j d | | j � | | f � d } | | j � | t
| � j � k r� | | j � j � } n t j | | t t t | | � S( s Rebase a single revisionR2 s update to %d:%s
s already in target
s merge against %d:%s
N(
R R: RR R t updateRH RY R� t writeRB RQ R� Rm ( R{ R R� R� R R ( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRh � s (
(&c C sX g | D] } | | t k r | ^ q } | j d | | � } | rP | | d Sd Sd S( s8 return the nearest ancestors of rev in the rebase results max(%ld and (::%d))i N( Ro RO RB ( R{ R R� R R� t
candidates( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyt nearestrebased� s
) c
C s� | | j � } t } } | d j � } | | k r? | } nx | | k r� | | t k rd | } q� | | t k r� t | | | � } | d k r� | } q� q� | | } n | } | } t | � d k r�| d j � | k r�| d j � } | | k r[| | k r| | } q�| | t k rNt | | | � } | d k rX| } qXq�| | } q�| t k r�t j t
d � | � � n | } n | j j d | | j � | | j � f � | | 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
N(
Rf R R Ro t
revignoredR� RB R] R RJ R R: RR (
R{ R R~ R� R� Rf R� R� t P1nt P2n( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRe � s@
(
"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 patht joint mqR t
linereadert filet
startswithRY RH ( R{ t patchnamet mqpatcht line( ( s2 /usr/lib64/python2.7/site-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 rE| | \ }
} | j j d | | |
f � | j | d
d |
d | d t | | � g �q� | j
| | d � q� Wg | D]+ } | j j | d � d | k re| ^ qe}
|
| 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 import mq patch %d (%s)
R� t gitR i i N( ( R� t
fullseriesRC t appliedRm R R: RR t nameR� R\ t finisht keysRb RY t qimportt strt guard_ret splitt seriesdirtyt savedirty( R{ R� R� R| t mqrebaseR� t original_seriest skippedpatchesR� R R� t isgitR t newseries( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRs � s2
"
+
c C sg | 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^ Rt R t deletedivergentR� ( R{ R� R� t originalbookmarkst marksR� R� ( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRv � s c C sF | 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 � xf | j � D]X \ }
} | |
j � } | t k r| | j � }
n | }
| j d | |
f � q� W| j � | j j d � d S(
s* Store the current status to allow recoveryt rebasestatet ws
s %d
s %s
R s %s:%s
s rebase status stored
N( t openerR� R� t intRt Ro t closeR: RR ( R{ R} R~ R� R R& R' R� R t fR R� t oldrevR� ( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRd s
c C s t j | j d � d t �d S( s Remove the status filesR� R@ N( R Rx R� RY ( R{ ( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRw s c C s� yxd } t } t } d } i } | j d � } x�t | j � j � � D]n\ } } | d k rt | | j � } qI | d k r� | | j � } qI | d k r� | | j � } qI | d k r� t t | � � } qI | d k r� t t | � � }
qI | d k rt t | � � } qI | d k rIt
| � d k o<d
| k rI| } qI | j d
� \ } }
|
t t
� t t � f k r�t |
� | | | j � <qI | |
j � | | | j � <qI Wt � } | s4t | g � } xX t | j � � D]A \ } } | t k r | | k r | j | � n | j | � q�Wn | j j d | � | j j d � | | | | | |
| | | f SWn@ t k
r�} | j t j k r�� n t j t d
� � � n Xd S( s" Restore a previously stored statusR� i i i i i i i iQ t :s computed skipped revs: %s
s rebase status resumed
s no rebase in progressN( RB RH R R� t enumeratet readt
splitlinesR t boolR� R] R� R� Ro R� RC Rb t itemsR\ R: RR t IOErrort errnot ENOENTR RJ R ( R{ R~ R R� R R� R� t iR# R} R& R' R� R� R� t seent oldt newt err( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRL ! sR % + " c s� g | j � D] } | t k r
| ^ q
} g | D] } � | j � s2 | ^ q2 } | r� t j t d � d j � f d � | D� � d t d � �� n t � } | r� t � j j | � � } n | t | � r� � j
j t d � � d St j
� � | j � t t t � t � f d � | j � � } | rzg � j d | � D] }
|
j � ^ qI} t j � j
� | � n t � � � j
j t d
� � d Sd S(
s, Restore the repository to its original states1 can't abort rebase due to immutable changesets %ss , c 3 s | ] } t � | � Vq d S( N( R� ( t .0R ( R{ ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pys <genexpr>X s R3 s see hg help phases for detailss? warning: new changesets detected on target branch, can't abort
i����c s | d k o | � k S( Ni����( ( t x( R~ ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyt <lambda>e s s
roots(%ld)s rebase aborted
i N( t valuesR RV R RJ R R� RC RW t descendantsR: RK R R� R RH RY t filterRm R t stripRw ( R{ R} R~ R� R t dstatesR t immutableR� R� R, t strippoints( ( R{ R~ s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyR/ R s( +) # +
c C sc d | j � k rX | j � g | j j D] } | j ^ q( k rX 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 rA| j � | j � k }
| rA|
rA| | j � k rA| 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 r�t | | <q�q�Wt | � d k rFt | j d | | � � } x+ t | � t | � D] }
t | |
<q/Wn | 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 %d starting from %s
i s %ld::%ldR2 N( Rr Rm R� R� R RJ R t listRC t sortt ancestorR5 t childrenR: RR RB R� t dictt fromkeysR R] Rf RW t findmissingrevsR Ro RO R� ( R{ R R� R R t rootsR� t detachsetR� t
commonbaset
samebranchR t rebasedomaint ignored( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRT n s> %
&
c C s~ t j r� g } x� t | j � � D]p \ } } | d k r" | | k rO d } n) | d k rk | | f } n
| | f } | j | | | f � q" q" W| rzt j | | � qzn� g | D] } | | t k r� | ^ q� } | rzg }
xn | j d | � D]Z } t | j j
| j � g � � t | � rA| j t
d � � q� |
j | j � � q� W|
rzt j | | |
d � qzn 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 RS Rb R� RB t appendt
createmarkersRo RC RW R� R RK R Rm R R� ( R: R{ R� R� R� t markersR R� t succsR� t strippedR� ( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyRu � s*
)+c O s� | j d � ri| j d � r5 | d =| j d � n | d j � } t j | � t | � } t j } d � } | t _ z | | | | | � Wd | t _ Xt | � } | | k r�d | k r� | d =n t | | | � | d j
� }
| |
j � } | | d j � k rft j
| | � t j
| | g | d j � � rc| j t d � | j � qcqfq�n: | j d � r�t j t d
� � � n | | | | | � d S( sC Call rebase after pull if the latter has been invoked with --rebaseR R� sC --update and --rebase are not compatible, ignoring the update flag
R2 c _ s d S( N( ( t argst kwargs( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyt _dummy� s NR s updating bookmark %s
R+ s% --tool can only be used with --rebase( RD RR Rm R RM R] R t postincomingR RB R5 R R R� R RU R R` R RJ ( t origR: R{ R R| t movemarkfromt revsprepullt origpostincomingR
t revspostpullR5 R ( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyt
pullrebase� s8
"c C sb t j t j d t � } | d j d d d t d � f � | d j d d d t d � f � d S(
s8 Replace pull with a decorator to provide --rebase optiont pulli R R s' rebase working directory to branch headR* R+ s specify merge tool for rebaseN( R t wrapcommandR t tableR R RB R ( R: t entry( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyt uisetup s
(1 t __doc__t mercurialR R R R R R R R R R R
R R t mercurial.commandsR
t mercurial.nodeR t mercurial.lockR t mercurial.i18nR R� R� Ro R� t cmdtablet commandt
testedwithRH R RZ RB Rk Rh R� Re R� Rs Rv Rd Rw RL R/ RT Ru R R ( ( ( s2 /usr/lib64/python2.7/site-packages/hgext/rebase.pyt <module> sl 4. � # + ( 1 X ! '