6hGSrSSKJr SSKrSSKJr SSKJrJrJ r SSK J r J r J r JrJrJrJrJrJrJrJrJrJrJrJrJrJrJrJrJ r J!r!J"r"J#r#J$r%J&r& Sr'Sr(1S kr)0r*\RV"\*5r+0r,\RZ"\,5r-\-"S S S S 9 Sr.Sr/Sr0SjSjr1\Rd"5r2\2"S5S5r3\2"S5S5r4Sr5"SS5r6\+"SSS/\"S5\"S54SS/\"S 5\"S54S!S"/\"S#5\"S54S$S%S&\"S'5\"S54S&S(S \"S)54S*S+S&\"S,5\"S-54S.S/S \"S054S1S2S&\"S35\"S454S5S6S \"S754S&S8S \"S954S:S;S \"S<54S=S>S \"S<54S?S@S&\"SA54S&SBS \"SC54SDSES \"SF54SGSHS \"SI54S&SJS&\"SK54/\ Rn-\ Rp-\ Rr-\"SL5\+RtSM9SN5r;SOrSRr?SSr@STrASUrBSVrCSWrDSXrESYrFSZrGS[rHS\rIS]rJS^rKS_rLS`rMSarNSbrOSlScjrPSdrQSerRSfrSSgrTShrUSirVg)mzcommand 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 ) annotationsN)_)nullrevshortwdirrev) bookmarkscmdutilcommandscopiesdestutilerror extensions logcmdutilmerge mergestate mergeutilobsoleteobsutilpatchphasespycompat registrarrepairrevset revsetlang rewriteutilscmutilsmartsetstateutils-1>-2-3-4-5develrebase.force-in-memory-mergeF)defaultsships-with-hg-corecg)Nr+./usr/lib/python3/dist-packages/hgext/rebase.py_nothingtorebaser.Ts r,c*UR5US'g)Nbranch)branch)ctxextras r- _savebranchr4Xszz|E)r,c2[R"USUSUS9$)zdsmall wrapper around destmerge to pass the right extra args Please wrap destutil.destmerge instead.rebaseF)action sourceset onheadcheck destspace)r destmerge)repor8r:s r- _destrebaser=\s&      r,s _destrebasecSnUb,[R"U[R"U5U5nU[R"[ X5/5-$N)rgetsetr fullreposetbasesetr=)r<subsetxr8s r-_revsetdestrebaserElsII}MM$(<(>? CDM}}Z1AB XXfe, !XXne<#.#C#C GGY$  79358U2   ))$? r,cpUR(aURR5$UR$r?)rarcrG)rs r-r<rebaseruntime.repos& ==::((* *:: r,cU(aURSSURSS9 gURRSS5nURU5 SSS5 g!,(df  g=f)z*Store the current status to allow recoveryr`)r`splain)locationwN)addfilegenerator _writestatusr<vfs)rtrfs r- storestatusrebaseruntime.storestatussZ   !!!!  ~t4!!!$544s A A*cURnURbeURX RR 5S-5 URS5 URX R R 5S-5 URS[ UR5-5 URS[ UR5-5 URS[ UR5-5 URSUR=(d S-5 URnURR5H`upEX$R 5nUS:aX%R 5nOSU-nX#UR 5nURSXgU4-5 Mb URRS5 g) N s%d %s r,r%ds %s:%s:%s srebase status stored )r< filternamewriterehexrfintrlrtrurgrhritemsrUdebug) rrr<rhdvoldrevnewrevdestnodes r-rrebaseruntime._writestatuss]yy&&& __%))+e34  ]]#'')E12 #dnn--. #djj/)* #d00112 4..5#67,,JJ$$&DAW[[]FAvAJ'++-H GGMVX$>> ?'  /0r,cURR5(d*[R"UR[ S55 UR 5nURRRS5 USUl USUl USUl USUl USUl USUlUS UlUS UlUS Ulg ) z"Restore a previously stored statusr6srebase status resumed originalwddestmapstateskippedcollapsekeep keepbranchesexternalactivebookmarkN)r~existsr wrongtooltocontinuer<r_readrUrrerhrrjrlrtrurfrg)rdatas r- restorestatusrebaseruntime.restorestatuss}}##%%  ' ' 1Y< @zz| 56}-J' (^ J' k*'] !/2[) "#45r,c SUlURnURbeSSS[SSS.nSn0n0nUR S5n[ UR 5R55GHmupxUS:XaXR5US'M#US:XaU(aXR5nMDMFUS:XaXR5US'McUS :Xa[[U55US 'MUS :Xa[[U55US 'MUS :Xa[[U55US'MUS:Xa[U5S:XaSU;dXS'MURS5n XSR5n U Sn U [;aGM[U 5S:aXSR5n OUn XU 'U [:Xa [XJ'GMYXR5XJ'GMp USc[ R""[%S55eXRS'XBS'['5n US (dn['UR)55n[+UR-55H8unnU[:waUU;aU R/U5 UR/U5 M: XS'UR0R3SSR5S[+U 555=(d S-5 U$)NT)rrrrrrr`rrr*rrrrQ:rs.hg/rebasestate is incompleterrrscomputed skipped revs: %s  c3,# UH nSU-v M g7frNr+.0rs r- &rebaseruntime._read..PscTkKK$ 2#Z  *yy?IJkk#11 2s;A33A3D(+DcU(d [5$[URXR5nU(d.URR [ S55 [5$UuUlUlUl UR(a[URR55n[U5S:wa[R"[ S55e[[!U55nURR"R%U/SS9n['URURU5Ul[+[UR555HcnURUnUR-5(dM)UR.(aM<URR [ S5U-5 Me UR15 UR2(d[UR555nU[UR65-nXpR8-n0n[:R<"UR[:R>5(aSS0nURRAU5 [BRD"URUS S 9 SSS5 SUl%g!,(df  N=f![RFa$n U RHc[ S 5U l$U eSn A ff=f) Nnothing to rebase r*s3--collapse does not work with multiple destinationsT) inclusives reopening closed branch head %s )rsevolution.allowdivergencestruer6)r7s&use --keep to keep original changesets)&r. buildstater<rlrUstatusrrerhrrirrKr InputErrornextiter changelog ancestorsexternalparentrfr closesbranchrurrtkeysrxryrrcreatemarkersoptconfigoverriderprecheckrrra) rrhresultrPr destancestorsdest rebaseset overridesrs r-_preparenewrebaserebaseruntime._preparenewrebases1#% %DIIw? GGNN134 5#% %6<3$, >> ++-.E5zQ&&LM4;'G II//99 T:M+499djj-PDMc'.."234G99W%D  ""4+=+=+=q!EFMN5 $$&zzGLLN+I THHI II CC CII!!$))X-F-FGGCW  WW++I6((IiP7 76;; 66>HIAF s6!J>- J;7J>;J>>K6K11K6cUR(aCSSKJn U"UR5UlURR R S5 O9URSUlURR R S5 URR RSSURURS9 g)Nr)overlayworkingctxsrebasing in memory srebasing on disk r6susing in-memory rebase: %r )rebase_imm_used)rzmercurial.contextr r<wctxrUrlog)rr s r-_assignworkingcopy rebaseruntime._assignworkingcopys == ;)$))4DI IILL  6 7 $DI IILL  4 5   + MM MM  r,c^ UR5 URURp2UR(aURR S[ 5 UR(al[5nURHRnURX%R55 [U5S:dM5[R"[S55e UR =(d UR"UlUR (a[$R&"U5 UR)5 U(aUR)U5 URR+5VVs/sHupgU[,:XdMUPM nnnURR/[S5[S5[U5S9m U 4Sjn [1UR25H:n URR5SU 5n U HnUR7XU 5 M M< T R95 UR;[S 55 gs snnf) Nrr*s'cannot collapse multiple named branchessrebasings changesets)unittotalcJ>TRSUR5U4-S9 g)N%d:%s)item) incrementr)r2ps r-progress.rebaseruntime._performrebase..progresss! KKh#'')S)99K ;r,ssort(%ld, -topo)srebase merging completed )rr<rUrurqinsertr4rlrirrr1rKr rrrg_activebookmarkr deactivaterrr makeprogress sortsourcerhrH _rebasenodecompletenote) rrr<rUbranchesrkrcandsrrC sortedrevsrs @r-_performrebaserebaseruntime._performrebases !99dggb    MM K 0~~5::CLL!1!1!348}q(#..HI&#11IT5I5I      &     R #zz//1B1tqQ'\1B GG kN=!1U !  <!.F(;VDJ!  (3"/  /01Cs 'H>;H>c URnXAnUcUR5nUR(d}URn[R "UUUR R5VVs0sH3upxU[:wdMURU5URU5/_M5 snn5nURn U cUR5n 0n URRSS5(aSUR50n URH n U "XZ5 M [UR!5["R$5n U UR&(+S.n URR)U S5 UR*(a([-UUR.U UUUR15U S9nO[3UU UUUR15U S9nUsSSS5 $s snnf!,(df  g=f)zCommit 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.Nr6s store-sources rebase_source))sphasess new-commit)uiallowemptycommit)rr3 commitmsgeditoruserr\)r3r-r.r/r\)r< descriptionrlrrupdate_hash_refsrrrnoder\rUrrrrqmaxphaserdraftrwrrzcommitmemorynoderr/ commitnode)rrr.r-r<r2clrrr\r3c destphasernewnodes r- _concludenoderebaseruntime._concludenodes yyi  )I~~B#44+/***:*:*<*<(7BGGFObggfo%66*<Iyy <88:D 77  i 9 9%swwy1EA cM V\\2 (1.2.F.F*F WW # #Iy 9}}*'!%'! +: 9)(: 9s0G&G9AG  G.c " URURURpenXBn[U5nURUU:XaUR [ S5U-5 GOX R;aF[ S5U-n URR U 5 URRU5 GOX R;aURUn U c[ S5U-n O[XJ5n [ S5X4-n URR U 5 URRU5 [[XBURURUR55n XRU'GOURU[:XGaUR [ S5U-5 U"U5 [UUURURURUR5upnUR (aOUR"R%5R'5U :Xa#URR)S5 SUlOSSUR+S S 50nUR-US 5 [/UUU UUUR0UR"S 9 SSS5 UR0(dU[L:gn[:RN"US 5n[:RP"SSU0UD6nUR"RSXMRU5XNRU55 URWUU5nOSnUbsUUR'5URU'UR)S[YU5-5 UUR[5(aUR][ S5U-5 OUR0(d8UR][ S5U-5 URRU5 XRU'UR)SU -5 O.UR [ S5XURU4-5 U(dUR_5 gg![2R4a UR6(a[2R8"S 5eUR0(aeUR [ S 55 [:R<"U5 O/![2R>a [AU5 [CU5 ef=fSUl"URG5 [HRJ"XMUR"S9 [/UUU UUUR0UR"S 9 GNf=f!,(df  GN=f)Nsalready rebased %s sInote: not rebasing %s and its descendants as this would cause divergence s+note: not rebasing %s, it has no successor s4note: not rebasing %s, already in destination as %s s rebasing %s sresuming interrupted rebase F)r+s forcemergetoolr,r6)rsDhit merge conflicts; rebasing that commit again in the working copy )wceditformsrebased as %s sRnote: created empty successor for %s, its destination already has all its changes sCnote: not rebasing %s, its destination already has all its changes snext revision set to %d salready rebased %s as %s r+)0r<rUrdrVrrrryrjrrxr3 adjustdestrhr defineparentsrbrp1rrrkr rebasenoderlr InMemoryMergeConflictsErrorr{ConflictResolutionRequiredr bailifchangedrrrrzrmergemodrr mergeeditformgetcommiteditor setparentsr2r<risemptyrr)rrr progressfnr<rUrdr2descrsuccsuccdescrrDp2basermergingrAr.r;s r-r!rebaseruntime._rebasenode=sDGGTYY$i} ::c?c ! IIa/047 8 >> >5   GGNN3  LL  S ! ?? ?>>sCD|GH4O#DJ/L$% GGNN3  LL  S !4dllDJJ MD#JJsO ZZ_ ' IIa()D0 1 sO(   ;; LBD{{tyy||~113r9 >?# 3TXXfc5JK &&y)<)"   NN!%=V>>-"00)D 00K(KdK  $$TX]]_dhmmoF,,S&9""&w-"3"3"5 3+eGn<==((**GGI ~~GG5 LL$$S)"$ 35:; II/0Dtzz#:O3PP      U!<<;;"'"B"B9"MM>>" !F "#11$7${{"'-,T2!"). //1 TYY?"   NN!%/=>>)DJJ   ;; MBEhhv&G)H ,, 1 %djj1Gll2!Y1J1J1L%LL  2,,'MFTZZJ II $}}2E2J2J2L M((i)G"**,"jjF)/JJv&) diik ! T::t|| ?*>Q*>? ? GGAJK L OODK ( >>$**!K   LL JJ LL  JJ<<  D '()  7+4@ <<T\\*J GGA9:ZG H    ##t6T !T__T5H5H%II   t%8%8 9J7 =@s6Qch^URmURR5VVs/sH*upVUS:dM Xe:wdMX`RU:wdM(UPM, nnnUVs/sHnTUR 5(aMUPM! n nSn U (aJTR R [S5SRU4SjU 55-[S5S9 Sn [5n U(a$[TRRU55n U [U5- (a&TR R [S 55 Sn U (aU(a/TRS U5V s/sHoR5PM n n [U5nURURR55 U(dURUR 5 TS R#5U;nU(d*U(a#[$R&"TUR 5 U(a![(R*"TR TW US 9 UR,(a;UR,TR.;a![0R2"TUR,5 [5T5 [7T5 U(d$TR R [S 55 gs snnfs snfs sn f![5T5 [7T5 U(d%TR R [S 55 ff=f)z-Restore the repository to its original state.rTs-warning: can't clean up public changesets %s , c3@># UHn[TU5v M g7fr?bytesrrr<s r-r'rebaseruntime._abort../s CAtAws see 'hg help phases' for detailsrFsDwarning: new changesets detected on destination branch, can't strip roots(%ld)r\rsrebase aborted )r<rrrhmutablerUrrrrir descendantsr2rrrrerrI clean_updaterstriprgrgrrhrr)rrrr{rrsrkr immutablecleanupr}r9 strippointsupdateifonnodes shouldupdater<s @r-rrebaseruntime._abortsyyA 5!JJ,,..DA6f)*ll1o)=.  %,EGq47??3DGIEG GHjj C CCD>?  %K!$.."<"[[-s REV]... | [-b REV]... | [-r REV]...] [-d REV] [OPTION]...) helpcategoryc URSS5n[R"USSS5nU(a2[R"X$SS/5 [R"X$/SQ5 [R"USS5 [R"US S S 5 U(dUR 5bS nUR S5(ap[ U5S1- n[R"USU5 [URUR S555n[R"SU5/US 'SUS'UR S5(dUR S5(a [XXB5$US:XGa[X5nUR5 UR5 UR5 UR (a["R$"['S55e[(R*"U[(R,5nUR.(d.U(d'["R$"['S5['S5S9e[0R2"XR45 UR75 S S S 5 S S S 5 gU(a,SS0n UR9U S5 [;XXBUS9sS S S 5 $[;XXB5$!,(df  O=fS S S 5 g !,(df  g =f!,(df  g =f!["R<aV URSS5(aeUR?['S55 [AU5 [CU5 [;XXBS S9s$f=f)a9move 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. If ``--source`` or ``--rev`` is used, special names ``SRC`` and ``ALLSRC`` can be used in ``--dest``. Destination would be calculated per source revision with ``SRC`` substituted by that single source revision and ``ALLSRC`` substituted by all source revisions. 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, aborted with --abort/-a, or stopped with --stop. .. 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 - stabilize orphaned changesets so history looks linear:: hg rebase -r 'orphan()-obsolete()' -d 'first(max((successors(max(roots(ALLSRC) & ::SRC)^)-obsolete())::) + max(::((roots(ALLSRC) & ::SRC)^)-obsolete()))' Configuration Options: You can make rebase require a destination if you set the following config option:: [commands] rebase.requiredest = True By default, rebase will close the transaction after each commit. For performance purposes, you can configure rebase to use a single transaction across the entire rebase. WARNING: This setting introduces a significant risk of losing the work you've done in a rebase if the rebase aborts unexpectedly:: [rebase] singletransaction = True By default, rebase writes to the working copy, but you can configure it to run in-memory for better performance. When the rebase is not moving the parent(s) of the working copy (AKA the "currently checked out changesets"), this may also allow it to run even if the working copy is dirty:: [rebase] experimental.inmemory = True Return Values: Returns 0 on success, 1 if nothing to rebase or there are unresolved conflicts. r6sexperimental.inmemoryabortstopcontinuerdry_run)rsourcerSrrrrSNF auto_orphanss%ld and orphan()s_destautoorphanrebase(SRC)rs!cannot stop in --collapse sessions<cannot remove original changesets with unrebased descendantss^either enable obsmarkers to allow unstable revisions or use --keep to keep original changesetsrrr6singletransactionT)rzr&r's?hit merge conflicts; re-running rebase without in-memory merge )"rrr check_at_most_one_argcheck_incompatible_argumentscurrenttransactionrkrilistrHr formatspec _dryrunrebaserXwlocklockrrlr rLrrrallowunstableoptrtrIr~rerpr _dorebaserFrrr) rUr<rdrzr7disallowed_optsuserrevsrbsrt allowunstablers r-rebaseresx}}Y(@AH  * *4&* MF ,, 9i0  ,, ;  !!$ 9= !!$x@ ((*6 xxd)~&66,, ./  $((>":;<!,,-@(KLU 4V  xx dhhy11Rv44 6 d' ZZ\499;    !&&q)M'NOO$..tX5N5NOMKK=&&2&    ! !$'7'7"8 9    !+'\\,  E;DAI""9i8 6(K98600U';\\\69800 E}}X'FGG GG     T "RveD D EsVK#!CK 9K#L( K43 L K K## K14 L>LLA'M/.M/c R[XSSUS9nURS5nU(aUR[S55 OUR[S55 UR 5 UR 5 SnSS0nUR US5 [UUUUU5nU[5:XaGSnUsSSS5 U(a!URSSSURS 5S 9 sSSS5 sSSS5 $SSS5 U(a_UR[S 55 UR[S 55(dUR5 OURSSSUS 9 SnOUR[S55 U(a!URSSSURS 5S 9 SSS5 SSS5 g!,(df  N=f![RaU UR[S55 U(a!URSSSURS 5S 9 SSS5 SSS5 g[Ra Snef=f!U(a"URSSSURS 5S 9 ff=f!,(df  O=fSSS5 g!,(df  g=f)NT)rzr{rdrsstarting in-memory rebase s8starting dry-run rebase; repository will not be changed rr6Fr)rrrr{srebase completed successfully s!apply changes (yn)?$$ &Yes $$ &No)rrrrsWdry-run rebase completed successfully; run without -n/--dry-run to perform this rebase rshit a merge conflict r*)rXrkrrrrr _origrebaser.r promptchoicerpr rGr) rUr<r7rdrr needsabortrress r-rrnsr $T$T JEhhy!G !234 J K  tyy{ 1 :DAI""9i8! *,,!&J98P--  "88I. .]#{-9$ !>?@q)M'NOO'')11 $$"& ' 2 #  B --  "88I. .]#98//  IIa12 36--  "88I. .]#${{ J  4--  "88I. .Y#{s*J;I>?G!F=6 G?(I>' J;GBI(I>,J= G G.I <I=(I>%J6I  I+I;;I>> J J J&c0[XXCS9n[XX#U5$)N)rd)rXr)rUr<r7rdrzrs r-rrs $H 8E ru 55r,c0US:wdeUR5 UR5 URS5(aG[R"S5(aSnSW-n[ S5U-n[R"U5eUR(a0UR(d[R"[ S55eU(aUR(a[R"[ S 55eUS :Xa1URS S 5(aUR[ S 55 US:Xa5[RRU5n[R "U5 UR#US :HS9n U bU sSSS5 sSSS5 $OURS5n [%UUUR&URSS5URS/5URS/5URS/5U S9n UR)U 5n U bU sSSS5 sSSS5 $[+XR5 Sn UR-SS5n U (aUR/S5n [0R2"U 5 UR5U 5 UR6(dUR95 SSS5 SSS5 SSS5 g![ a SnGNf=f!,(df  N2=f!,(df  N;=f!,(df  g=f)Nr interactiveshisteditr,s --config extensions.histedit=shg%s help -e histeditsOinteractive history editing is supported by the 'histedit' extension (see "%s")s+message can only be specified with collapses*cannot use collapse with continue or abortrr?Fstool option will be ignored rr _destspacerrrSrr:r6r)rrrkrfindKeyErrorrr rrorlr mergestatemodrrrcheckunresolvedr_definedestmaprzrstorecollapsemsgrr transactionr acceptinterventionr(r{rp)rUr<r7rdrenablehistedithelprmsretcoder:rhrsingletrs r-rrs V   tyy{ 88M " " C??;//%(N,n# UHn[TU5v M g7fr?rurws r-r!_definedestmap..Rs$BTU47^^TrysVnothing to rebase - working directory parent is already an ancestor of destination %s s nothing to rebase from %s to %s c3@># UHn[TU5v M g7fr?rurws r-rr`s >AtAwryscannot rebase the working copyr6s!rebasing working copy parent: %r )rebase_rebasing_wcps%ldsALLSRC) localaliasrsSRCT)r/rr*rs skipping %s - empty destination s'rebase destination for %s is not uniques&nothing to rebase - empty destination )r checkunfinishedrHrrr rrrrevrangerrH revsingler=rvrrIrkclearrrrrrrrrranyrevsrKr#)rUr<rzdestfsrcfbasefrevfr:rrrOrSrootsbpbasebbpbs rebasingwcpallsrcaliasrhrdestsetsizers ` r-rrs |  D! d# }}["788 / 0+,  D ''d3  IIaIJ K !!$- IIaLM NII0#; ""44&9 IIOP  ''e4D D$DED$KEA.88:>DDFBB+qc1FJ 6> LLNllnFB T$))$Db"MN NE%IIh. Dzdhhj\)II2 L=II<<1YY}dHHJ??II$  99$BT$BBDI J,II<    :;yy > >>EF)q!BCDDt*.."i/KFF-'   K%d# KiEFd   " "69 5F  E | $$T5UCD& ((*'01y!1g:y1  !>?@ N7$$ G * 5 5eQ ?f ,,wTe,L7|19!(GAJQYGGABCd1gMN**DEQO *2s2R UB.s)M_%!)_r)rir_rbrrrrKrr rLrr3rr)r<rrrbrrrs r-rrs eG ZF = ""$Auuwe#}(D AEEG$%  7|q{{}     ,  } uzz)MVG_)MM N  O r,c SnSU;aUSnUR5 URUUUUUUS9nUR5(a"URR SS5(dgUR U5n UR 5 U $)zTCommit the memory changes with parents p1 and p2. Return node of committed revision.Nr0)r\r3r/r1r.r+r,)_compacttomemctxrMrUrr commitctxclean) r<rr.r3r/r\r-r1memctx commitress r-r6r6s FEy!  MMO ]]   F~~ 2 25:M N Nv&IJJL r,c R^[RnTRRSS5(dU4SjnU"5 TR XSXBUS9nTR R TUR5TR55 UsSSS5 $!,(df  g=f)zPCommit the wd changes with parents p1 and p2. Return node of committed revision.r6rc&>TRS5$)Nr6)rr<sr-commitnode..sT%%i0r,)textr/r\r3r.N) r nullcontextmanagerrUrrcommitdirstate setbranchr1r)r<r.r3r/r\r-rr;s` r-r7r7s  B 77  i)= > > 0 ++Df   M "D$;$;$=  s AB B&c ^TUnUR5(a"URU5 [RnOTSR 5U:wa6TR R SX'4-5 [R"U5 OTR R S5 U4SjnTSnTRRTR55 TUn TR R SX4-5 Ub#TR R SUTU4-5 U"5 TRRUR5U R55n [R"TUSSUU /S QUS 9n UR!UR5TUR55 U(a["R$"XiU5 O%["R$"XiU R'55 SSS5 W R(S :a@UR5(a[*R,"5e[*R."S 5eg!,(df  N_=f) zFRebase a single revision rev on top of p1 using base as merge ancestorr\s update to %d:%s s already in destination c:>TRRT5$r?)rchanging_parentsrsr-rrebasenode..s 66t> r ! GGMM/2+= >  ! !% ( GGMM6 7<Dz D3356 s)CGGMM+sj89   /4d2DDE 11%**, K    '<    d2hmmo6    t% 0   t#&&( 3) , q ??  335 5229= = !- s +C I IcX!nUR5VVs/sH upgUS:dM X&U:XdMXd;dMUPM" nnn/n URRU5Hxn Un U [:wa'UR SX5R 5n U bX<n X:Xa,XS;a'X5n U [ :Xa[R"SU-5eU RU 5 Mz U $s snnf)aadjust rebase destination given the current rebase state rev is what is being rebased. Return a list of two revs, which are the adjusted destinations for rev's p1 and p2, respectively. If a parent is nullrev, return dest without adjustment for it. For example, when doing rebasing B+E to F, C to G, rebase will first move B to B1, and E's destination will be adjusted from F to B1. B1 <- written during rebasing B | F <- original destination of B, E | | E <- rev, which is being rebased | | | D <- prev, one parent of rev being checked | | | x <- skipped, ex. no successor or successor in (::dest) | | | C <- rebased as C', different destination | | | B <- rebased as B1 C' |/ | A G <- destination of C, different Another example about merge changeset, rebase -r C+G+H -d K, rebase will first move C to C1, G to G1, and when it's checking H, the adjusted destinations will be [C1, G1]. H C1 G1 /| | / F G |/ K | | -> K | C D | | |/ | | B | ... |/ |/ A A Besides, adjust dest according to existing rebase information. For example, B C D B needs to be rebased on top of C, C needs to be rebased on top \|/ of D. We will rebase C first. A C' After rebasing C, when considering B's destination, use C' | instead of the original C. B D \ / A rsmax(%ld and (::%d))s-rev %d should be rebased already at this time) rr parentrevsrrHrIrr ProgrammingErrorappend) r<rrhrrjrrrrrprevadjusted candidates r-rBrBsj # UHn[TU5v M g7fr?rurws r-r"_checkobsrebase..ssF-EU47^^-Erys+this rebase will cause divergences from: %ssJto force the rebase please set experimental.evolution.allowdivergence=True,rN)rrrrr rLr) r<rU rebaseobsrevsrebaseobsskipped divergenceokdivergencebasecandidates divhashesrhs ` r-rrfs~%%dH,G,GHL,? F-EF >?  ; sdii &:%<<1EE)5r,c## URbeURRRn[R "UR XR5/5HnU"U5nUcMUv M g7f)z,yield revision numbers for successors of revN)rrindexget_revr allsuccessorsobsstorer2)rMrr$rrs r- successorrevsr'|se ?? "" "nn""**G  " "4==49>>3C2D E AJ =GFs A.A=4 A=c \^^^^^^TRbeTRnURmUTnTRRT5n[[/m[ TTX#U5m[ U5n [SUSS55(a TSTS'GOX[U5Humn U n [UUU4Sj[TU 555(aTTn OX;a X:S:aX:n [TST5HOupU [:XaMT"X5(a[n M&T"X5(dM5U TU '[n U TXsX'U T'MQ U TT'M TS[:waLUSTS:Xa@[T5S:Xa[U5S:XdeTR5 U R5 [T5[U5:Xa-UT;a'[R"[!S5TTT4-5e[UU4SjT55(a[R"[!S 55e[#U4S j[U 555S:GaSS/n[U 5HumnU[:XdUT;aM[U 5U1- n[ TR%S UX55nU(dMLUR'5VVs/sHunnUS:dMUU;dMUPM nnnUVs/sH#nURU5S[:wdM!UPM% nn[ TR%S UUU55UT'M [S U55(a[)S[U555unmUS:aL[!S5R+U4SjU55n[R"[!S5TTTU4-5eTS:wa/TT[:waTTTSsTS'TT'U TU SsU S'U T'U SnTR,R/S[1T5-5 TSTSU4$s snnfs snf)aReturn new parents and optionally a merge base for rev being rebased The destination specified by "dest" cannot always be used directly because previously rebase result could affect destination. For example, D E rebase -r C+D+E -d B |/ C will be rebased to C' B C D's new destination will be C' instead of B |/ E's new destination will be C' instead of B A The new parents of a merge is slightly more complicated. See the comment block below. Nc32# UH o[:Hv M g7fr?rrs r-r defineparents..s +A<sr*rc3<># UHnT"UTT5v M g7fr?r+)rrDrPrr s r-rr+s!K4Jq:aq**4Jsrs>cannot rebase %d:%s without moving at least one of its parentsc3T># UHo[:g=(a T"TU5v M g7fr?r*)rrr rs r-rr+s" >1< .JsA. .s%(!source is ancestor of destinationc3N># UHo[:wdMUT;dMSv M g7f)r*Nr*)rrnewpss r-rr+s DjL1Qe^11js %% %s(%ld %% (%d+%d))s%ld - (::%ld) - %ldc3(# UHoSLv M g7fr?r+)rrHs r-rr+s5HD4Hsc3J# UHupUcM [U5U4v M g7fr?)rK)rrrHs r-rr+s&2GATA2s ##s or c3d># UH%nUcMSRU4SjU55v M' g7f)Nrsc38># UHnSUTU4-v M g7f)rNr+rws r-r*defineparents...$sE1x1d1g,6s)r)rrHr<s r-rr+#s0/ (FEJJEEEE (s0"0s4rebasing %d:%s will include unwanted changes from %ss future parents are %d and %d )rr isancestorrevrrrBrallranyr'rKreverserir rrsumrHrr_rrUrtuple)r<rrhrrj obsskippedr8roldpsbasesrnpjrDunwantedrS other_basessiderevsrrrmergesr unwanteddescrPrr r0s`` @@@@r-rCrCs1 ?? "" " B!!J 3 >>>q!EFGG" Dc%j DDqH$< 'GAtw$%-e*v-K -{DGH x"'++-"/$!Q1q5AQj=PA- )(!BMM!,soggll477<<3G gt $$R(D}--  (     s.B3B=B Bc 0nURnURSSn[5nURHnXRR 5n X;aNUR RSXR4-5 UR[XR54XI'MrURUR5 M U(aURXR55 [USS9Hpn X;aRXIupUR R[S5XU XU 4-5 UR!USU U SX-/S9 MZURXIS 5 Mr UV s/sH*n UR"R%U S 5S U;dM(U PM, n n XRSS&SUlUR)5 ggs sn f) z9Update rebased mq patches - finalize and then import themNs.revision %d is an mq patch (%s), finalize it. T)r9supdating mq patch %s to %d:%s r+r)rNgitrrr*)rJ fullseriesriappliedr2rrUrnamerRrfinishrrr#rqimportguard_rer seriesdirty savedirty)r<rrjrdmqrebaserJoriginal_seriesskippedpatchesrrrWisgitr newseriess r-raraIsH BmmA&OUN ZZ66l  < GGMMB-  VV[vv%>?HM   qvv & $ ((D1C!&m  893ZCj)9:; "+, ""8=#34!2.% ${{  A&q)? $  % a A2 s -'GGcU=(d SnURSS5nURSU-5 UR5 g)z,Store the collapse message to allow recoveryr,last-message.txtrrN)rrclose)r<rors r-rrs7$K $d+AGGGk !"GGIr,c8URRSSS9 g)zRemove collapse message filercTrZN)rrdrs r-rrsHH+4@r,cURS5nUR5R5nUR5 U$![a, U(aSnU$[ R "[S55ef=f)z*Restore previously stored collapse messagercr,s'missing .hg/last-message.txt for rebase)rreadlinerrdFileNotFoundErrorr rr)r<rrros r-rrsv M HH( )jjl((*     M K ++a JKL L Ms?AA9 A9cUR5nU(aURS5 URRSSS9 g)zRemove the status filesr`TrZN)rremovefilegeneratorrrd)r<rs r-rrs:  "B  ~.HHd;r,c## [U5nU(as[U5n/nUHnXU;dM URU5 M U(d[R"[ S55eU[U5-nUv U(aMrgg7f)ayield source revisions in an order that we only rebase things once If source and destination overlaps, we should filter out revisions depending on other revisions which hasn't been rebased yet. Yield a sorted list of revisions each time. For example, when rebasing A to B, B to C. This function yields [B], then [A], indicating B needs to be rebased first. Raise if there is a cycle so the rebase is impossible. s#source and destination form a cycleN)rirrr rr)rhsrcsetsrclistrrs r-r r sw\F .Az' a ""1%K#LM M#f+  &s+B AB B cT^UR5nUSR5nSUR5;aURRVs1sHoPUR R5iM! nn[ UR55U-(a[R"[S55e[[U55nU(d[R"[S55e[UR SUS55nU(d[R"[S55eSn [XS9n[R!U["5m[%U5S :Hn UGH/n XU R5n U R'U 5n X:Xa[R"[S 55eX:XaUS nXR)5:Xa"U R+5UR+5:HnO!U R+5U R+5:HnU(dYU(aRXR-5;a?U R5TU R5'UR.R1S 5 GMS n UR.R1SX4-5 GM2 U (ag [T5HdnUR2R5U5Vs/sHnU[6:wdMUPM nnU(dMC[9U4SjU55(dM_UTU'Mf XAT4$s snfs snf)z`Define which revisions are going to be rebased and where repo: repo destmap: {srcrev: destrev} r\rXs&cannot rebase onto an applied mq patchsno matching revisionsrzrc"UR5$r?)r)rs r-revofbuildstate..revofs uuwr,)keyr*r.Ns!source is a child of destination Fs rebase onto %s starting from %s c3L># UHnTRU5U:Hv M g7fr?)rk)rrrs r-rbuildstate..s>g599Q<1,gs!$)rrr`rJrVr2rirr rLrrr rrdictfromkeysrrKrrDr1rbrUrrrrr7)r<rhr[rrer mqapplied sortedsrcrrp emptyrebaserootr commonbaser samebranchrrrbrs @r-rrsw  Id!J $))+15AA!&&\%%' A w~~ 9 ,""1%N#OP PZ()I q!9:;; -16 7E q!9:;; 5 $E MM)W -Ei.A%KDHHJ'(]]4(  ""1%I#JK K  :Dwwy ![[]dkkm; ![[]dkkm;  t||~/E%)HHJdhhj! CD   :d\IJ)*e}"nn77<M<W 1<M 7s>g>>>E#J   %%gB^Ns&L L%&L%c \URRn 0n 0n [R"U[R5(+n /n [ UR 55HupUS:dM X:wdMU "U5nU=(d U "U5nUU U'SnX;a!U (dXR5(dSnOU(aU RU5 OU4nUcM{UU U4'M U (aU4U [U 5'U(aURnURnURn0nU R 5H6unnUH*nU"UVs/sH nU"U5PM snSS9UU"U5'M, M8 U"USSS9nURUS 9 U(a0n [R"XS XS 9 gs snf) abdispose 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. If `keepf` is not True, the rebase has --keep set and no nodes should be removed (but bookmarks still need to be moved). If `backup` is False, no backup will be stored when stripping rebased revisions. rNr+snode)rWsoldnodesnewnodes)rrvalue) nodechangesr6r{)rr2rrrrrrr;hexfunc formatlist formatdictrr cleanupnodes)rUr<rhrrjrnrtrYrtonode replacementsmoves stripcleanupcollapsednodesrroldnoder;succshfflfdchangesoldnsnewnoldnnrs r-rcrcs,^^ FL E))$0I0IJJLNekkm,  Q;6=SkG!3VF^G$E'NE~ty'9'9';';E%%g.  +0 gZ(-/:n U>*+ ZZ ]] ]]'--/KE4$&t'._dummyYsr,rr)startrr\rs%nothing to rebase - updating instead Nr?s%--tool can only be used with --rebase)rkrrrr rrrrr rrHrK postincomingrrrHrNoMergeDestAbortr destupdaterrr r)origrUr<rrdrr revsprepullorigpostincomingrret revspostpullr:r_a_bs r- pullrebaser=s@ xx ==&; < <CDCABD""32 2 ZZ\499;xx!!N)  # #DD 9  ! !B d)K&33  $*G  823d3d3'7$t9L)D=U t#X !4!4;!4!GH %.\" 22,t,U'\t J 88F  ""1%M#NO O2+d+d+ J?(8$ -- 2"*"5"5d";KCR4jnn.. !$:";< !$M"NO!1 2W';\\t Jsi)I::BI( GAI(" G.I: GI(AI%0I(20I%"I($I%%I(( I7 2I:: J c^0n[5nURnURRn[UR S55nUHnUR U5n [[ R"URU /55n U RU 5 U V s1sH o"U 5iM n n U RS5 U (aU RU5(aSX8'MTUn U H nURX5(dMXU' M X;d[U4SjU 55(dMURU5 M UU4$s sn f)aUFigure out what to do about about obsolete revisions `obsolete_with_successor_in_destination` is a mapping mapping obsolete => successor for all obsolete nodes to be rebased given in `rebaseobsrevs`. `obsolete_with_successor_in_rebase_set` is a set with obsolete revisions, without a successor in destination, that would cause divergence. s extinct()Nc3,># UH oT;v M g7fr?r+)rrrhs r-r)_compute_obsolete_sets..s/OhW hs)rirr#r$rHr2rr%r&removediscardissubsetr6r8r)r<rrhrxryr8r$ extinctrevssrcrevsrcnode successorsrsuccrevsdstrevsuccrevs ` r-rrs..0*,/E) BhhGdii -.K''&/..t}}wiHI '"(23 1GAJ 3X..{;;=A 2 :V_F###G44EL6B$(C/Oh/O,O,O9==fE- 2 /- %4s E cUR5 UR5 [X5nURSS9 SSS5 SSS5 g!,(df  N=f!,(df  g=f)NTr)rrrXr)rUr<rs r- abortrebasersA tyy{d' %%d%3#{{s!AAA A A A-cUR5 UR5 [X5n[RR U5n[ R"U5 URSS9nUbUsSSS5 sSSS5 $URS5 UR5 SSS5 SSS5 g!,(df  N=f!,(df  g=f)NFr) rrrXrrrrrrr(rp)rUr<rrrs r-continuerebasers tyy{d'  % % * *4 0!!"%///>   #{ T" #{{s/C AB;6 C  !B;*C ; C C  Cc 6URRS5(dg[X05nUR5 URn[UR5Vs/sH oUS:dM UPM sn5nUR[S5UR[S5S5U-UR[S5S5[U5U- -4-5 g![ R a [S5nURU5 gf=fs snf) Nr`s8rebase: (use "hg rebase --abort" to clear broken state) rs#rebase: %s, %s (rebase --continue) s %d rebasedsrebase.rebaseds %d remainingsrebase.remaining) rrrXrrr rrrrKrlabel)rUr<rrrr numrebaseds r- summaryhookrs 88??> * *d+   :A6a:;JHH 12 HHQ}%'8 9J F HHQ')< =5zJ& (    LM    ;s(C " D/D 0DDc f[R"[RS[5nUSR SSS[ S545 USR SSS[ S545 [RRS[5 [R"SS S S [[S 9 g) Nspullr*r,r6s'rebase working directory to branch headrrsspecify merge tool for rebaser`T)fnamestopflag continueflag abortfunc continuefunc)r wrapcommandr tablerrrr summaryhooksrrr| addunfinishedrr)rUentrys r-uisetuprs  " "8>>7J GE !HOO iq!KLM !HOOT7C+K)LMN Y 4 # r,r?)F)NFNT)Wr __future__rrHmercurial.i18nrmercurial.noderrr mercurialrr r r r r rrrrIrrrrrrrrrrrrrrrrr|r rrrcmdtablerS configtable configitem testedwithr.r4r=revsetpredicaterErQrVrX dryrunopts formatteropts confirmoptsCATEGORY_CHANGE_MANAGEMENTrrrrrrr6r7rErBrr'rCrRrarrrrr rrcrrrrrrr+r,r-rs#  B   ,    H %  ! !+ .  # #  $ ++-  E! E)*#+#,J J Z      F G fI      N O fI   vr1676C    4 5 fI   k5!$F"GH    4 5 gJ   wq!DEF    7 8 gJ   wq!<=> oua(E&FG y%?!34 ~ua&89 wQ456 gua :;< {E1%F#GH x"@ AB    :   _8rs9tu:vw;xGH33@BE1C@BE1P<~6 E&P^B48$2>jK\F,u$p3lA <4@&R  9NxBJ*Z4 0r,