Ë ¿i¡³ Z ãó´—dZddlZddlmZddlmZmZmZddlm Z ddl m Z m Z m Z mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZm Z m!Z!m"Z"m#Z#m$Z%m&Z&dZ'dZ(hd £Z)iZ*ejVe*«Z+iZ,ejZe,«Z-e-d d d ¬ «dZ.d„Z/d„Z0djd„Z1ejd«Z2e2d«d„«Z3e2d«d„«Z4d„Z5Gd„d«Z6e+dddged«ed«fddged «ed«fd!d"ged#«ed«fd$d%d&ed'«ed«fd&d(d ed)«fd*d+d&ed,«ed-«fd.d/d ed0«fd1d2d&ed3«ed4«fd5d6d ed7«fd&d8d ed9«fd:d;d ed<«fd=d>d ed<«fd?d@d&edA«fd&dBd edC«fdDdEd edF«fdGdHd edI«fd&dJd&edK«fge jnze jpze jrzedL«e+jt¬M«dN„«Z;dO„ZdR„Z?dS„Z@dT„ZAdU„ZBdV„ZCdW„ZDdX„ZEdY„ZFdZ„ZGd[„ZHd\„ZId]„ZJd^„ZKd_„ZLd`„ZMda„ZNdb„ZO dldc„ZPdd„ZQde„ZRdf„ZSdg„ZTdh„ZUdi„ZVy)mzÐ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 éN)Ú_)ÚnullrevÚshortÚwdirrev)Úopen)Ú bookmarksÚcmdutilÚcommandsÚcopiesÚdestutilÚerrorÚ extensionsÚ logcmdutilÚmergeÚ mergestateÚ mergeutilÚobsoleteÚobsutilÚpatchÚphasesÚpycompatÚ registrarÚrepairÚrevsetÚ revsetlangÚ rewriteutilÚscmutilÚsmartsetÚstateÚutiléÿÿÿÿs-1>ó-2ó-3ó-4ó-5ódevelórebase.force-in-memory-mergeF)Údefaultsships-with-hg-corecó—y)Né©r+óú0usr/lib/python3.12/site-packages/hgext/rebase.pyÚ_nothingtorebaser.Ts€Ø r,có*—|j«|d<y)Nóbranch)Úbranch)ÚctxÚextras r-Ú _savebranchr4Xs€Ø—z‘z“|€Eˆ)Òr,có6—tj|d|d|¬«S)zhsmall 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 _destrebasecó¤—d}|�*tj|tj|«|«}|tjt ||«g«zS©N)rÚgetsetrÚ fullreposetÚbasesetr=)r<ÚsubsetÚxr8s r-Ú_revsetdestrebaserElsK€ð€IØ€}Ü—M‘M $¬×(<Ñ(<¸TÓ(BÀAÓFˆ Ø ”H×$Ñ$¤k°$¸ Ó&BÐ%CÓDÑ DÐDr,s_destautoorphanrebasecóz—|j«}|jd«}tj|||«j «}|r||vrt j «Stj||«}t|«dkDr#tjtd«||fz«‚t j |«S)Ns obsolete()r*s8ambiguous automatic rebase: %r could end up on any of %r) Ú unfilteredÚrevsrr@ÚfirstrrBr ÚorphanpossibledestinationÚlenr Ú StateErrorr)r<rCrDÚunfiÚ obsoletedÚsrcÚdestss r-Ú_revsetdestautoorphanrebaserQzs¬€ð �?‰?Ó €DØ— ‘ ˜-Ó(€Iä �-‰-˜˜f aÓ (× .Ñ .Ó 0€Cñ �#˜Ñ"Ü×ÑÓ!Ð!Ü × .Ñ .¨t°SÓ 9€EÜ ˆ5ƒz�A‚~Ü×ÑÜ ÐIÓ JØ�Eˆlñ ó ð ô × Ñ ˜EÓ "Ð"r,cób—tj|j«j|d¬«S)zshort description for a contextr6)Úcommand)r Úformat_changeset_summaryr<Úui)r2s r-Ú_ctxdescrV‘s&€ä × +Ñ +Ø �‰‹ � ‰ �s Iô ðr,có€—eZdZdZdd„Zed„«Zdd„Zd„Zd„Z d„Z d „Z dd „Z d „Z d „Zd „Zdd„Zd„Zd„Zdd„Zy)Ú rebaseruntimez2This class is a container for rebase runtime stateNcó*—|€i}d|_d|_||_||_||_d|_t |_i|_d|_ i|_ t«|_ |jdd«|_tj |t#j$|««|_|jdd«|_|jd«}t*j,g|_|r|g|_|j1dd«|_|jdd«|_|jdd«|_t+j8|jd «|_i|_t«|_||_ ||_!tEjF|d «|_$y) NFÚcollapseÚdateÚextrafnsrewrites backup-bundleÚkeepÚ keepbranchesr6ó rebasestate)%ÚpreparedÚresumeÚ_reporUÚoptsÚ originalwdrÚexternalrÚactivebookmarkÚdestmapÚsetÚskippedÚgetÚ collapsefr Ú logmessagerÚ byteskwargsÚ collapsemsgr[rÚpreserve_extras_on_rebaseÚextrafnsÚ configboolÚbackupfÚkeepfÚ keepbranchesfÚskip_empty_successorÚskipemptysuccessorfÚ&obsolete_with_successor_in_destinationÚ%obsolete_with_successor_in_rebase_setÚinmemoryÚdryrunÚstatemodÚcmdstateÚstateobj)Úselfr<rUryrzrcÚes r-Ú__init__zrebaseruntime.__init__›sX€Ø ˆ<؈DðˆŒ ØˆŒ ؈Œ àˆŒØˆŒ ؈ŒÜˆŒ ðˆŒ Ø"ˆÔ؈Œ Ü“uˆŒ àŸ™ *¨eÓ4ˆŒÜ"×-Ñ-¨b´(×2FÑ2FÀtÓ2LÓMˆÔØ—H‘H˜V TÓ*ˆŒ à �H‰H�YÓ ˆÜ$×>Ñ>Ð?ˆŒ ٠ؘCˆDŒMà—}‘} ZÐ1AÓBˆŒ Ø—X‘X˜f eÓ,ˆŒ Ø!ŸX™X n°eÓ<ˆÔÜ#.×#CÑ#CØ �G‰G�Yó$ ˆÔ ð79ˆÔ3Ü58³UˆÔ2Ø ˆŒ ؈Œ Ü ×)Ñ)¨$°Ó?ˆ� r,cóf—|jr|jj«S|jSr?)r`rbrG)r~s r-r<zrebaseruntime.repoÌs&€à �=Š=Ø—:‘:×(Ñ(Ó*Ð *à—:‘:Ð r,cóÌ—|r |jdd|jd¬«y|jjdd«5}|j|«ddd«y#1swYyxYw)z*Store the current status to allow recoveryr_)r_splain)ÚlocationówN)ÚaddfilegeneratorÚ _writestatusr<Úvfs)r~ÚtrÚfs r-Ú storestatuszrebaseruntime.storestatusÓsZ€á Ø × Ñ ØØ!Ø×!Ñ!Ø!ð õ ð—‘—‘˜~¨tÔ4¸Ø×!Ñ! !Ô$÷5×4Ñ4ús ¿AÁA#có’—|j}|j�J‚|j||jj «dz«|jd«|j||j j «dz«|jdt |j«z«|jdt |j«z«|jdt |j«z«|jd|jxsdz«|j}|jj«D]c\}}||j «}|dk\r||j «}nd|z}|||j «}|jd|||fz«Œe|jjd«y) Nó s%d ó%s r,ró%ds %s:%s:%s srebase status stored )r<Ú filternameÚwriterdÚhexreÚintrkrsrtrfrgrÚitemsrUÚdebug) r~r‰r<rgÚdÚvÚoldrevÚnewrevÚdestnodes r-r†zrebaseruntime._writestatusàsk€Ø�y‰yˆØ�‰Ð&Ð&Ð&Ø �‰��T—_‘_Ñ%×)Ñ)Ó+¨eÑ3Ô4à �‰�ŒØ �‰��T—]‘]Ñ#×'Ñ'Ó)¨EÑ1Ô2Ø �‰�œ#˜dŸn™nÓ-Ñ-Ô.Ø �‰�œ#˜dŸj™j›/Ñ)Ô*Ø �‰�œ#˜d×0Ñ0Ó1Ñ1Ô2Ø �‰�˜4×.Ñ.Ò5°#Ñ6Ô7Ø—,‘,ˆØ—J‘J×$Ñ$Ö&‰DˆAˆqؘ!‘W—[‘[“]ˆFØ�AŠvؘa™Ÿ™›‘à ™�ؘG A™JÑ'×+Ñ+Ó-ˆHØ �G‰G�M V¨V°XÐ$>Ñ>Õ ?ð'ð �‰� ‰ Ð/Õ0r,có¨—|jj«s)tj|jt d««|j «}|jjjd«|d|_ |d|_ |d|_ |d|_ |d|_ |d|_|d |_|d |_|d |_y ) z"Restore a previously stored statusr6srebase status resumed ó originalwdódestmapóstateóskippedócollapseókeepó keepbranchesóexternalóactivebookmarkN)r}Úexistsr Úwrongtooltocontinuer<rÚ_readrUr”rdrgrrirkrsrtrerf)r~Údatas r-Ú restorestatuszrebaseruntime.restorestatusös¹€à�}‰}×#Ñ#Ô%Ü × 'Ñ '¨¯ © ´1°Y³<Ô @à�z‰z‹|ˆØ � ‰ � ‰ ×ÑÐ5Ô6à˜}Ñ-ˆŒØ˜JÑ'ˆŒ ؘ(‘^ˆŒ ؘJÑ'ˆŒ ؘkÑ*ˆŒØ˜'‘]ˆŒ Ø! /Ñ2ˆÔؘ[Ñ)ˆŒ Ø"Ð#4Ñ5ˆÕr,c ór—d|_|j}|j�J‚dddtdddœ}d}i}i} |j d«}t |j «j««D�]Z\}}|dk(r||j«|d<Œ#|dk(r|sŒ+||j«}Œ?|dk(r||j«|d<Œ[|d k(rtt|««|d <Œx|d k(rtt|««|d <Œ•|d k(rtt|««|d<Œ²|dk(rt|«dk(rd|vs||d<ŒÏ|jd«} || dj«} | d} | tvr�Œt| «dkDr|| dj«} n|} | || <| tk(r t|| <�ŒE|| j«|| <�Œ]|d€t!j"t%d««‚||d<||d<t'«} |d sit'|j)««}t+|j-««D]4\}}|tk7r||vr| j/|«|j/|«Œ6| |d<|j0j3ddj5d„t+| «D««xsdz«|S)NT)r¡rŸr£r¢r r›r_rr›r*ér¢érŸér ér¡ééQó:r£s.hg/rebasestate is incompleterœr�ržscomputed skipped revs: %s ó c3ó&K—|] }d|z–—Œ y­w©rŽNr+©Ú.0Úrs r-Ú z&rebaseruntime._read..Psèø€Ð<©O q˜ �©Oùó‚r,)r`r<r�rr‡Ú enumerateÚreadÚ splitlinesÚrevÚboolr’rKÚsplitÚ legacystatesÚ revtodostrÚrevtodor ÚAbortrrhÚvaluesÚsortedr“ÚaddrUr”Újoin)r~r<r§Ú legacydestrrgr‰ÚiÚlÚargsr—r˜ÚdestrevriÚseenÚoldÚnews r-r¦zrebaseruntime._reads¨€ØˆŒ Ø�y‰yˆØ�‰Ð&Ð&Ð&à!ØØ#Ü ØØñ  ˆðˆ ØˆØˆà Ø—‘˜Ó(ˆAÜ! !§&¡&£(×"5Ñ"5Ó"7×8‘��1ؘ’6Ø*.¨q©'¯+©+«-�D˜Ò'ؘ!’VòØ%)¨!¡W§[¡[£]™ ؘ!’VØ(,¨Q©¯ © « �D˜Ò%ؘ!’VÜ(,¬S°«V« �D˜Ò%ؘ!’VÜ$(¬¨Q«£L�D˜’Mؘ!’VÜ,0´°Q³«L�D˜Ò)ؘ!’V¤S¨£V¨r¢\°d¸a±ið/0�DÐ*Ò+àŸ7™7 4›=�DØ! $ q¡'™]×.Ñ.Ó0�FØ! !™W�FؤÑ-٠ܘ4“y 1’}Ø"& t¨A¡w¡-×"3Ñ"3Ó"5™à",˜Ø&-�G˜F‘OؤÒ+Ü(/˜˜f› ð)-¨V© ×(8Ñ(8Ó(:˜˜f› ðI9ðL �Ñ Ð (Ü—+‘+œaÐ @ÓAÓBÐ Bà"ˆˆZÑØˆˆX‰Ü“%ˆà�KÒ Ü�w—~‘~Ó'Ó(ˆDÜ" 5§;¡;£=Ö1‘��SØœ'’> c¨T¡kØ—K‘K Ô$Ø—‘˜• ð2ð#ˆˆZÑØ �‰� ‰ Ø *Ø�y‰yÑ<¬F°7¬OÓ<Ó<ÒCÀñ Eô ð ˆ r,có(—|jry|jjdd«sy|jD�chc]"}|j|j «sŒ!|’Œ$}}t |j||j«\|_|_ t|j«}|j|j«t|j|j||«t j|jt j«rt«|_ y|jjd|j|j«D]:}|jj!|d«|jj!|d«Œ<ycc}w)zÓ?�ÜÐIÓJ�Ü—k‘k #¨DÔ1Ð1ð 2ús‰;A,Á,A-D Ã.D có®—|s t«St|j||j«}|s.|jj t d««t«S|\|_|_|_ |jr±t|jj««}t|«dk7rtjt d««‚tt!|««}|jj"j%|gd¬«}t'|j|j|«|_t+t|j«««D]V}|j|}|j-«sŒ#|j.rŒ0|jj t d«|z«ŒX|j1«|j2sÃt|j5««}|t|j6«z}||j8z}i}t;j<|jt:j>«rddi} |jjA|«5tCjD|j|d ¬ «ddd«d|_%yd|_%y#1swYŒxYw#tjF$r#} | jH€t d «| _$| ‚d} ~ wwxYw) Nónothing to rebase r*s3--collapse does not work with multiple destinationsT)Ú inclusives reopening closed branch head %s )rÐsevolution.allowdivergencestruer6)r7s&use --keep to keep original changesets)&r.Ú buildstater<rkrUÚstatusrrdrgrrhrÃrKr Ú InputErrorÚnextÚiterÚ changelogÚ ancestorsÚexternalparentrerÄÚ closesbranchrtrÙrsÚkeysrwrxrrÔÚcreatemarkersoptÚconfigoverriderÚprecheckrÂrÜr`) r~rgÚresultrPrËÚ destancestorsÚdestÚ rebasesetÚ overridesrs r-Ú_preparenewrebasezrebaseruntime._preparenewrebase�s2€ÙÜ#Ó%Ð %ä˜DŸI™I w°·±Ó?ˆáà �G‰G�N‰Nœ1Ð3Ó4Ô 5Ü#Ó%Ð %à6<Ñ3ˆŒ˜$œ,¨¬ Ø �>Š>ܘŸ ™ ×+Ñ+Ó-Ó.ˆEÜ�5‹z˜QŠÜ×&Ñ&ÜÐLÓMóðôœ4 ›;Ó'ˆGØ ŸI™I×/Ñ/×9Ñ9Ø�  Tð:óˆMô+¨4¯9©9°d·j±jÀ-ÓPˆDŒMäœc '§.¡.Ó"2Ó3Ö4ˆGØ—9‘9˜WÑ%ˆDØ× Ñ Õ"¨4×+=Ó+=Ø—‘—‘œqÐ!EÓFÈÑMÕNð5ð ×$Ñ$Ô&à�zŠzܘGŸL™L›NÓ+ˆIØ œ˜T×HÑHÓIÑ IˆIØ ˜×CÑCÑ CˆIàˆIÜ×!Ñ! $§)¡)¬X×-FÑ-FÔGàCÀWð� ð Ø—W‘W×+Ñ+¨IÕ6Ü×(Ñ(¨¯©°IÀiÕP÷7ðˆ� ˜ˆ� ÷7Ð6ûä—;‘;ò Ø—6‘6�>ÜÐHÓI�A”FØ�ûð ús0È<JÉ#JÉ:JÊJÊJÊKÊ1KËKcóŽ—|jrCddlm}||j«|_|jj j d«n9|jd|_|jj j d«|jj jdd|j|j¬«y)Nr)Úoverlayworkingctxsrebasing in memory srebasing on disk r6susing in-memory rebase: %r )Úrebase_imm_used)ryÚmercurial.contextrr<ÚwctxrUr”Úlog)r~rs r-Ú_assignworkingcopyz rebaseruntime._assignworkingcopyÄsˆ€Ø �=Š=Ý ;á)¨$¯)©)Ó4ˆDŒIØ �I‰I�L‰L× Ñ Ð6Õ 7àŸ ™  $™ˆDŒIØ �I‰I�L‰L× Ñ Ð4Ô 5Ø � ‰ � ‰ ×ÑØ Ø +Ø �M‰MØ ŸM™Mð õ r,cóF‡ —|j«|j|j}}|jr•|jj dt «|jrit«}|jD]P}|j||j««t|«dkDsŒ4tjtd««‚|j xs |j"|_|j rt%j&|«|j)«|r|j)|«|jj+«D��cgc]\}}|t,k(sŒ|‘Œ}}}|jj/td«td«t|«¬«Š ˆ fd„} t1|j2«D]8} |jj5d| «} | D]}|j7||| «ŒŒ:‰ j9«|j;td ««ycc}}w) Nrr*s'cannot collapse multiple named branchessrebasings changesets)ÚunitÚtotalcóP•—‰jd|j«|fz¬«y)Nó%d:%s)Úitem)Ú incrementr¼)r2Úps €r-Úprogressz.rebaseruntime._performrebase..progress÷s!ø€Ø �K‰K˜h¨#¯'©'«)°SÐ)9Ñ9ˆKÕ ;r,ssort(%ld, -topo)srebase merging completed )rr<rUrtrpÚinsertr4rkrhrrÅr1rKr rîrrfÚ_activebookmarkrÚ deactivaterŠr“rÁÚ makeprogressÚ sortsourcergrHÚ _rebasenodeÚcompleteÚnote) r~rˆr<rUÚbranchesr¼Úkr–ÚcandsrrCÚ sortedrevsr s @r-Ú_performrebasezrebaseruntime._performrebaseÔs·ø€Ø ×ÑÔ!Ø—9‘9˜dŸg™gˆbˆØ × Ò ð �M‰M× Ñ  ¤KÔ 0Ø�~Š~Ü›5�ØŸ:œ:�CØ—L‘L  c¡×!1Ñ!1Ó!3Ô4ܘ8“} qÓ(Ü#×.Ñ.ÜÐHÓIóðð&ð#×1Ñ1ÒI°T×5IÑ5IˆÔØ × Ò Ü × Ñ  Ô &ð ×ÑÔÙ ð × Ñ ˜RÔ à#Ÿz™z×/Ñ/Ô1ÔBÑ1‘t�q˜!°Q¼'³\’Ð1ˆÑBØ �G‰G× Ñ Ü ˆk‹N¤ =Ó!1¼¸U»ð !ó ˆô <ô! §¡Ö.ˆFØŸ™Ÿ™Ð(;¸VÓDˆJÛ!�Ø× Ñ   S¨(Õ3ñ"ð/ð � ‰ Œ Ø �‰”Ð/Ó0Õ1ùóCs Å HÅHc ó®—|j}||}|€|j«}|jsw|j}t j |||j j«D��cic]0\}}|tk7r"|j|«|j|«g“Œ2c}}«}|j} | €|j«} i} |jjdd«rd|j«i} |jD] } | || «Œ t|j!«t"j$«} | |j& dœ} |jj)| d«5|j*r+t-||j.| |||j1«| ¬«}nt3|| |||j1«| ¬«}|cddd«Scc}}w#1swYyxYw)z¨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.Nr6s store-sources rebase_source))sphasess new-commit)óuióallowemptycommit)rr3Ú commitmsgÚeditorÚuserr[)r3rr r!r[)r<Ú descriptionrkrñrÚupdate_hash_refsrr“rÁÚnoder[rUrqr‘rpÚmaxÚphaserÚdraftrvr÷ryÚcommitmemorynoderr!Ú commitnode)r~r¼r rr<r2Úclr—r˜r[r3ÚcÚ destphaserýÚnewnodes r-Ú _concludenodezrebaseruntime._concludenodesª€ð �y‰yˆØ�3‰iˆØ Ð ØŸ™Ó)ˆIð�~Š~Ø—‘ˆBÜ#×4Ñ4ØØð+/¯*©*×*:Ñ*:Ô*<ôá*<™˜ Ø¤Ò(ð—G‘G˜F“O b§g¡g¨f£oÐ%6Ñ6Ø*<òóˆIð�y‰yˆØ ˆ<Ø—8‘8“:ˆDØˆØ �7‰7× Ñ ˜i¨Ô 9Ø% s§w¡w£yÐ1ˆEØ—”ˆAÙ ˆc�5�Mð䘟 ™ › ¤V§\¡\Ó2ˆ à(1Ø.2×.FÑ.FÐ*Fñ ˆ ð�W‰W× #Ñ # I¨yÕ 9Ø�}Š}Ü*ØØŸ™ØØ'Ø!ØŸ™›Øô‘ô%ØØØ'Ø!ØŸ™›Øô �ð÷+:Ñ 9ùó)÷(:Ð 9úsÁ*5GÅ#AG Ç Gc óà —|j|j|j}}}||}t|«}|j||k(r|j t d«|z«�ná||jvrFt d«|z} |jj | «|jj|«�n�||jvr»|j|} | €t d«|z} nt|| «} t d«|| fz} |jj | «|jj|«tt|||j|j|j««} | |j|<�nÄ|j|tk(�r~|j t d«|z«||«t|||j|j|j|j«\} }}|j rN|j"j%«j'«| k(r#|jj)d«d|_nVd|j+d d «i}|j-|d «5 t/||| |||j0|j"¬ «ddd«|j0s‡|tLk7}t;jN|d «}t;jPdd|i|¤Ž}|j"jS|| jU«||jU««|jW||«}nd}|�n||j'«|j|<|j)dtY|«z«||j[«rµ|j]t d«|z«n—|j0s8|j]t d«|z«|jj|«| |j|<|j)d| z«n/|j t d«|||j|fz«|s|j_«yy#t2j4$rò|j6rt3j8d «‚|j0r‚|j t d «« t;j<|«n.#t2j>$rtA|«tC|«‚wxYwd|_"|jG«tIjJ|| |j"¬«t/||| |||j0|j"¬ «Y�Œ¼wxYw#1swY�ŒÂxYw)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)rs forcemergeÚtoolr,r6)rsDhit merge conflicts; rebasing that commit again in the working copy )ÚwcÚeditformsrebased 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<rUrcrVrrírrxrirÅrwr%Ú adjustdestrgrÁÚ defineparentsrarÚp1r¼r”rjr÷Ú rebasenoderkr ÚInMemoryMergeConflictsErrorrzÚConflictResolutionRequiredr Ú bailifchangedrÂrârãryrÚmergemodrÒrÚ mergeeditformÚgetcommiteditorÚ setparentsr$r.rÚisemptyrärŠ)r~rˆr¼Ú progressfnr<rUrcr2ÚdescrçÚsuccÚsuccdescrûr5Úp2ÚbaserýÚmergingr2r r-s r-rzrebaseruntime._rebasenode=sÀ؟™ D§G¡G¨T¯Y©Y�$ˆbˆØ�3‰iˆÜ˜‹}ˆØ �:‰:�c‰?˜cÒ !Ø �I‰I”aÐ/Ó0°4Ñ7Ö 8Ø �D×>Ñ>Ñ >äð5óðñ ð ð �G‰G�N‰N˜3Ô Ø �L‰L× Ñ ˜SÖ !Ø �D×?Ñ?Ñ ?Ø×>Ñ>¸sÑCˆD؈|ÜÐGÓHÈ4ÑO‘ä# D¨¡JÓ/�ÜØLóà˜8Ð$ñ%�ð �G‰G�N‰N˜3Ô à �L‰L× Ñ ˜SÔ !ôܘ4  d§l¡l°D·J±JÀÇ Á ÓMóˆDð#ˆD�J‰J�s‹OØ �Z‰Z˜‰_¤Ó 'Ø �I‰I”aÐ(Ó)¨DÑ0Ô 1Ù �sŒOÜ(ØØØ— ‘ Ø— ‘ Ø— ‘ Ø×;Ñ;ó ‰LˆB��Dð�{Š{˜tŸy™yŸ|™|›~×1Ñ1Ó3°rÒ9Ø—‘— ‘ Ð>Ô?Ø#�• à3°T·X±X¸fÀcÓ5JÐK� Ø×&Ñ& y°)Õ<ð)Ü"Ø ØØØØ Ø ŸN™NØ!%§¡õ÷=ðV—>’>ؤ™-�Ü"×0Ñ0°¸)ÓD�Ü ×0Ñ0ÑK¸(ÐKÀdÑK�ð — ‘ ×$Ñ$ T¨"¡X§]¡]£_°d¸2±h·m±m³oÔFØ×,Ñ,¨S°&Ó9‘ð�àÐ"Ø"& w¡-×"3Ñ"3Ó"5�— ‘ ˜3‘Ø—‘Ð+¬e°G«nÑ<Ô=ؘ‘=×(Ñ(Ô*Ø—G‘GÜðIóðñ õð—~’~Ø—G‘GÜð5óðñ ôð—L‘L×$Ñ$ SÔ)Ø"$�— ‘ ˜3‘Ø—‘Ð5¸Ñ:Õ;à �I‰IÜÐ/Ó0°D¸$¸t¿z¹zÈ#¹Ñ:OÐ3PÑPô ñð × Ñ Õ ð øôU!×<Ñ<òØŸ;š;Ü"'×"BÑ"BÀ9Ó"MÐMØŸ>š>ð"ØŸ ™ Üð!Fóôð "Ü#×1Ñ1°$Õ7øÜ$Ÿ{™{ò"Ü'¨Ô-Ü,¨TÔ2Ø!ð"úð).˜œ Ø×/Ñ/Ô1Ü Ÿ™¨¨R©°T·Y±YÕ?Ü"Ø ØØØØ Ø ŸN™NØ!%§¡÷ðð/ú÷=Ñ<úsDÉ;U#É=&QÑAU Ò7S Ó U Ó +S8Ó8A$U ÕU#ÕU Õ U#Õ#U-c óz—|j|j|j}}}|jdt j |««}|j «|j�r~t|t|j«|j|j|j|j«\}}}|jd«}d} |jr |j} nFd} t!|j«D]*} | |jvsŒ| d|| j#«zz } Œ,d}t%j&|| ¬«} t)|j«} |j*j-||j/«||j0j/««|j3| | | ¬«}|�3||j5«}|jD]}||j|<Œd |j7«vr"t9||j|jfi|¤Ž|jj|j:|j:«}|d kr |j:}||dj=«D�cgc]}|j5«‘Œc}vr2|j?tAd ««tCjD||«d}|jr|jFs}tI|||j|j|j||jF||jJ¬ « tM|«tO|«|j?tAd ««tQjR|jUd«d¬«|jr2tW|j«}|j?tAd«|z«|jY«|jZrh|jZ|j\vrO|dj/«|j\|jZk(r!t_j`||jZ«yyyycc}w)Nr6Úeditsrebase.collapsesCollapsed revisions * %sT)rGr2)róqtiprs0update back to initial working directory parent )ÚfmrÝsrebase completed sundo©Ú ignoremissings%d revisions have been skipped ó.)1r<rUrcÚ formatterrrmÚ startitemrkr4ÚminrrgrirwrjrnrÄr"r r<r%rr=r$rer.r¼ÚtagsÚupdatemqrdÚparentsrrr:rÒrsÚ clearrebasedrrrârãr Ú unlinkpathÚsjoinrKÚendrfÚ _bookmarksrÚactivate)r~r<rUrcrIr5rCÚ_baseÚeditoptr2rÚrebasedr Ú revtoreuser-r˜r—Únewwdr+Ú collapsedasÚ skippedlens r-Ú _finishrebasezrebaseruntime._finishrebaseËsa€ØŸ™ D§G¡G¨T¯Y©Y�$ˆbˆØ �\‰\˜)¤X×%9Ñ%9¸$Ó%?Ó @ˆØ � ‰ ŒØ �>‹>Ü)ØÜ�D—J‘J“Ø— ‘ Ø— ‘ Ø— ‘ Ø×;Ñ;ó ‰MˆB��Eð—h‘h˜vÓ&ˆGØ)ˆHØ×ÒØ ×,Ñ,‘ à1� Ü% d§j¡jÖ1�GØ d§l¡lÒ2Ø! Y°°g±×1JÑ1JÓ1LÑ%LÑL™ ð 2ð�Ü×,Ñ,°'ÀHÔMˆFܘTŸZ™Z›ˆJà �I‰I× Ñ   b¡§¡£°$°t·}±}Ñ2E×2JÑ2JÓ2LÔ MØ×(Ñ(ؘF¨ið)óˆGðÐ"ؘg™×*Ñ*Ó,�Ø"Ÿjœj�FØ)/�D—J‘J˜vÒ&ð)ð �d—i‘i“kÑ !Ü �T˜4Ÿ:™: t§|¡|Ñ <°tÒ <ð— ‘ —‘˜tŸ™°·±Ó@ˆØ �1Š9à—O‘OˆEØ ¨$¨t©*×*<Ñ*<Ô*>Ó?Ñ*> Q˜Ÿ™�Ð*>Ñ?Ñ ?Ø �G‰G”AÐJÓKÔ LÜ �O‰O˜D ™KÔ (àˆ Ø �>Š> $§*¢*Ø!ˆKÜØ Ø Ø �L‰LØ �J‰JØ �L‰LØ Ø �J‰JØØ—<‘<õ ô �DÔܘÔà �‰”Ð'Ó(Ô)Ü �‰˜Ÿ ™  7Ó+¸4Õ@Ø �<Š<ܘTŸ\™\Ó*ˆJØ �G‰G”AÐ9Ó:¸ZÑGÔ HØ �‰Œð × Ò Ø×#Ñ# t§¡Ñ6Ø�T‘ —‘Ó! T§_¡_°T×5HÑ5HÑ%IÒIä × Ñ ˜t T×%8Ñ%8Õ 9ðJð7ð ùò=@sÉ0P8c󯇗|jŠ |jj«D��cgc]#\}}|dk\r||k7r||j|k7r|‘Œ%}}}|D�cgc]}‰|j «rŒ|‘Œ} }d} | rL‰j j td«djˆfd„| D««ztd«¬«d} t«} |r$t‰jj|««} | t|«z r&‰j j td ««d} | rà|r-‰jd |«D� cgc]} | j«‘Œ} } t|«}|j|jj««|s|j|j «‰d j#«|v}|s$|r"t%j&‰|j «|r#t)j*‰j ‰ |¬ «|j,r8|j,‰j.vr t1j2‰|j,«t5‰«t7‰«|s$‰j j td ««ycc}}wcc}wcc} w#t5‰«t7‰«|s%‰j j td ««wwxYw)z-Restore the repository to its original state.rTs-warning: can't clean up public changesets %s ó, c3ó:•K—|]}t‰|«–—Œy­wr?©Úbytes©rµr¶r<s €r-r·z'rebaseruntime._abort../søèø€Ð C¹°A¤ t¨A¡w§¹ùóƒs see 'hg help phases' for detailsrÛFsDwarning: new changesets detected on destination branch, can't strip ó roots(%ld)rL©rÝsrebase aborted )r<rr“rgÚmutablerUrärrÆrhrñÚ descendantsr$rÒrÃrÅrdr¼r:Ú clean_updaterÚstriprfrWrrXrârã)r~rÝrÞrzrßr¶Úsr[r•Ú immutableÚcleanuprkr+Ú strippointsÚupdateifonnodesÚ shouldupdater<s @r-råzrebaseruntime._aborts‡ø€ð�y‰yˆðB 5ð!ŸJ™J×,Ñ,Ô.ôá.‘D�A�qؘ’6˜a 1šf¨¨d¯l©l¸1©oÒ)=òØ.ð ññ %,ÓE¡G˜q°4¸±7·?±?Õ3Dš GˆIÐE؈GÙØ—‘— ‘ ÜÐGÓHØ—j‘jÓ C¹Ó CÓCñDäÐ>Ó?ðôð  �ä›%ˆKÙÜ! $§.¡.×"<Ñ"<¸WÓ"EÓF� ØœS ›\Ò)Ø—‘— ‘ Üð=óôð  �ááà*.¯(©(°=À'Ô*Jó#Ù*J Q˜Ÿ™�Ð*Jð ð#ô#& g£,�Ø×&Ñ& t§|¡|×':Ñ':Ó'<Ô=áð $×'Ñ'¨¯©Ô8à# D™zŸ~™~Ó/°?ÐB� ñ¡,Ü×)Ñ)¨$¨t¯©Ñ*?Ô@ñÜ—L‘L §¡¨$° ÀFÕKà×"Ò" t×':Ñ':¸d¿o¹oÑ'MÜ×"Ñ" 4¨×)<Ñ)<Ô=ô ˜Ô Ü ˜TÔ "ÙØ—‘— ‘ œQÐ2Ó3Ô4Øùó}ùò Fùò2#øô8 ˜Ô Ü ˜TÔ "ÙØ—‘— ‘ œQÐ2Ó3Õ4ðús<�J!¬(JÁJ!ÁJÁ4JÁ8CJ!ÅJÅC7J!ÊJ!Ê!?K )FFNr?)TFFF)Ú__name__Ú __module__Ú __qualname__Ú__doc__r€Úpropertyr<rŠr†r¨r¦rÙrèrþrrr.rr`rår+r,r-rXrX˜ss„Ù<ó/@ðbñóðó %ò1ò,6ò$KòZ,ð4LQó òD2òh ò +2óZ:òxLò\O:ôbGr,rXr6ósósources5rebase the specified changesets and their descendantssREVóbsbases=rebase everything from branching point of specified changesetórsrevsrebase these revisionsódódestr,s#rebase onto the specified changesetrŸscollapse the rebased changesetsómsmessages#use text as collapse commit messagesTEXTóesedits invoke editor on commit messagesólslogfiles&read collapse commit message from filesFILEókr skeep original changesetsr¡skeep original branch namesóDsdetachs (DEPRECATED)óis interactiveótótoolsspecify merge toolsstopsstop interrupted rebaseócscontinuescontinue an interrupted rebaseóasabortsabort an interrupted rebases auto-orphanssLautomatically rebase orphan revisions in the specified revset (EXPERIMENTAL)s>[[-s REV]... | [-b REV]... | [-r REV]...] [-d REV] [OPTION]...)Ú helpcategoryc ór—|jdd«}tj|ddd«}|r2tj||ddg«tj||gd¢«tj|dd«tj|d d d «|s|j «�d }|j d«rnt |«dhz }tj|d|«t|j|j d«««}tjd|«g|d <d|d<|j d«s|j d«rt||||«S|dk(�rt||«}|j«5|j«5|j«|j rt#j$t'd««‚t)j*|t(j,«}|j.s+|s)t#j$t'd«t'd«¬«‚t1j2||j4«|j7« d d d «d d d «y|r1 ddi} |j9| d«5t;|||||¬«cd d d «St;||||«S#1swYnxYwd d d «y #1swYy xYw#1swYnxYwy #t"j<$rV|jdd«r‚|j?t'd««tA|«tC|«t;||||d ¬«cYSwxYw)aumove 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.inmemoryÚabortÚstopÚcontinuerßÚdry_run)r¼ÚsourcerDrûr¼r�rDNFÚ auto_orphanss%ld and orphan()s_destautoorphanrebase(SRC)rûs!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 changesetsrÛr©r6ósingletransactionT)ryr&r's?hit merge conflicts; re-running rebase without in-memory merge )"rqr Úcheck_at_most_one_argÚcheck_incompatible_argumentsÚcurrenttransactionrjrhÚlistrHrÚ formatspecÚ _dryrunrebaserXÚwlockÚlockr¨rkr rLrrrÔÚallowunstableoptrsr:rlrdr`r÷Ú _dorebaser7rärârã) rUr<rcryr7Údisallowed_optsÚuserrevsÚrbsrtÚ allowunstablerýs r-Úrebaser¡fsã€ðx�}‰}˜YÐ(@ÓA€HÜ × *Ñ *¨4°¸&À*Ó M€FÙ Ü×,Ñ,Ø �&˜9 iÐ0ô ô ×,Ñ,Ø �&Ò;ô ô ×!Ñ! $¨ °9Ô=Ü ×!Ñ! $¨¨x¸Ô@á �×(Ñ(Ó*Ð6ðˆà ‡x�x�Ôܘd›) ~Ð&6Ñ6ˆÜ×,Ñ,Ø �. /ô ô˜Ÿ ™  $§(¡(¨>Ó":Ó;Ó<ˆÜ!×,Ñ,Ð-@À(ÓKÐLˆˆU‰ Ø4ˆˆV‰ à ‡x�x� Ô˜dŸh™h yÔ1ܘR  v¨tÓ4Ð4Ø �6Ó Ü˜d BÓ'ˆØ �Z‰Z�\˜4Ÿ9™9�;Ø × Ñ Ô !Ø�ŠÜ×&Ñ&¤qÐ)MÓ'NÓOÐOÜ$×.Ñ.¨t´X×5NÑ5NÓOˆMØ—K’K¡=Ü×&Ñ&Üð2óôð&óô ð ô × !Ñ ! $ u×'7Ñ'7Ñ"8Ô 9Ø × Ñ Ô !Ø÷+'�\ˆ\ñ, ð Eð;¸DÐAˆIØ×"Ñ" 9¨iÕ8Ü   T¨6°4À(ÔK÷9Ñ8ô˜˜T 6¨4Ó0Ð0÷U'˜;ú�\�\‰\ú÷69Ð8úÐ8øä×0Ñ0ò EØ�}‰}˜XÐ'FÔGØØ �G‰GÜð óô ô ˜Ô Ü ˜TÔ "ܘR  v¨t¸eÔDÒ Dð EúsPÅ3J4ÆC JÉ J4É!K É7KÊ K ÊJ( Ê$J4Ê4J=ËK ËK Ë A&L6Ì5L6c ó—t||dd|¬«}|jd«}|r|jtd««n|jtd««|j «5|j «5d} ddi}|j |d«5t|||||«}|t«k(rEd}|cddd«|r$|jddd|jd «¬ «cddd«cddd«S ddd«|r]|jtd ««|jtd ««s|j«n|jddd|¬ «d}n|jtd«« |r$|jddd|jd «¬ «ddd«ddd«y#1swYŒºxYw#tj$rS|jtd««Y|r$|jddd|jd «¬ «ddd«ddd«ytj$rd}‚wxYw#|r%|jddd|jd «¬ «wwxYw#1swYnxYwddd«y#1swYyxYw)NT)ryrzrcrßsstarting in-memory rebase s8starting dry-run rebase; repository will not be changed r‘r6FrŽ)rærÝrÞrzsrebase completed successfully s!apply changes (yn)?$$ &Yes $$ &No)rærÝrÞrßsWdry-run rebase completed successfully; run without -n/--dry-run to perform this rebase rshit a merge conflict r*)rXrjrírr™ršr÷Ú _origrebaser.rèÚ promptchoicer`r r8rÂ) rUr<r7rcrŸrßÚ needsabortrýÚress r-r˜r˜osq€Ü ˜$ ¨T¸$ÀTÔ J€EØ�h‰h�yÓ!€GÙØ � ‰ ”!Ð2Ó3Õ4à � ‰ Ü ÐJÓ Kô ð �‰��t—y‘y•{؈ ð1 Ø:¸DÐAˆIØ×"Ñ" 9¨iÕ8Ü!ØØØØØó �ðÔ*Ó,Ò,Ø!&�JØ÷9Ð8ñPà×-Ñ-Ø Ø Ø"ØŸ8™8 IÓ.ð .ô÷]#�{�‰ð-÷9ñ$Ø— ‘ œ!Ð>Ó?Ô@Ø—‘¤qÐ)MÓ'NÔOà×'Ñ'Õ)à×1Ñ1Ø $Ø$Ø"&Ø 'ð 2ôð #‘ à— ‘ ÜðBóôð áà×-Ñ-Ø Ø Ø"ØŸ8™8 IÓ.ð .ô÷]#�ˆ÷9Ð8ûô×/Ñ/ò Ø �I‰I”aÐ1Ó2Ô 3Øñ6à×-Ñ-Ø Ø Ø"ØŸ8™8 IÓ.ð .ô÷]#�ˆô$�{‰{ò ؈JØ ð ûñ4à×-Ñ-Ø Ø Ø"ØŸ8™8 IÓ.ð .õðú÷Y#�{ú��‰ús‘Á)I;Á:I&Á>F< F0Â4 F<Â=&I&Ã# I;Ã7F<Ã?A9H:Å9&I&ÆI;Æ0F9 Æ5F<Æ<-H7Ç)H:Ç*&I&ÈI;È!H7È7H:È:)I#É#I&É&I/ É+I;É;Jcó>—t||||¬«}t|||||«S)N)rc)rXr£)rUr<r7rcryrŸs r-rœrœ®s%€Ü ˜$  H°4Ô 8€EÜ �r˜4 ¨¨uÓ 5Ð5r,có¬—|dk7sJ‚|j«5|j«5|jd«r@ tjd«rd}dz}t d«|z}tj|«‚|jr*|jstjt d««‚|r¿|jrtjt d ««‚|d k(r,|jd d «r|jt d ««|dk(r4tjj|«}tj |«|j#|d k(¬«} | �¿| cddd«cddd«S|jd«} t%|||j&|jdd«|jdg«|jdg«|jdg«| ¬«} |j)| «} | �| cddd«cddd«St+||j«d} |j-dd«} | r|j/d«} t1j2| «5|j5| «|j6s|j9«ddd«ddd«ddd«y#t $rd}Y�Œ[wxYw#1swYŒ,xYw#1swYŒ0xYw#1swYyxYw)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 abortr‹r0Fstool option will be ignored r�©ræÚ _destspacerûr�rDr¼©r:r6r’)r™ršrjrÚfindÚKeyErrorrr rîrnrkräÚ mergestatemodrrºrÚcheckunresolvedrèÚ_definedestmapryrþÚstorecollapsemsgrqÚ transactionr Úacceptinterventionrrzr`)rUr<r7rcrŸÚenablehisteditÚhelprçÚmsÚretcoder:rgrˆÚsingletrs r-r£r£³sŠ€Ø �VÒ ÐÐ Ø �‰��t—y‘y•{Ø �8‰8�MÔ "ð CÜ—?‘? ;Ô/Ø%(�Nð,¨nÑ<ˆDäð9óðñ ð ô×"Ñ" 3Ó'Ð 'à × Ò  U§_¢_Ü×"Ñ"ÜÐ@ÓAóð ñ Ø�ŠÜ×&Ñ&ÜÐCÓDóðð˜Ò  T§X¡X¨f°eÔ%<Ø—‘œÐ:Ó;Ô<ؘÒ#Ü"×-Ñ-×2Ñ2°4Ó8�Ü×)Ñ)¨"Ô-à×3Ñ3¸VÀwÑ=NÐ3ÓPˆGØÐ"Ø÷G#�{�‰ðNŸ™ Ó.ˆIÜ$ØØØ—‘Ø—‘˜ Ó&Ø—‘˜ 2Ó&Ø—‘˜ Ó$Ø—‘˜ Ó#Ø#ô ˆGð×-Ñ-¨gÓ6ˆGØÐ"Ø÷i#�{�‰ôj ˜T 5×#4Ñ#4Ô 5à ˆà—=‘= Ð,@ÓAˆÙ Ø×!Ñ! )Ó,ˆBô × $Ñ $ RÕ (Ø × Ñ  Ô $Ø—<’<Ø×#Ñ#Ô%÷)÷A#�ˆøô ò CØ!B“ð Cú÷v)Ð (ú÷A#�{ú�ˆúsx˜K ©J>¼J ÁD J>Å K Å2BJ>Ç4 K ÈAJ>É.J2ÊJ>ÊK Ê J/Ê+J>Ê.J/Ê/J>Ê2J; Ê7J>Ê>K ËK Ë Kc óÜ ‡—|€g}tj‰«|stj‰«|jdd«r+|s)t j t d«t d«¬«‚d}|r4tj‰|«} | �sŽ|jt d««y|rHtj‰|«} | s|jt d««y‰jd | | «} �n)tj‰|xsd g«} | s|jt d ««y|rtj‰|«}n‰t‰| |¬ «}t|«}g} i} | D]J}‰jd ||j««j«}| j!|g«|gz| |<ŒLd| vr| j#«| j%«D]$\}}| t'‰jd||««z } Œ&‰jd| «} | �s t'| «|j«gk(r;|r|jt d«|z«y|jt d««y‰jd| |j««sX|r8|jt d«dj)ˆfd„| D««|fz«y|jt d«|z«y|jt d«dj)ˆfd„| D««|fz«yt*| vrt j t d««‚‰d j«| v}|j-dd||¬«|r,|r*tj‰«tj‰«|s‰t‰| |¬ «}t|«}t/j0d| «}d|i}|€ t3j‰||¬«}|� |j«}| D�cic]}||“Œ}}s|jt d(««y|S#tj4$r§i}| D]�}t/j0d |«|d!<‰j7|gd"|¬#«}t9|«}|d$k(r|j«||<ŒU|d%k(r!|j;t d&«‰|z«Œ{t j t d'«‰|z«‚YŒúwxYwcc}w))z:use revisions argument to define destmap {srcrev: destrev}Nócommandsórebase.requiredestsyou must specify a destinationsuse: hg rebase -d REVrÛs-empty "rev" revision set - nothing to rebase s0empty "source" revision set - nothing to rebase s(%ld):: + (%ld)rLs5empty "base" revision set - can't compute rebase set r¬sancestor(%d, %d)schildren(%d) & ancestors(%ld)s%ld::s6nothing to rebase - %s is both "base" and destination sAnothing to rebase - working directory parent is also destination s %ld - ::%dsGnothing to rebase - "base" %s is already an ancestor of destination %s ó+c3ó:•K—|]}t‰|«–—Œy­wr?rdrfs €r-r·z!_definedestmap..Ssøèø€Ð$B¹T¸¤U¨4°©7§^¹TùrgsVnothing to rebase - working directory parent is already an ancestor of destination %s s nothing to rebase from %s to %s c3ó:•K—|]}t‰|«–—Œy­wr?rdrfs €r-r·z!_definedestmap..asøèø€Ð >¹°A¤ t¨A¡w§¹ùrgscannot rebase the working copyr6s!rebasing working copy parent: %r )Úrebase_rebasing_wcps%ldsALLSRC)Ú localaliasrŽsSRCT)r!rÁr*rs skipping %s - empty destination s'rebase destination for %s is not uniques&nothing to rebase - empty destination )r Úcheckunfinishedr9rqr rîrrÚrevrangerírHÚ revsingler=rer¼rIrjÚclearr“r–rÆrrrr—rráÚanyrevsrKr)rUr<ryÚdestfÚsrcfÚbasefÚrevfr:rûrürOrDÚrootsÚbpbaseÚbÚbpÚbsÚ rebasingwcpÚallsrcÚaliasrgr¶ÚdestsetÚsizerËs ` r-r±r±ûsÙø€à €|؈ô  ×јDÔ!Ù Ü×јdÔ#à ‡}�}�[Ð"7Ô8ÁÜ×ÑÜ Ð/Ó 0ÜÐ+Ó,ô ð ð €Dá Ü×'Ñ'¨¨dÓ3ˆ ÚØ �I‰I”aÐIÓJÔ KØÙ Ü×!Ñ! $¨Ó-ˆÙØ �I‰I”aÐLÓMÔ NØà—I‘IÐ0°#°sÓ;Š ä×"Ñ" 4¨ª°4°&Ó9ˆÙØ �I‰IÜÐOÓPô ðÙ ä×'Ñ'¨¨eÓ4‰Dàœ  D¨$¸)ÔDÑEˆDܘ$“KˆEàˆØˆÛˆAØ—‘Ð.°°4·8±8³:Ó>×DÑDÓFˆBØŸ™ B¨Ó+¨q¨cÑ1ˆF�2ŠJðð �6‰>ð �L‰LŒNØ—l‘l–n‰FˆB�Ø ”T˜$Ÿ)™)Ð$DÀbÈ"ÓMÓNÑ N‰Eð%ð—I‘I˜h¨Ó.ˆ âô�D‹z˜dŸh™h›j˜\Ò)ÙØ—I‘IÜð2óðñ ôðLð=—I‘IÜð<óôð<ð1—Y‘Y˜}¨d°D·H±H³JÔ?ÙØ—I‘IÜð$óð  Ÿ9™9Ó$B¹TÓ$BÓBÀDÐIñ Jôð,ð—I‘IÜð<óð ñ ôðð — ‘ ÜÐ:Ó;Ø—y‘yÓ >¹Ó >Ó>ÀÐEñFôðä�)ÑÜ×ÑœqÐ!BÓCÓDÐDØ�t‘*—.‘.Ó" iÐ/€K؇F�FØØ-ØØ'ð  ôñ ‘Kä×Ñ Ô%Ü×јdÔ#á Ø”K  i¸9ÔEÑFˆÜ�d“ ˆä × "Ñ " 6¨9Ó 5€FØ ˜Ð €Eà €|ð ä×$Ñ$ T¨5¸UÔCˆDð& Ðà—(‘(“*ˆÙ'0Ó1¡y !�1�g‘: yˆÐ1á Ø � ‰ ”!Ð>Ó?Ô@Øà €Nøô7×$Ñ$ò àˆGÛ�Ü *× 5Ñ 5°e¸QÓ ?��f‘ ðŸ,™,¨ w°TÀe˜,ÓL�ܘ7“|�ؘ1’9Ø!(§¡£�G˜A’JؘQ’YØ—G‘GœAÐBÓCÀdÈ1ÁgÑMÕNä×*Ñ*ÜÐDÓEÈÈQÉÑOóðòð üò*2sÏP,Ð S)Ð,B7S&Ó%S&c óâ—t«}t|«}|D]e}||k(rŒ ||j«D]G}|j«|vsŒ|j«|vsŒ)|j |j««ŒIŒg|st St |«dk(r|j«Stjtd«t|«djd„t|«D««fz«‚)z³Return the revision that should be used as the second parent when the revisions in state is collapsed on top of destancestors. Abort if there is more than one parent. r*sKunable to collapse on top of %d, there is more than one external parent: %srbc3ó&K—|] }d|z–—Œ y­wr³r+)rµr s r-r·z!externalparent..²sèø€Ð)M¹_¸¨%°!­)¹_ùr¸)rhrOrRr¼rÅrrKrÖr rLrr%rÆrÄ)r<rrúrRr�r¼r s r-róróœsÖ€ô ‹e€GÜ �‹Z€FÛˆØ �&Š=Ø Ø�c‘×"Ñ"Ö$ˆAØ�u‰u‹w˜eÒ#¨¯©«°}Ò(DØ— ‘ ˜AŸE™E›GÕ$ñ%ðñ ÜˆÜ ˆ7ƒ|�qÒØ�{‰{‹}ÐÜ × Ñ Ü ð ,ó ô ˆ}Ó ˜uŸz™zÑ)M¼VÀG¼_Ó)MÓMÐ Nñ  Oó ðr,có—d}d|vr|d}|j«|j||||||¬«}|j«r|jj dd«sy|j |«} |j «| S)zXCommit the memory changes with parents p1 and p2. Return node of committed revision.Nr0)r[r3r!r1r rr)Ú_compactÚtomemctxr>rUrqÚ commitctxÚclean) r<rr r3r!r[rr1ÚmemctxÚ commitress r-r(r(¶s‹€ð €FØ�EÑØ�yÑ!ˆð  ‡M�M„OØ �]‰]ØØ ØØ ØØð ó€Fð‡~�~Ô §¡× 2Ñ 2°5Ð:MÔ NØØ—‘˜vÓ&€I؇J�J„LØ Ðr,cóF‡—tj}‰jjdd«sˆfd„}|«5‰j |||||¬«}‰j j ‰|j«‰j««|cddd«S#1swYyxYw)zTCommit the wd changes with parents p1 and p2. Return node of committed revision.r6r’có&•—‰jd«S)Nr6)r³©r<s€r-Úzcommitnode..×sø€�T×%Ñ% iÔ0r,)Útextr!r[r3r N) r ÚnullcontextmanagerrUrqÚcommitÚdirstateÚ setbranchr1r•)r<r r3r!r[rrˆr-s` r-r)r)Òs‹ø€ô × Ñ €BØ �7‰7× Ñ ˜iÐ)=Ô >Û 0ˆÙ �à—+‘+Ø ¨D¸Àfðó ˆð � ‰ ×ÑØ �‰M× Ñ Ó " D×$;Ñ$;Ó$=ô ð÷ �Šús ºABÂB c ó’‡—‰|}|j«r"|j|«tj}nš‰dj «|k7r6‰j j d||fz«tj|«n‰j j d«ˆfd„}‰d}‰jj‰j««‰|} ‰j j d|| fz«|�#‰j j d|‰|fz«|«5‰jj|j«| j««} tj‰|dd|| gd ¢|¬ «} |j!|j«‰|j««|rt#j$|| |«n%t#j$|| | j'««ddd« j(d kDr9|j«rt+j,«‚t+j.d «‚y#1swYŒRxYw) zFRebase a single revision rev on top of p1 using base as merge ancestorrLs update to %d:%s s already in destination có:•—‰jj‰«Sr?)råÚchanging_parentsràs€r-rázrebasenode..òsø€˜Ÿ ™ ×6Ñ6°tÔ‰>Ó ˜rÒ !Ø �G‰G�M‰MÐ/°2°u°+Ñ=Ô >Ü × !Ñ ! %Õ (à �G‰G�M‰MÐ6Ô 7Û<ˆð�D‰zˆØ � ‰ ×јD×3Ñ3Ó5Ô6Ø ˆs‰)€C؇G�G‡M�MÐ+¨s°C¨jÑ8Ô9Ø ÐØ �‰� ‰ Ð/°4¸¸d¹Ð2DÑDÔEá �àŸ™×1Ñ1°%·*±*³,ÀÇÁà ÓKˆ Ü× Ñ Ø Ø ØØØØ'Ú<Øô  ˆð �‰˜Ÿ ™ ›  d¨2¡h§m¡m£oÔ6Ù Ü × Ñ ˜t S¨%Õ 0ô × Ñ ˜t S¨#¯&©&«(Ô 3÷) ð, ×јqÒ Ø �?‰?Ô Ü×3Ñ3Ó5Ð 5ä×2Ñ2°9Ó=Ð =ð !÷- ˆús Ä$CH=È=Icó¬—||}|j«D��cgc]\}}|dkDr|||k(r||vr|‘Œ}}}g} |jj|«D]u} |} | tk7r(|j d|| «j «} | �|| } | |k(r*||vr&||} | t k(rtjd|z«‚| j| «Œw| Scc}}w)aˆadjust 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) r“rñÚ parentrevsrrHrIrÁr ÚProgrammingErrorÚappend) r<r¼rgrrirûrnr•r�rùÚprevÚadjustedÚ candidates r-r3r3sÿ€ðj �3‰<€Dð—K‘K”Môá!‰DˆAˆqØ ˆqŠ5�W˜Q‘Z 4Ò'¨A°WÑ,<ò Ø!ð ñð €FØ—‘×)Ñ)¨#Ö.ˆØˆØ ”7Š?ØŸ ™ Ð"8¸&À$ÓG×MÑMÓOˆIØÐ$Ø  Ñ+�Ø �tÒ  ¨¡ ؘT‘{ˆHØœ7Ò"ä×,Ñ,ØDÀtÑKóðð � ‰ �hÕð/ð €Mùó+s™Ccóø‡—tj‰tj«}||z }|rN|sKˆfd„|D«}td«}td«}t j |dj |«fz|¬«‚yy)a Abort if rebase will create divergence or rebase is noop because of markers `rebaseobsrevs`: set of obsolete revision in source `rebaseobsskipped`: set of revisions from source skipped because they have successors in destination or no non-obsolete successor. c3ó:•K—|]}t‰|«–—Œy­wr?rdrfs €r-r·z"_checkobsrebase..tsøèø€ÐFÑ-E¨”U˜4 ™7—^Ñ-Eùrgs+this rebase will cause divergences from: %ssJto force the rebase please set experimental.evolution.allowdivergence=Trueó,rÛN)rrÔrÕrr rLrÆ) r<rUÚ rebaseobsrevsÚrebaseobsskippedÚ divergenceokÚdivergencebasecandidatesÚ divhashesrçÚhs ` r-rÓrÓgs�ø€ô×%Ñ% d¬H×,GÑ,GÓH€LØ,Ð/?Ñ?Ðá© ÛFÑ-EÓFˆ ÜÐ>Ó?ˆÜ ð ;ó ˆô×јs d§i¡i° Ó&:Ð%<Ñ<À1ÔEÐEð)5Ðr,c#óôK—|j�J‚|jjj}t j |j ||j«g«D]}||«}|€Œ|–—Œy­w)z,yield revision numbers for successors of revN)r�rñÚindexÚget_revrÚ allsuccessorsÚobsstorer$)rMr¼r rnr¶s r-Ú successorrevsr }shèø€à �?‰?Ð "Ð"Ð "Ø�n‰n×"Ñ"×*Ñ*€GÜ × "Ñ " 4§=¡=°4¸±9·>±>Ó3CÐ2DÖ EˆÙ �A‹JˆØ ‰=Ø‹GñFùs ‚A.A8Á1A8c 󯇇‡‡‡‡—‰j�J‚‰j}|jŠ|‰}‰jj‰«}ttgŠt ‰‰|||«Št |«} td„|ddD««r ‰d‰d<�n=t|«D]™\Š} | } tˆˆˆfd„t‰| «D««r‰‰} n| |vr || dkDr|| } t‰d‰«D]E\} } | tk(rŒ‰| | «rt} Œ ‰| | «sŒ*| ‰| <t} | ‰| | c| | <| ‰<ŒG| ‰‰<Œ›‰dtk7rI|d‰dk(r>t‰«dk(rt|«dk(sJ‚‰j«| j«t‰«t|«k(r*|‰vr&tjt!d«‰‰‰fz«‚tˆˆfd„‰D««rtjt!d ««‚t#ˆfd „t| «D««dkD�r~ddg}t| «D]º\Š}|tk(s|‰vrŒt| «|hz }t ‰j%d |||««}|sŒC|j'«D��cgc]\}}|dkDsŒ ||vsŒ|‘Œ}}}|D�cgc] }|j|«dtk7sŒ|‘Œ"}}t ‰j%d |||««|‰<Œ¼td „|D««r t)d„t|«D««\}Š|dkDrJt!d«j+ˆfd„|D««}tjt!d«‰‰‰|fz«‚‰dk7r.‰‰tk7r‰‰‰dc‰d<‰‰<| ‰| dc| d<| ‰<| d}‰j,j/dt1‰«z«‰d‰d|fScc}}wcc}w)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. Nc3ó.K—|] }|tk(–—Œy­wr?©rr´s r-r·z defineparents..¡sèø€Ð +¡˜Aˆ1”�<¡ùs‚r*rc3ó6•K—|]}‰|‰‰«–—Œy­wr?r+)rµrDrPrÈrñs €€€r-r·z defineparents..½søèø€ÐKÑ4J¨q‘:˜a  q¡×*Ñ4Jùsƒrªs>cannot rebase %d:%s without moving at least one of its parentsc3óF•K—|]}|tk7xr ‰‰|«–—Œy­wr?r)rµr rñr¼s €€r-r·z defineparents..ìs%øèø€Ð >¹°1ˆ1”‰<Ò .™J s¨AÓ.Ó .¹ùóƒ!ó!source is ancestor of destinationc3ó@•K—|]}|tk7sŒ |‰vsŒd–—Œy­w)r*Nr)rµrÍÚnewpss €r-r·z defineparents..þsøèø€Ð D‘j� A¬£L°Q¸e²^Œ1‘jùs ƒ’—s(%ld %% (%d+%d))s%ld - (::%ld) - %ldc3ó$K—|]}|du–—Œ y­wr?r+)rµrHs r-r·z defineparents..sèø€Ð5©H Dˆt˜4Ô©Hùs‚c3ó@K—|]\}}|�t|«|f–—Œy­wr?)rK)rµrÈrHs r-r·z defineparents..s*èø€ðá2‘G�A�tØÐ#ô�T“˜A”Ù2ùs‚s or c3óV•K—|] }|�djˆfd„|D««–—Œ"y­w)Nrbc3ó2•K—|]}d|‰|fz–—Œy­w)r Nr+rfs €r-r·z*defineparents...&søèø€Ð"IÁD¸q 8¨q°$°q±'¨lÕ#:ÁDùsƒ)rÆ)rµrHr<s €r-r·z defineparents..%s.øèø€ðá$,˜DØÐ+🠙 Ó"IÁDÓ"I×IÙ$,ùsƒ&)s4rebasing %d:%s will include unwanted changes from %ss future parents are %d and %d )r�rñÚ isancestorrevrùrr3r–Úallr¹Úanyr rKÚreverserhr rîrÚsumrHr“rOrÆrUr”Útuple)r<r¼rgrriÚ obsskippedr*rûÚoldpsÚbasesr ÚnpÚjrDÚunwantedrDÚ other_basesÚsiderevsr¶r•rüÚmergesrÉÚ unwanteddescrPrÈrñrs`` @@@@r-r4r4‡s/ý€ð �?‰?Ð "Ð"Ð "Ø �‰€BØ×!Ñ!€Jà �3‰<€DØ �N‰N× %Ñ % cÓ *€EÜ ”gÐ €EÜ �t˜S '¨5°'Ó :€EÜ �‹K€Eä Ñ +  q r¡Ó +Ô+à˜‘8ˆˆa‹ô0˜eÖ$‰DˆAˆq؈BÜÕK´MÀ$ÈÔ4JÓKÔKؘ1‘X‘Ø�e‘  a¡¨1¢ ؘ1‘X�ô" %¨¨ )Ö,‘��1Øœ’<ØÙ˜b !Ô$Ü ‘BÙ  2Õ&Ø!�E˜!‘HÜ �Bð*/¨q©°5¸±8Ð&�E˜!‘H˜e Ašhð-ðˆE�!ŠHð+%ð4 �‰8”wÒ  5¨¡8¨u°Q©xÒ#7Ü�u“: ’?¤s¨5£z°Q¢Ð 6Ð6Ø �M‰MŒOØ �M‰MŒOô ˆu‹:œ˜U›Ò #¨°EÑ(9Ü×"Ñ"Üð:óð˜˜S™ Ð"ñ #óð ô Ô >¹Ó >Ô>Ü×ÑœqÐ!EÓFÓGÐGô" Ó D”c˜%”jÓ DÓDÀqÓHؘ$�<ˆÜ  Ö'‰GˆAˆtØ”wŠ $¨%¡-Øô˜e›*¨ vÑ-ˆKÜØ— ‘ Ð-¨{¸DÀ$ÓGóˆHò à"'§+¡+¤-ôÙ"/™$˜!˜Q°1°q³5¸QÀjÒ=P’A -ðññ )óÙ(˜!¨B¯M©M¸!Ó,<¸QÑ,?Ä7Ó,J’A˜yððô#Ø—I‘IØ.°¸&À)óó�˜’ ð'(ô2 Ñ5©HÓ5Ô 5äñä(¨Ô2óó‰DˆAˆqð�1ŠuÜ  ›zŸ™óá$,óó � ô×&Ñ&ÜÐMÓNؘD ™I |Ð4ñ5óðð�AŠvؘ‘8œwÒ&Ø).¨q©°5¸±8Ð&�E˜!‘H˜e A™hØ%*¨1¡X¨u°Q©xÐ"��a‘˜% ™(ð �‰8€Dà‡G�G‡M�MÐ4´u¸U³|ÑCÔDà �‰8�U˜1‘X˜tÐ #Ð#ùócùòsÊ OÊOÊOÊ& OËOcóÚ—tjj|jj|«}t j t |d««D]}|jd«sŒyy)z/Return true if the given patch is in git formatsrbs diff --gitTF)ÚosÚpathrÆÚmqrÚ linereaderrÚ startswith)r<Ú patchnameÚmqpatchÚlines r-Ú isagitpatchr4AsN€ä�g‰g�l‰l˜4Ÿ7™7Ÿ<™<¨Ó3€GÜ× Ñ ¤ g¨uÓ!5Ö6ˆØ �?‰?˜=Õ )Ùð7ð r,c ó”—i}|j}|jdd}t«}|jD]Ž}||jj «} | |vrP|j jd| |jfz«|jt||j«f|| <Œt|j|j«Œ�|rý|j||j««t|d¬«D]v} | |vrY|| \} } |j jtd«| || ||| fz«|j!|d| | d|| zg¬«Œ`|j|| d «Œx|D� cgc]%} |j"j%| d «d |vr| ‘Œ'} } | |jddd|_|j)«yycc} w) z9Update rebased mq patches - finalize and then import themNs.revision %d is an mq patch (%s), finalize it. T)rsupdating mq patch %s to %d:%s r+rŽ)r1Úgitr¼rr*)r.Ú fullseriesrhÚappliedr$r¼rUr”Únamer4rÅÚfinishrõrÄrrÚqimportÚguard_rer¾Ú seriesdirtyÚ savedirty)r<rrircÚmqrebaser.Úoriginal_seriesÚskippedpatchesr r¼r9ÚisgitrnÚ newseriess r-rQrQJs΀à€HØ �‰€BØ—m‘m¡AÐ&€OÜ“U€Nà �ZŒZˆØ�1—6‘6‰l×ÑÓ ˆØ �%‰<Ø �G‰G�M‰MØBؘŸ™�-ñ ô ðŸV™V¤[°°q·v±vÓ%>Ð?ˆH�SŠMð × Ñ ˜qŸv™vÕ &ðñØ � ‰ �$˜Ÿ ™ ›Ô(ô˜(¨D×1ˆCؘ'Ñ!Ø& s™m‘ ��eØ—‘— ‘ ÜÐ8Ó9ؘU 3™Z¨¨e°C©jÑ)9Ð:ñ;ôð— ‘ ØØØ"ØØ  s¡Ñ+Ð,ð õð×"Ñ" 8¨C¡=°Ñ#3Õ4ð!2ñ.%ó á$�Ø�{‰{× Ñ   AÓ& qÑ)°Ñ?ò Ø$ð ð ð %ˆ� ‰ ‘aÐØˆŒØ � ‰ �ðAùò2 sÅ1*Gcó|—|xsd}|jdd«}|jd|z«|j«y)z,Store the collapse message to allow recoveryr,ólast-message.txtr„r�N)r‡r�Úclose)r<rnr‰s r-r²r²€s7€àÒ$ €KØ �‰Ð$ dÓ+€A؇G�GˆG�kÑ !Ô"؇G�G…Ir,có>—|jjdd¬«y)zRemove collapse message filerETrJN)r‡rTràs r-rãrãˆs€à‡H�H×ÑÐ+¸4ÐÕ@r,cóê— |jd«}|j«j«}|j«|S#t$r&|rd}Y|St j td««‚wxYw)z*Restore previously stored collapse messagerEr,s'missing .hg/last-message.txt for rebase)r‡ÚreadlinermrFÚFileNotFoundErrorr rÂr)r<rær‰rns r-ràrà�sv€ð MØ �H‰HÐ(Ó )ˆØ—j‘j“l×(Ñ(Ó*ˆ Ø �‰Œ ð Ðøô òMÙ à‰Kð Ðô—+‘+œaÐ JÓKÓLÐ Lð Mús‚?AÁ A2ÁA2có„—|j«}|r|jd«|jjdd¬«y)zRemove the status filesr_TrJN)r•Úremovefilegeneratorr‡rT)r<rˆs r-rârâœs:€ð × Ñ Ó "€BÙ Ø ×ј~Ô.؇H�H×ј°dÐÕ;r,c#óìK—t|«}|rct|«}g}|D]}|||vsŒ |j|«Œ|stjt d««‚|t|«z}|–—|rŒbyy­w)a¼yield 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)rhrÄrûr rîr)rgÚsrcsetÚsrclistrùr¶s r-rr¥sxèø€ô�‹\€F٠ܘ“.ˆØˆÛˆAØ�q‰z Ò'Ø— ‘ ˜aÕ ðñÜ×"Ñ"¤1Ð%KÓ#LÓMÐ MØ”#�f“+ш؊ ô ùs‚'A4ªAA4Á2A4c󿇗|j«}|dj«}d|j«vrx|jjD�chc]}||j j«’Œ!}}t |j««|zrtjtd««‚tt|««}|stjtd««‚t|j d|d««}|stjtd««‚d„} t|| ¬«}tj!|t"«Št%|«d k(} |D�]#} ||| j«} | j'| «} | | k(rtjtd ««‚| | k(r¯|d }| |j)«k(r"| j+«|j+«k(}n!| j+«| j+«k(}|sR|rP| | j-«vr>| j«‰| j«<|j.j1d «�Œd } |j.j1d| | fz«�Œ&| ry t‰«D]Q}|j2j5|«D�cgc]}|t6k7sŒ |‘Œ}}|sŒ8t9ˆfd„|D««sŒM|‰|<ŒS||‰fScc}wcc}w)zlDefine which revisions are going to be rebased and where repo: repo destmap: {srcrev: destrev} rLrHs&cannot rebase onto an applied mq patchsno matching revisionsrhrcó"—|j«Sr?)r¼)r¶s r-Úrevofzbuildstate..revofÝs €Ø�u‰u‹wˆr,)Úkeyr*rNs!source is a child of destination Fs rebase onto %s starting from %s c3óF•K—|]}‰j|«|k(–—Œy­wr?)rj)rµr rs €r-r·zbuildstate..ýsøèø€Ð?±w°!˜EŸI™I a›L¨AÕ-±wùr)rõr¼rPr.r8r$rhrÃr rLrr–rrîrÄÚdictÚfromkeysrÁrKrìr5r1rRrUr”rñrùrr)r<rgrZrürdrnÚ mqappliedÚ sortedsrcrËrRÚ emptyrebaseÚrootrûÚ commonbaserÚ samebranchr¼r rRrs @r-rìrì¿s„ø€ð — ‘ “€IØ�d‘—‘Ó!€Jð �$—)‘)“+ÑØ15·±·²ÓA±¨A�T˜!Ÿ&™&‘\×%Ñ%Õ'°ˆ ÐAÜ ˆw�~‰~ÓÓ  9Ò ,Ü×"Ñ"¤1Ð%NÓ#OÓPÐ Pô”Z Ó(Ó)€IÙ Ü×ÑœqÐ!9Ó:Ó;Ð;ô �—‘˜-¨°1©Ó6Ó 7€EÙ Ü×ÑœqÐ!9Ó:Ó;Ð;òô �5˜eÔ $€EÜ �M‰M˜)¤WÓ -€EÜ�i“. AÑ%€K܈Ø�G˜DŸH™H›JÑ'Ñ(ˆØ—]‘] 4Ó(ˆ Ø ˜Ò Ü×"Ñ"¤1Ð%IÓ#JÓKÐ KØ ˜Ò ؘ‘:ˆDØ�t—w‘w“yÒ à!Ÿ[™[›]¨d¯k©k«mÑ;‘ à!Ÿ[™[›]¨d¯k©k«mÑ;� Ù¡ ¨t°t·|±|³~Ñ/Eð%)§H¡H£J��d—h‘h“jÑ!Ø—‘— ‘ ÐCÔDÙàˆ Ø �‰� ‰ Ð:¸dÀD¸\ÑIÖJð)ñ*ØÜ�eŽ}ˆØ"Ÿn™n×7Ñ7¸Ô<ÓMÑ<˜ÀÄWà ’1Ð<ˆÐMâ ”sÓ?±wÓ?Õ@؈E�#ŠJð ð �w Ð %Ð%ùògBùò^NsÁ$K)Ê0K.Ê?K.c ó —|jj} i} i} tj|tj« } g} t |j ««D]h\}}|dk\sŒ ||k7sŒ| |«}|xs| |«}|| |<d}||vr| s||j«sd}n|r| j|«n|f}|€Œc|| |f<Œj| r|f| t| «<|r‰|j}|j}|j}i}| j «D]3\}}|D])}||D�cgc] }||«‘Œ c}d¬«|||«<Œ+Œ5||dd¬«}|j|¬ «|ri} tj|| d | |¬ «ycc}w) a~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. 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)r9soldnodesnewnodes)rSÚvalue)Ú nodechangesr6ri)rñr$rrÔrörÄr“rûr ÚhexfuncÚ formatlistÚ formatdictr§rÚ cleanupnodes)rUr<rgrrir^rsrIrÝÚtonodeÚ replacementsÚmovesÚ stripcleanupÚcollapsednodesr¼r˜Úoldnoder-ÚsuccsÚhfÚflÚfdÚchangesÚoldnsÚnewnÚoldnÚnr_s r-rSrSs“€ð,�^‰^× Ñ €FØ€LØ €EÜ×)Ñ)¨$´×0IÑ0IÓJÐJ€Là€NܘeŸk™k›mÖ,‰ ˆˆVØ �Q‹;˜6 S›=Ù˜S“kˆGØ!Ò3¡V¨F£^ˆGØ$ˆE�'‰N؈EØ�g‰~Ù t¨C¡y×'9Ñ'9Ô';Ø‘EÙØ×%Ñ% gÕ.à ˜ �ØÑ Ø+0� ˜g˜ZÒ(ð-ñØ/:¨nˆ ”U˜>Ó*Ñ+Ù Ø �Z‰ZˆØ �]‰]ˆØ �]‰]ˆØˆØ'×-Ñ-Ö/‰KˆE�4Û�Ù$&±tÓ'<±t°!©¨1­°tÑ'<À7Ô$K�™˜4›Ò!ñð0ñ˜ j¸ ÔDˆ Ø �‰˜KˆÔ(٠؈ Ü ×ј˜|¨Y¸ÀfÖMùò (=sÄ F cóè—|jd«�rg|jdd«r-td«}td«}tj||¬«‚|j «5|j «5|jd«r|d=|jd«tj|d ¬ «tj|td «¬«t|«}tj}d „} | t_ |||g|¢­i|¤Ž} |t_ t|«} | |kDrFd |vr|d =d|vr|d=t|jj!|¬««} | |d< t#||fi|¤Žddd«ddd« S|jd«rtjtd««‚|||g|¢­i|¤Ž} | S#|t_ wxYw#tj$$r}t'j(|«\} }}| |dj+«k(r|j-td««n0|j-td««tj.||«YŒïwxYw#1swYŒôxYw#1swY SxYw)zCCall rebase after pull if the latter has been invoked with --rebaser¡r»r¼s,rebase destination required by configurations)use hg pull followed by hg rebase -d DESTrÛrÒsC--update and --rebase are not compatible, ignoring the update flag T)Ú skipmergesCcannot pull with rebase: please commit or shelve your changes firstcó—yr?r+)rÊÚkwargss r-Ú_dummyzpullrebase.._dummyZs€Ør,r¼r�)Ústartr«rLrês%nothing to rebase - updating instead Nr0s%--tool can only be used with --rebase)rjrqrr rîr™ršr”r rÂr9rKr Ú postincomingr–rñrHr¡ÚNoMergeDestAbortr Ú destupdater¼rírÒ)ÚorigrUr<rÊrcrçrÜÚ revsprepullÚorigpostincomingrwÚretÚ revspostpullr:r¼Ú_aÚ_bs r-Ú pullrebaserƒ>sE€à ‡x�x�ÕØ �=‰=˜Ð&;Ô <ÜÐCÓDˆCÜÐAÓBˆDÜ×"Ñ" 3¨TÔ2Ð 2à �Z‰Z�\˜4Ÿ9™9�;Ø�x‰x˜Ô!ؘ�NØ—‘ð)ôô × #Ñ # D°DÕ 9Ü × !Ñ !ØÜðBóõ ô˜d›)ˆKÜ'×4Ñ4Ð ò ð%+ŒHÔ !ð 9Ù˜2˜tÐ3 dÒ3¨dÑ3�à(8”Ô%ܘt›9ˆLؘkÒ)ð˜D‘=ؘU˜ ð˜tÑ#ؘX˜ä  §¡×!4Ñ!4¸;Ð!4Ó!GÓH� Ø%.��\Ñ"ð 2ܘ2˜tÑ, tÒ,÷U'�\ðt €Jð �8‰8�FÔ Ü×"Ñ"¤1Ð%MÓ#NÓOÐ OÙ�2�tÐ+˜dÒ+ dÑ+ˆà €Jøð?)9”Õ%ûô ×-Ñ-ò 2ä"*×"5Ñ"5°dÓ";‘K�C˜˜Rؘd 4™jŸn™nÓ.Ò.ØŸ ™ ¤!Ð$:Ó";Õ<àŸ ™ ¤!Ð$MÓ"NÔOô!Ÿ™¨¨DÔ1ùð 2ú÷W'˜;ú�\ðt €Jús]Á"I'Á3BIÃ: F8ÄAIÅ GÅ(I'Æ8 GÇIÇB IÉIÉIÉIÉI$ É I'É'I1cóh‡—i}t«}|j}|jj}t|j d««}|D]Ü}|j |«} tt j|j| g««} | j| «| D� chc] } || «’Œ } } | jd«| r| j|«rd||<ŒŽ‰|} | D]}|j|| «sŒ|||<Œ²||vstˆfd„| D««sŒÌ|j|«ŒÞ||fScc} w)aiFigure 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ó&•K—|]}|‰v–—Œ y­wr?r+)rµrnrgs €r-r·z)_compute_obsolete_sets..§søèø€Ð/OÁhÀ°°W´ Áhùsƒ)rhrñr r rHr$rr r ÚremoveÚdiscardÚissubsetrrrÅ)r<rrgrwrxr*r Ú extinctrevsÚsrcrevÚsrcnodeÚ successorsrnÚsuccrevsÚdstrevÚsuccrevs ` r-rÑrуs.ø€ð.0Ð*Ü,/«EÐ)à �‰€BØ�h‰h×Ñ€GÜ�d—i‘i  Ó-Ó.€Kۈؗ'‘'˜&“/ˆäœ×.Ñ.¨t¯}©}¸w¸iÓHÓIˆ à×ј'Ô"Ù(2Ó3©  1‘G˜A•J¨ ˆÐ3Ø×јÔÙ˜X×.Ñ.¨{Ô;à=AÐ 2°6Ò :à˜V‘_ˆFÛ#�Ø×#Ñ# G¨VÕ4ØELÐ:¸6ÑBÙð$ð˜[Ñ(¬CÓ/OÁhÓ/OÕ,OØ9×=Ñ=¸fÕEð- ð2 /Ø-ð ðùò%4sÂD/cóÔ—|j«5|j«5t||«}|jd¬«ddd«ddd«y#1swYŒxYw#1swYyxYw)NTrª)r™ršrXrè)rUr<rŸs r-Ú abortrebaser‘°sC€Ø �‰��t—y‘y•{ܘd BÓ'ˆØ ×%Ñ%¨dÐ%Ô3÷#�ˆ—{�{ú�ˆús"‘A¢AÁAÁA ÁAÁA'cóª—|j«5|j«5t||«}tjj |«}t j|«|jd¬«}|�|cddd«cddd«S|jd«|j«ddd«ddd«y#1swYŒxYw#1swYyxYw)NFrª) r™ršrXr¯rrºrr°rèrr`)rUr<rŸr·r¸s r-Úcontinuerebaser“¶s™€Ø �‰��t—y‘y•{ܘd BÓ'ˆÜ × %Ñ %× *Ñ *¨4Ó 0ˆÜ×!Ñ! "Ô%Ø×/Ñ/¸Ð/Ó>ˆØ Ð Ø÷ #�{�‰ð ×јTÔ"Ø ×ÑÔ÷#�ˆ—{�{ú�ˆús/‘C ¢AB=Á8 C  !B=Â,C Â=C ÃC à Cc ó$—|jjd«sy t||i«}|j«|j}t|j«D�cgc] }|dk\sŒ |‘Œ c}«}|jtd«|jtd«d«|z|jtd«d«t|«|z zfz«y#t j $rtd«}|j|«YywxYwcc}w) Nr_s8rebase: (use "hg rebase --abort" to clear broken state) rs#rebase: %s, %s (rebase --continue) s %d rebasedsrebase.rebaseds %d remainingsrebase.remaining) r‡r¤rXr¨rr rárr�rKrÃÚlabel)rUr<rŸrrçrÈÚ numrebaseds r-Ú summaryhookr—Âsõ€Ø �8‰8�?‰?˜>Ô *Øðܘd B¨Ó+ˆØ ×ÑÔØ— ‘ ˆô  §¡¤Ó:¡˜A°1¸³6’a Ñ:Ó;€Jà‡H�HÜ Ð 1Ó2à �H‰H”Q�}Ó%Ð'8Ó 9¸JÑ FØ �H‰H”Q�Ó'Ð)<Ó =Ü�5‹z˜JÑ&ñ (ð ñ õøô × Ñ òäÐLÓMˆØ �‰�Œ Ùð üò ;sž)CÁ D Á)D Ã/D Ä D cóh—tjtjdt«}|dj dddt d«f«|dj dddt d«f«tjjdt«tjdd d d tt¬ «y) Nspullr*r,r6s'rebase working directory to branch headr…r†sspecify merge tool for rebaser_T)ÚfnameÚstopflagÚ continueflagÚ abortfuncÚ continuefunc)rÚ wrapcommandr Útablerƒrûrr Ú summaryhooksrÅr—r{Ú addunfinishedr‘r“)rUÚentrys r-Úuisetupr£Ús“€ä × "Ñ "¤8§>¡>°7¼JÓ G€EØ ˆ!�H‡O�OØ ˆi˜œqÐ!KÓLÐMôð ˆ!�H‡O�O�T˜7 C¬Ð+KÓ)LÐMÔNÜ ×Ñ×јY¬ Ô4Ü ×ÑØØØØÜÜ#ö r,r?)F)NFNT)Wrwr,Úmercurial.i18nrÚmercurial.noderrrÚmercurial.pycompatrÚ mercurialrr r r r r rrrr:rr¯rrrrrrrrrrrrrrr{r rÁrÀr¿ÚcmdtablerSÚ configtableÚ configitemÚ testedwithr.r4r=ÚrevsetpredicaterErQrVrXÚ dryrunoptsÚ formatteroptsÚ confirmoptsÚCATEGORY_CHANGE_MANAGEMENTr¡r˜rœr£r±rór(r)r6r3rÓr r4r4rQr²rãràrârrìrSrƒrÑr‘r“r—r£r+r,r-Úr±s¬ðñó å÷ñõ $÷÷÷÷÷÷õðB €Ø € ò,€ à €Ø ˆ)× Ñ ˜HÓ %€à€ Ø !ˆY× !Ñ ! +Ó .€ Ù Ø Ø#Ø õð#€ ò ò$ó ð,�)×+Ñ+Ó-€ñ�Ó ñ Eó!ð EñÐ)Ó*ñ#ó+ð#ò,÷K ñK ñ\ Ø ð Ø Ø Ù ÐFÓ GÙ ˆf‹Ið  ð Ø Ø Ù ÐNÓ OÙ ˆf‹Ið  ð ˆv�r™1Ð6Ó7¹¸6»ÐCà Ø Ø Ù Ð4Ó 5Ù ˆf‹Ið  ð ˆk˜5¡!Ð$FÓ"GÐHà Ø Ø Ù Ð4Ó 5Ù ˆg‹Jð  ð ˆw˜™qÐ!DÓEÐFà Ø Ø Ù Ð7Ó 8Ù ˆg‹Jð  ð ˆw˜™qÐ!<Ó=Ð>Ø ˆo˜u¡aÐ(EÓ&FÐGØ ˆy˜%¡ ?Ó!3Ð4Ø ˆ~˜u¡a¨Ó&8Ð9Ø ˆw˜™QÐ4Ó5Ð6Ø ˆg�u™aÐ :Ó;Ð<Ø ˆ{˜E¡1Ð%FÓ#GÐHØ ˆx˜¡Ð"@Ó AÐBà Ø Ø Ù ð:ó ð  ð_8ðr×Ññs9ðt×Ññu:ðv×Ññw;ñxÐGÓHØ×3Ñ3ô@ñBE1óC@ðBE1òP<ó~6ò E&òP^òBò4ò8ò$2>òjKò\Fò,òw$òtò3òlòAò ò<òò4@&ðRØ Ø Ø ó9NòxBòJ*òZ4ò òó0r,