-=[ Mr. Bumblebee ]=-
_Indonesia_
ó
Ì\,Tc @ s5 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 d „ Z d
„ 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/ d0 e! e d1 ƒ f d2 d3 d e d4 ƒ f d5 d6 e! e d7 ƒ f d8 d9 e! e d: ƒ f g e e d; ƒ ƒ d< „ ƒ Z" d= „ Z# e$ e$ e$ d> „ Z% d? „ Z& d@ „ Z' dA „ Z( dB „ Z) dC „ Z* dD „ Z+ dE „ Z, dF „ Z- dG „ Z. dH „ Z/ dI „ Z0 dJ „ Z1 e$ dK „ Z2 dL „ Z3 dM „ Z4 dN „ Z5 d S(O 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 internalc C s5 | j ƒ j d d ƒ } | d k r1 | | d <n d S( Nt source( t extrat gett None( t ctxR t s( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt
_savegraft s c C s | j ƒ | d <d S( Nt branch( R ( R R ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _savebranch% 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 _makeextrafn( s t rebaseR R t 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 toolR t continues continue an interrupted rebaset at aborts abort an interrupted rebases# [-s REV | -b REV] [-d REV] [OPTION]c 9 s
d? } } d? } t } i } t ƒ } t ƒ } t j | }
d? } } z¿ ˆ j ƒ } ˆ j ƒ } | j d d? ƒ }
| j d d? ƒ } | j d d? ƒ } | j d g ƒ } | j d ƒ } | j d ƒ } | j d t ƒ } t j | | ƒ } | j d ƒ } t
g } | r| g } n | j d t ƒ } | j d
t ƒ } | j d t ƒ } | rq| rqt j t
d ƒ ƒ ‚ n | s}| rÆ| 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 y+ t ˆ ƒ \ } } } } } } } } } Wnk t j k
r©| ryt ˆ ƒ ˆ j j t
d ƒ ƒ d St
d ƒ } t
d ƒ } t j | d | ƒ‚ n X| r˜t ˆ | | | ƒ SnÒ| rê| rêt j t
d ƒ ƒ ‚ n | r| rt j t
d ƒ ƒ ‚ n | r2| r2t j t
d ƒ ƒ ‚ n t j ˆ ƒ t j ˆ ƒ |
soˆ d? j ƒ } ˆ | } n t j ˆ |
ƒ } | r¹t j ˆ | ƒ } | s[| j t
d ƒ ƒ d Sn¢| rt j ˆ | g ƒ } | sñ| j t
d ƒ ƒ d Sˆ j d | ƒ } | s[t ‚ nIt j ˆ | p$d g ƒ } | sJ| j t
d ƒ ƒ d Sˆ j d | | | ƒ } | s[| | j ƒ g k r³| r| j t
d! ƒ | ƒ qW| j t
d" ƒ ƒ n¤ ˆ j d# | | ƒ s!| r| j t
d$ ƒ d% j ‡ f d& † | Dƒ ƒ | f ƒ qW| j t
d' ƒ | ƒ n6 | j t
d( ƒ d% j ‡ f d) † | Dƒ ƒ | f ƒ d S| pgt j! r¤ˆ j d* | | ƒ r¤t j t
d+ ƒ d t
d, ƒ ƒ‚ n t" ˆ | | | ƒ }! |! sÖ| j t
d- ƒ ƒ d St# | ƒ }" | r&ˆ |" j$ ƒ r&t j t
d. ƒ ˆ |" d t
d/ ƒ ƒ‚ n |! \ } } } | rkˆ j% j& | g d0 t' ƒ} t( ˆ | | ƒ } n | j) ƒ r˜| r˜| j t
d1 ƒ | ƒ n | r| j* d t+ ƒ | rt ƒ }# xR | D]G }$ |# j, ˆ |$ j ƒ ƒ t- |# ƒ d k rÄt j t
d2 ƒ ƒ ‚ qÄqÄWqn | s9ˆ j% j& | g d0 t' ƒ} n ˆ j. j/ ƒ }% | pTˆ j0 } | rmt1 j2 ˆ ƒ n t3 | ƒ }& t4 | ƒ }' t- |' ƒ }( d }) xL|' D]D}$ |) d 7}) | |$ d3 k rž| j5 t
d4 ƒ |) d5 |$ ˆ |$ f t
d6 ƒ |( ƒ t6 ˆ |$ | | | ƒ \ }* }+ t7 ˆ | | | | | | | | ƒ t- ˆ j8 ƒ ƒ d7 k r\ˆ j j9 d8 ƒ n† zl | j: d9 d: | j d d; ƒ d< ƒ t; ˆ |$ |* | | ƒ }, |, rÇ|, d= d k rÇt j< t
d> ƒ ƒ ‚ n Wd? | j: d9 d: d; d< ƒ X| rþt j= ˆ |$ | ƒ n/ ˆ |$ j> ƒ j ƒ }- t j= ˆ |$ |- d@ | ƒ| sW t? ˆ |$ |* |+ d |& dA |
ƒ}. n ˆ j@ ˆ |* jA ƒ ƒ d? }. |. d? k r— ˆ |. j ƒ | |$ <qâ | sÕ | jB t
dB ƒ |$ ƒ | j9 dC |* ƒ | j, |$ ƒ n |* | |$ <qžqžW| j5 t
d4 ƒ d? ƒ | jB t
dD ƒ ƒ | r
| r
t6 ˆ t# | ƒ | | | ƒ \ }* }+ | rO
| }/ n` dE }/ xE | D]= }0 |0 | k r\
| |0 tC k r\
|/ dF ˆ |0 jD ƒ 7}/ q\
q\
Wt j dG t' ƒ }
t? ˆ |$ |* | dH |/ d |& dA |
ƒ}. x4 | jE ƒ D]# }1 | |1 tC k rã
|. | |1 <qã
qã
Wn dI ˆ jF ƒ k r5 tG ˆ | | | n |% rž i }2 xG | jH ƒ D]9 \ }3 }4 |4 tC k rN ˆ |4 jA ƒ |2 ˆ |3 jA ƒ <qN qN Wˆ | jA ƒ }5 n | j | | ƒ }6 |6 g ˆ d? j8 ƒ D] }7 |7 j ƒ ^ qÄ k r | jB t
dJ ƒ ƒ tI jJ ˆ |6 t ƒ n | s< d? }8 | r# |. }8 n tK | ˆ | | |8 ƒ n |% rp tL ˆ |5 |2 |% ƒ | ˆ j. k rp d? } qp n t ˆ ƒ | jB t
dK ƒ ƒ t jM ˆ jN dL ƒ dM t' ƒ| rÏ | jB t
dN ƒ t- | ƒ ƒ n | r
ˆ d jA ƒ ˆ j. | k r
t1 jO ˆ | ƒ n Wd? tP | | ƒ Xd? S(O 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 current branch tip 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 branch tip 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 or there are
unresolved conflicts.
R' R R# R% R7 R9 R( R R1 R2 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 revisionsR6 s tool option will be ignored
sF 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 hints' 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
i s0 empty "source" revision set - nothing to rebase
s (%ld)::t .s5 empty "base" revision set - can't compute rebase set
s+ (children(ancestor(%ld, %d)) and ::(%ld))::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( t str( t .0R$ ( t repo( 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( R> ( R? R$ ( R@ ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr> s s first(children(%ld) - %ld)s; can't remove original changesets with unrebased descendantss& use --keep to keep original changesetss nothing to rebase
s# can't rebase immutable changeset %ss see hg help phases for detailst inclusives reopening closed branch head %s
s' cannot collapse multiple named branchesiÿÿÿÿt rebasings %d:%st
changesetsi s resuming interrupted rebase
t uit
forcemergeR R i s@ unresolved conflicts (see hg resolve, then hg rebase --continue)Nt skiprevt editors no changes, revision %d skipped
s next revision set to %s
s rebase merging completed
s Collapsed revisions
* %sR- t commitmsgt qtips0 update back to initial working directory parent
s rebase completed
t undot
ignoremissings %d revisions have been skipped
(Q R R t setR t getcommiteditort wlockt lockR t Falset
logmessageR R t AbortR t warnt
restorestatusR t RepoLookupErrort clearstatusRD R9 t checkunfinishedt
bailifchangedR R t revsinglet revranget statust revst AssertionErrorR% t joinR t _enabledt
buildstatet mint mutablet changelogt ancestorst Truet externalparentt closesbrancht insertR t addt lent
_bookmarkst copyt _bookmarkcurrentR t unsetcurrentR t sortedt progresst
defineparentst storestatust parentst debugt setconfigt
rebasenodet InterventionRequiredt duplicatecopiest p1t concludenodet
setparentst nodet notet nullmerget descriptiont iterkeyst tagst updatemqt iteritemsR t
updaterepot clearrebasedt updatebookmarkst
unlinkpatht sjoint
setcurrentR (9 RD R@ t optst
originalwdt targett activebookmarkt externalt statet skippedt targetancestorsRG RO RN t destft srcft baseft revft contft abortft collapseft collapsemsgR, t extrafnst keepft
keepbranchesfR: t msgR; R R' t rebasesett srcR# t resultt roott branchesR% t currentbookmarksR t sortedstatet totalt posRy t p2t statst p1revt newrevRH t rebasedt oldrevt nstatet kt vt
targetnodet newwdR t collapsedas( ( R@ s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR 3 sº S
+
'
"
#
%/
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( R> ( R? t p( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr>Ë s N( RL Ra Rs R% Ri R Rj t popR RR R t maxR^ Ro ( R@ R R‘ Rs R R% R³ ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyRf ¶ 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 dateR RG N( R{ R| R R t hext commitR¸ R¹ t dirstatet setbranchR Rµ t phaseR
t draftt retractboundaryR RR t
invalidate( R@ R% Ry R§ RH RG R R R Rª t targetphaset newnode( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyRz Í 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 ƒ | | j ƒ | t | ƒ j ƒ k rØ d
} n‹ | | j ƒ s| | j ƒ j
ƒ } nb x_ | | j ƒ D]; } | j | j ƒ ƒ | | j ƒ k r| j
ƒ } PqqWd
} t d ƒ ‚ | d
k rš| j j d | | j ƒ | | f ƒ n t j | | t t t | | d d d g ƒS( s Rebase a single revisionR< s update to %d:%s
s already in target
s merge against %d:%s
s4 no base found to rebase on (rebasenode called wrong)s detach base %d:%s
t labelsR' R N( R% RD Rt R t updateRP Re R¼ t writeRa R R§ Ry R| Rs R R] ( R@ R% Ry R R( R# R³ ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyRv æ 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( R~ R\ R ( R@ R% R R$ R« t
candidates( ( s0 /usr/lib/python2.7/dist-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(
Rs R R% R~ t
revignoredRÈ R Rj R RR R RD Rt (
R@ R% RŒ R R‘ Rs Ry R§ t P1nt P2n( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyRq + 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 pathR^ t mqR t
linereadert filet
startswithRe RP ( R@ t patchnamet mqpatcht line( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt isagitpatchV 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
fullseriesRL t appliedR| R% RD Rt t nameRÖ Ri t finisht keysRo Re t qimportR> t guard_ret splitt seriesdirtyt savedirty( R@ R R RŠ t mqrebaseRÏ t original_seriest skippedpatchesR³ R% RÛ t isgitR t newseries( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR‚ ^ 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( Rk Rƒ R t deletedivergentRÆ ( R@ R° R t originalbookmarkst marksR® R¯ ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR† † 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 intRƒ R~ t closeRD Rt ( R@ R‹ RŒ R R( R1 R2 RŽ R t fR& R¯ R¬ Rª ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyRr ‘ s
c C s t j | j d ƒ d t ƒd S( s Remove the status filesRë RK N( R R‡ R^ Re ( R@ ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyRV ¦ s c C s yÁd } d } t } t } d } i } | j d ƒ } xˆt | j ƒ j ƒ ƒ D]n\ } } | d k rz | | j ƒ }
qO | d k r™ | | j ƒ } qO | d k r¸ | | j ƒ } qO | d k rÙ t t | ƒ ƒ } qO | d k rú t t | ƒ ƒ } qO | d k rt t | ƒ ƒ } qO | d k rOt
| ƒ d k oBd
| k rO| } qO | j d
ƒ \ } }
|
t t
ƒ t t ƒ f k rŸt |
ƒ | | | j ƒ <qO | |
j ƒ | | | j ƒ <qO W| d k råt j t d ƒ ƒ ‚ n t ƒ } | s^t | g ƒ } xX t | j ƒ ƒ D]A \ } } | t k rJ| | k rJ| j | ƒ n | j | ƒ qWn | j j d d
j d „ t | ƒ Dƒ ƒ pŒ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 .hg/rebasestate is incompletes computed skipped revs: %s
t c s s | ] } t | ƒ Vq d S( N( R> ( R? R$ ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr>Ø s s rebase status resumed
s no rebase in progressN( R RP R Rí t enumeratet readt
splitlinesR% t boolRî Rj Rà R> R~ RÉ R RR R RL Ro t itemsRi RD Rt R^ t IOErrort errnot ENOENT( R@ R2 RŒ R( RŽ R R Rð t iR. R‹ R1 R¬ Rª R t seent oldt newt err( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyRT ª sZ % + " ' c C s` g | j ƒ D] } | j ƒ ^ q
} | | k r5 t Sx$ | j ƒ D] } | | k rB t SqB Wt S( s9 check whether the working dir is in an interrupted rebase( Rs R% Re t
itervaluesRP ( R@ R‹ R R³ Rs Rª ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt inrebaseá s % c
sÎ g | j ƒ D] } | t k r
| ^ q
} g | D] } ˆ | j ƒ s2 | ^ q2 } 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 | rªt ˆ | | ƒ r?t
j ˆ ˆ | j ƒ t t t ƒ n t ‡ f d † | j ƒ ƒ }
|
rªg ˆ j d |
ƒ D] } | j ƒ ^ qv} t j ˆ j ˆ | ƒ qªn t ˆ ƒ ˆ j j t d ƒ ƒ d
S( s, Restore the repository to its original states0 warning: can't clean up immutable changesets %s
s , c 3 s | ] } t ˆ | ƒ Vq d S( N( R> ( R? R$ ( R@ ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pys <genexpr>ô 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ÿÿÿÿ( ( t x( RŒ ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt <lambda> s s
roots(%ld)s rebase aborted
i ( t valuesR Rb Re RD RS R R^ RP RL Rc t descendantsR R RÅ R% t filterR| R t stripRV (
R@ R‹ RŒ R R t dstatesR& t immutablet cleanupR R« R t strippoints( ( R@ RŒ s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR9 í s0 +)
& +
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
RI 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::%ldR< N( R R| RÏ RÚ R RR R t listRL t sortt ancestorR t childrenRD Rt R RÅ t dictt fromkeysR Rj Rs Rc t findmissingrevsR% R~ R\ RÉ ( R@ R' Rž R( R t rootsR t detachsetR¡ t
commonbaset
samebranchR$ t rebasedomaint ignored( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR` 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 R_ Ro R÷ R t appendt
createmarkersR~ RL Rc R R% RS R R| R R ( RD R@ R R R² t markersR% Rª t succsR« t strippedR¡ ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyR… h s*
)+c O sš | j d ƒ r\| j d ƒ r5 | d =| j d ƒ n | d j ƒ } t | ƒ } t j } d „ } | t _ z | | | | | Ž Wd | t _ Xt | ƒ } | | k r–d | k r¾ | d =n t | | | | d j ƒ }
| |
j ƒ } | | d j ƒ k rYt
j | | ƒ t j | | g | d j ƒ ƒ rV| j
t d ƒ | j ƒ qVqYq–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
R< c _ s d S( N( ( t argst kwargs( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt _dummy” s NR% s updating bookmark %s
R6 s% --tool can only be used with --rebase( R Rt R| Rj R t postincomingR R R R% R RÅ R R[ R Rm R RR ( t origRD R@ R RŠ t movemarkfromt revsprepullt origpostincomingR! t revspostpullR R' ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt
pullrebase‰ s6
"c C sì t j j | j d ƒ ƒ s d Sy t | ƒ d } Wn. t j k
rc t d ƒ } | j | ƒ d SXt g | j
ƒ D] } | d k rt | ^ qt ƒ } | j t d ƒ | j t d ƒ d ƒ | | j t d ƒ d ƒ t | ƒ | f ƒ d S(
NRë i 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( RÍ RÎ t existsR^ RT R RU R RÆ Rj R t label( RD R@ R R Rû 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 ƒ d S(
s8 Replace pull with a decorator to provide --rebase optiont pulli R R s' rebase working directory to branch headR5 R6 s specify merge tool for rebaseRë s rebase in progresss1 use 'hg rebase --continue' or 'hg rebase --abort'N( R t wrapcommandR t tableR( R R R R t summaryhooksRi R, t unfinishedstatesRP ( RD t entry( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt uisetupÀ s (6 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ù R~ RÉ t cmdtablet commandt
testedwithR R R RP R Rf R Rz Rv RÈ Rq RÖ R‚ R† Rr RV RT R R9 R` R… R( R, R3 ( ( ( s0 /usr/lib/python2.7/dist-packages/hgext/rebase.pyt <module> sv 4. ÿ k < + ( 7 # X ! &
Copyright © 2017 || Recoded By Mr.Bumblebee