6hXSrSSKJr SSKrSSKrSSKrSSKrSSKrSSK r SSK r SSK J r SSK JrJrJr SSKJrJrJrJrJrJrJrJrJrJrJrJrJrJ r!J"r"J#r#J$r$J%r%J&r&J'r'J(r(J)r*J+r+ SSK,J-r-J.r.J/r/ 0r0\%Rb"\05r10r2\%Rf"\25r3\3"SS S S 9 \3"S S SS 9 \3"S SS S 9 \3"S SSS 9 \3"S SS S 9 \3"SSSS 9 \3"S SSS 9 \3"S SS SS9 Sr40r5\6"5r7\6"5r8\6"5r9\6"5r:Sr;"SS5r<"SS5r=Sr>S r?SS!jr@S"rAS#rBSS$jrC\C"S%S&/\ "S'5SS(9"S)S*\=55rD\C"S+S,/\ "S-5SS(9"S.S/\=55rE\C"S0S1/\ "S255"S3S4\=55rF\C"S5S6/\ "S755"S8S9\=55rG\C"S:/\ "S;5SS<9"S=S>\F55rH\C"S?S@/\ "SA55"SBSC\F55rI\C"SDSE/\ "SF55"SGSH\=55rJ\C"SISJ/\ "SK5SS(9"SLSM\=55rKSSNjrLSSKMrM/SOQrNSPSQSR.rOSSurPrQrRrSrTSTurUrVrWSUurXrYrZSVur[r\SWur]r^r_r`raSXurbrcrdreSYSZSZS[S[S\S S S]S^S_. \d0SES`_S,Sa_S1Sb_SJSc_S&Sd_S@Se_SfSg_ShSi_SjSk_SlSi_SmSk_SnSo_SpSq_SrSo_SsSq_StSu_\cSvSvSwSxSySxSySiSkSz. \e00rfS{rg"S|S}5rhS~riSSjrjSrkSrl"SS5rmSrnSro\1"S SSS\ "S5\ "S54SSS \ "S54SSS \ "S54SjSS \ "S54SSS \ "S54SSS \ "S54S1SS \ "S54S@S/\ "S5\ "S54/\R-\ "S5\1RS9S5rrSrsSrtSruSrvSrwSrxSrySrzSr{Sr|Sr}SSjr~SrSrSrSrSrSrSrSSjrSrSrSrSrSrSrSSjrSr\GR"\&S\5 SrSrg!\a SrSrGNf=f!\a SrMGNf=f)ainteractive history editing With this extension installed, Mercurial gains one new command: histedit. Usage is as follows, assuming the following history:: @ 3[tip] 7c2fd3b9020c 2009-04-27 18:04 -0500 durin42 | Add delta | o 2 030b686bedc4 2009-04-27 18:04 -0500 durin42 | Add gamma | o 1 c561b4e977df 2009-04-27 18:04 -0500 durin42 | Add beta | o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42 Add alpha If you were to run ``hg histedit c561b4e977df``, you would see the following file open in your editor:: pick c561b4e977df Add beta pick 030b686bedc4 Add gamma pick 7c2fd3b9020c Add delta # Edit history between c561b4e977df and 7c2fd3b9020c # # Commits are listed from least to most recent # # Commands: # p, pick = use commit # e, edit = use commit, but allow edits before making new commit # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description and date # d, drop = remove commit from history # m, mess = edit commit message without changing commit content # b, base = checkout changeset and apply further changesets from there # In this file, lines beginning with ``#`` are ignored. You must specify a rule for each revision in your history. For example, if you had meant to add gamma before beta, and then wanted to add delta in the same revision as beta, you would reorganize the file to look like this:: pick 030b686bedc4 Add gamma pick c561b4e977df Add beta fold 7c2fd3b9020c Add delta # Edit history between c561b4e977df and 7c2fd3b9020c # # Commits are listed from least to most recent # # Commands: # p, pick = use commit # e, edit = use commit, but allow edits before making new commit # f, fold = use commit, but combine it with the one above # r, roll = like fold, but discard this commit's description and date # d, drop = remove commit from history # m, mess = edit commit message without changing commit content # b, base = checkout changeset and apply further changesets from there # At which point you close the editor and ``histedit`` starts working. When you specify a ``fold`` operation, ``histedit`` will open an editor when it folds those revisions together, offering you a chance to clean up the commit message:: Add beta *** Add delta Edit the commit message to your liking, then close the editor. The date used for the commit will be the later of the two commits' dates. For this example, let's assume that the commit message was changed to ``Add beta and delta.`` After histedit has run and had a chance to remove any old or temporary revisions it needed, the history looks like this:: @ 2[tip] 989b4d060121 2009-04-27 18:04 -0500 durin42 | Add beta and delta. | o 1 081603921c3f 2009-04-27 18:04 -0500 durin42 | Add gamma | o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42 Add alpha Note that ``histedit`` does *not* remove any revisions (even its own temporary ones) until after it has completed all the editing operations, so it will probably perform several strip operations when it's done. For the above example, it had to run strip twice. Strip can be slow depending on a variety of factors, so you might need to be a little patient. You can choose to keep the original revisions by passing the ``--keep`` flag. The ``edit`` operation will drop you back to a command prompt, allowing you to edit files freely, or even use ``hg record`` to commit some changes as a separate commit. When you're done, any remaining uncommitted changes will be committed as well. When done, run ``hg histedit --continue`` to finish this step. If there are uncommitted changes, you'll be prompted for a new commit message, but the default commit message will be the original message for the ``edit`` ed revision, and the date of the original commit will be preserved. The ``message`` operation will give you a chance to revise a commit message without changing the contents. It's a shortcut for doing ``edit`` immediately followed by `hg histedit --continue``. If ``histedit`` encounters a conflict when moving a revision (while handling ``pick`` or ``fold``), it'll stop in a similar manner to ``edit`` with the difference that it won't prompt you for a commit message when done. If you decide at this point that you don't like how much work it will be to rearrange history, or that you made a mistake, you can use ``hg histedit --abort`` to abandon the new changes you have made and return to the state before you attempted to edit your history. If we clone the histedit-ed example repository above and add four more changes, such that we have the following history:: @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan | Add theta | o 5 140988835471 2009-04-27 18:04 -0500 stefan | Add eta | o 4 122930637314 2009-04-27 18:04 -0500 stefan | Add zeta | o 3 836302820282 2009-04-27 18:04 -0500 stefan | Add epsilon | o 2 989b4d060121 2009-04-27 18:04 -0500 durin42 | Add beta and delta. | o 1 081603921c3f 2009-04-27 18:04 -0500 durin42 | Add gamma | o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42 Add alpha If you run ``hg histedit --outgoing`` on the clone then it is the same as running ``hg histedit 836302820282``. If you need plan to push to a repository that Mercurial does not detect to be related to the source repo, you can add a ``--force`` option. Config ------ Histedit rule lines are truncated to 80 characters by default. You can customize this behavior by setting a different length in your configuration file:: [histedit] linelen = 120 # truncate rule lines at 120 characters The summary of a change can be customized as well:: [histedit] summary-template = '{rev} {bookmarks} {desc|firstline}' The customized summary should be kept short enough that rule lines will fit in the configured line length. See above if that requires customization. ``hg histedit`` attempts to automatically choose an appropriate base revision to use. To change which base revision is used, define a revset in your configuration file:: [histedit] defaultrev = only(.) & draft() By default each edited revision needs to be present in histedit commands. To remove revision you need to use ``drop`` operation. You can configure the drop to be implicit for missing commits by adding:: [histedit] dropmissing = True By default, histedit will close the transaction after each action. For performance purposes, you can configure histedit to use a single transaction across the entire histedit. WARNING: This setting introduces a significant risk of losing the work you've done in a histedit if the histedit aborts unexpectedly:: [histedit] singletransaction = True ) annotationsN)_)binhexshort)bundle2cmdutilcontextcopiesdestutil discoveryencodingerrorexchange extensionshg logcmdutilmerge mergestate mergeutilobsoletepycompat registrarrepair rewriteutilscmutilstateutil)dateutil stringutilurlutil experimentalhistedit.autoverbFdefaulthistedits defaultrev dropmissinglinelenPsingletransactionuisinterface.histeditsummary-templates{rev} {desc|firstline}later-commits-firstT)r% experimentalsships-with-hg-corec^ [S5n/m U 4Sjn[[5[[5-[[5-H nU"U5 M T R S5 /nUR SS5(aUR S5 X1U4-RS5T -U-nSRUVs/sHo(aSU-OS PM sn5$s snf) zconstruct the editor comment The comment includes:: - an intro - sorted primary commands - sorted short commands - sorted long commands - additional hints Commands are only included once. sEdit history between %s and %s Commits are listed from least to most recent You can reorder changesets by reordering the lines Commands: c<>[UnURRS5n[UR5(a$SR [ URSS95nTRSXS4-5 TRS/[U5S- -5 g) N , c[U5$Nlen)vs 0/usr/lib/python3/dist-packages/hgext/histedit.py1geteditcomment..addverb..HsQkeys %s = %srs %s) actiontablemessagesplitr6verbsjoinsortedappendextend)r7alinesactionss r8addverbgeteditcomment..addverbDsw N & qww<< 6!''/?@AA{aq]23yCJN34r;r;r&r'sKDeleting a changeset from the list will DISCARD it from the edited history!r1s# %s s# ) rrDprimaryactionssecondaryactionstertiaryactionsrE configboolrArC) uifirstlastintrorJr7hintsrHlrIs @r8geteditcommentrV-s   EG5 ~ ! " #  ! "   "  NN3 E }}[.11  8 T] " ) )% 07 :U BE 88UCUaY]V3UC DDCs8CcH\rSrSrSrSrSrS SjrSrSr S r S r S r g) histeditstatei`cXlSUlSUlSUlSUlSUlSUlSUl[R"US5Ul /Ul gNhistedit-state) reporIkeeptopmost parentctxnodelockwlock backupfilestatemodcmdstatestateobj replacements)selfr\s r8__init__histeditstate.__init__asV    !   ))$0AB r;cDURR5(d*[R"UR[ S55 UR 5nUSUl[USU5nX l USUl USUl USUl USUl g) z;Load histedit state from disk and set fields appropriately.r& parentctxnoderuleskeeptopmost replacements backupfileN)reexistsr wrongtooltocontinuer\r_readr_ parserulesrIr]r^rfrb)rgdatarIs r8readhisteditstate.readms}}##%%  ' ' 1[> Bzz|!"23T(^T2 M J'  1}-r;c TURRRS5nURS5(aUR 5nUup4pVpxO[ R "U5nUup4pVnSnSRUV V s/sH upSX4-PM sn n 5nUUUUUUS.$s sn n f)Nr[v1 r1s%s %s)rkrlrmrnrorp)r\vfsrv startswith_loadpickleloadsrC) rgfprur_rulesr]r^rfrbverbrests r8rshisteditstate._read|s YY]]   1 2 == ! !::nURS[US5SRS US 554-5 M@ URnU(dSnURSU-5 g) Nrys%s TruesFalses%d s%s%s rr;c38# UHn[U5v M g7fr4)r.0rs r8 'histeditstate._write..s<^SVV^r>) rrr_r^r]r6rItostaterfrCrb)rgraction replacementrbs r8rhisteditstate._writes(  3t11223 3t||,,- tyyGh?@ 3t||,,-llF HHWv~~// 0# 3t00112,,K HH A'HH<[^<< -__ J :%&r;c URRSS5nUR5Vs/sHo"SSPM nnSnX4 US- n[X45nUS- n[X45nUS- nX4S:HnUS- n/n[ X45n US- n[ U 5H'n X4n US- nX4n US- nUR X45 M) /n [ X45nUS- n[ U5Han X4n[USS5n[ S[U5S5V s/sHn [XU S-5PM nn U R UU45 US- nMc X4nUS- nUR5 XXXvU U4$s snfs sn f)Nr[rrr>r() r\rz readlinesrintrangerEr6close)rgrrUrHindexr_r^r]rruleleni ruleactionrulerfreplacementlenroriginalsuccrbs r8r|histeditstate._loads YY]],d 3!#0A3B0   EL)   el#  |w&  el#  wAJ QJEXlURUlX lgr4)rr\node)rgrrs r8rhhisteditaction.__init__s JJ  r;cUR5RSS5Sn[U5nU"X5$![Raz [ R "URU5nUR5n[U5nN[![Ra# [R"[S5U-5ef=ff=f)zCParses the given rule, returning an instance of the histeditaction. r>rsinvalid changeset %s) striprArbinasciiErrorr revsingler\rrRepoLookupError ParseErrorr)clsrrruleidrev_ctxrulehashs r8fromrulehisteditaction.fromrules##D!,Q/ Lf+C5~~ L L((V<88:(m(( L&&q)@'AF'JKK L  Ls 8C )s templatealiass label(l,x)xr&r,Ns%s %s %sr() r\rrPconfigoverrider rendertemplateconfigrr firstline configintmaxellipsis)rgctxrPsummarylinemaxlens r8torulehisteditaction.torules ii " YY\\   . 5{ ,,YY{,?@G diij.B.B7.KLL'' Z@VR""400  s 'C!! C/cJSUR[UR54-$)zoPrint an action in format used by histedit state files (the first line is a verb, the remainder is the second) s%s %s)rrrrs r8rhisteditaction.tostate0s DIIs499~666r;cbUR5 UR5 UR5$)zfRuns the action. The default behavior is simply apply the action's rulectx onto the current parentctx.) applychange continuedirty continuecleanrs r8runhisteditaction.run6s+  !!##r;cDURnXRnURR5 [R "XR RSS9 SSS5 [URX05nURRUR5UR55 UR(aI[R"[!S5UR"[%UR54-[!S5S9eg!,(df  N=f)zdApplies the changes from this action's rulectx onto the current parentctx, but does not commit them.T quietemptyNsFix up the change (%s %s)s hg histedit --continue to resumer)r\rrPsilentrupdaterr_ applychangesdirstate setbranchbranchcurrenttransactionunresolvedcountrInterventionRequiredrrr)rgr\rulectxstatss r8rhisteditaction.applychange=syyyy/ WW^^  IIdJJ44 FTWWdR8  0$2I2I2KL  ,,./499eDII>N2OO:;  !  s *D DcdURnXRnUR5n[X5nURR SS5(a[ R"5nOUR5nU"UR5UR5UUR5US9 g)z}Continues the action when changes have been applied to the working copy. The default behavior is to commit the dirty changes.rewriteupdate-timestamp)textuserdateextraeditorN) r\r commiteditor commitfuncforrPrOrmakedater descriptionrr)rgr\rr commitrs r8rhisteditaction.continuedirtyLsyyyy/""$t- 77  j*= > >$$&D<<>D$$&--/  r;cg)z1The editor to be used to edit the commit message.Frrs r8r histeditaction.commiteditor`sr;cURSnUR5URR:Xa\URRR [ S5[UR5-5 XR[54/4$UR5UR:XaU/4$XRUR544/4$)zContinues the action when the working copy is clean. The default behavior is to accept the current commit as the new version of the rulectx..s$%s: skipping changeset (no changes) ) r\rrr_rPwarnrrtuple)rgrs r8rhisteditaction.continuecleandsiio 88:11 1 IILL  :;eDII>NN ))UW-.. . 88: "7Nii#((*/000r;)rr\rN)rrrrrh classmethodrrrrrrrrr rrrr;r8rrsH  : 1.7 $  ( 1r;rc<^^^TR5mUUU4SjnU$)a)Build a commit function for the replacement of This function ensure we apply the same treatment to all changesets. - Add a 'histedit_source' entry in extra. Note that fold has its own separated logic because its handling is a bit different and not easily factored out of the fold method. c >ST0nTRRUS5 URS05R5nTR 5US'X S'TR "S0UD6sSSS5 $!,(df  g=f)Nsphasess new-commitr&rhistedit_sourcer)rPrgetcopyrr)kwargs overridesrphaseminr\srcs r8 commitfunc!commitfuncfor..commitfuncsm/: WW # #I{ ;JJw+002E(+ E$ %#7O;;(( < ; ;s A A55 B)phase)r\r!r"r s`` @r8r r tsyy{H) r;cBUR5R5URR5:XaJUR5 [R "XUSS9 [ R"SSSS5nSSS5 U$URRSSURSS5S 5 [ R"UU/S QS 9nURRSSSS 5 U$!,(df  W$=f!URRSSSS 5 f=f) z@Merge changeset from ctx (only) in the current working directoryT)allrNr+s forcemergestoolr;r&)salready editedscurrent changesparent of current change)labels) p1rrrr revertmergemod updateresultrP setconfigrgraft)rPr\roptsrs r8rrs vvx}}$--**,,YY[ NN2Sd 3))!Q15E( L! F GG  }dhhw&, C;> Dc P^^^[URSUR5TR555nU(dgUHQnUR5(aM[R "[ S5[UR55-5e UR5n[5nUH"n URU R55 M$ [R"UT5mUV s/sH$n [R"U TU5(aM"U PM& nn TR!5mUUU4Sjn UR#S5(aUSn OUR%5n UR#S5n UR#S5nUR#S5nUR5R5UR'5R54nSnU(d[R("S S S 9n[*R,"UUU UU U UUUS 9 nUR/U5$s sn f) zcollapse the set of revisions from first to last as new one. Expected commit options are: - message - date - username Commit message is edited in all cases. This function works in memory.s%d::%dN!cannot fold into public change %sc >UT;abTUnUR5n[R"UUUR5UR 5SU;SU;TR U5S9nU$g)Nlr)islinkisexec copysource)flagsr memfilectxpathrur) r\rr8fctxr6mctxcopiedheadmflastctxs r8 filectxfncollapse..filectxfnsj 6>4=DJJLE%%  u}u}!::d+DKr;messageuserdateextraTs histedit.foldediteditform)parentsrfilesr>rrrr )listsetrmutablerrrrrr(rrHr pathcopiesr samefilemanifestrr p2getcommiteditorr memctx commitctx)r\firstctxr= commitopts skippromptctxscbaserHrrr>r@rrrrGr newr;r<s ` @@r8collapserZs HLLNGKKMB CD  yy{{""67%/I  ;;=D EE SYY[!  tW -F H1W%5%5a$%GQE H    F ~~j!!Z(&&( >>' "D >>' "D NN8 $E{{}!!#X[[]%7%7%9:G F ((d=MN ..     C >># W Is 8!H#H#c&USRSS9$)NT)missing)dirtyr\s r8 _isdirtywcr_s :  D  ))r;cP[R"[S5[S5S9e)Ns working copy has pending changessYamend, commit, or revert them and run histedit --continue, or abort with histedit --abortr)r StateErrorrrr;r8 abortdirtyrbs+    -.  :  r;c ^^^^UUUU4SjnU$)Ncf>T(a T(aeTSnT(a[RU5 OWT(a[RU5 O:[T5S:a[RU5 O[ RU5 XlTUlTUlTH nU[U'M U$Nrr>) rLaddinternalactionsr6rMrNrrBr@r?)rrinternalr@priorityrBs r8wrapaction..wraps8++Qx    t $     % Z!^   &    %  D #K  r;r)rBr@rirhrjs```` r8rrs& Kr;pickps use commit)ric(^\rSrSrU4SjrSrU=r$)pickic<>URURnUR5R5URR:Xa?URR R S[UR5-5 U/4$[TU]%5$)Nsnode %s unchanged ) r\rr(rr_rPdebugrsuperr)rgr __class__s r8rpick.runsq))DII& ::<   $**":": : IILL  5dii8HH IB; w{}r;r)rrrrrr __classcell__rss@r8roros r;roedites4use commit, but allow edits before making new commitc \rSrSrSrSrSrg)rEi#c`URnXRn[R"XRR SS9 [ URX05 [S5n[R"[S5[UR5-U[UR5-S9e)NTrs9to edit %s, `hg histedit --continue` after making changess6Editing (%s), commit as needed now to split the changer) r\rrrrr_rrPrrrr)rgr\rrs r8redit.run)syyyy/ $ 00TBTWWdR0MN(( G HDII dii((  r;c,[R"SSS9$)NTs histedit.editrDr rPrs r8r edit.commiteditor5&&D;KLLr;rN)rrrrrr rrr;r8rErE#s  Mr;rEfoldfs-use commit, but combine it with the one abovecL^\rSrSrU4SjrSrSrSrSrSr Sr S r U=r $) foldi9c`>[TU]XU5 URnU(dX@RR 5nOUR S;agXARnUR 5(d9[R"[S5[UR55-5eg)z.Verifies semantic correctness of the fold rule)rlbaseNr0) rrrr\rr(rrKrrrr)rgrrrr\rWrss r8r fold.verify;s tt,yyYY""$A00 YYAyy{{""67%/I r;cURnXRn[X5nU"S[UR5-UR 5UR 5UR 5S9 g)Nsfold-temp-revision %s)rrrr)r\rr rrrr)rgr\rrs r8rfold.continuedirtyJsTyyyy/t-)E$)),<<--/  r;cbURnUSnXRnURRnUR5U:XaKURR [ S5[UR5-5 X RU44/4$XnURSUR5UR55Vs1sHnUR5iM nnU(ddURR [ S5[UR5[U54-5 X RUR544/4$UR5nURUR55 URURXX2R5U5$s snf)Nrs%s: empty changeset s (%d::. - %d)sI%s: cannot fold - working copy is not a descendant of previous commit %s ) r\rrr_rPrrrrJrrdiscard finishfold) rgr\rrr_ parentctxrW newcommits middlecommitss r8rfold.continuecleanVshyy4jyy/ 00 88: & GGLL34uTYY7GG H))m%5677 7' XXoy}} P P FFHP   GGLL:#U=%9: ; ))chhj]344 4") chhj) GGTgxxz=  # s F,cg)zReturns true if the rule should skip the message editor. For example, 'fold' wants to show an editor, but 'rollup' doesn't want to. Frrs r8rUfold.skippromptus r;cg)zReturns true if the rule should merge messages of multiple changes. This exists mainly so that 'rollup' rules can be a subclass of 'fold'. Trrs r8 mergedescsfold.mergedescs}s r;cg)zReturns true if the rule should preserve the date of the first change. This exists mainly so that 'rollup' rules can be a subclass of 'fold'. Frrs r8 firstdatefold.firstdatesr;c [R"UR55 0nUR5US'UR 5(dUR 5nOYSR UR 5/UV s/sHoU R 5PM sn -UR 5/-5S-nXS'UR5(aUR5US'O+[UR5UR55US'URSS5(a[R"5US'UR5R5n SUR5UR54-U S 'XS '[UR!5UR!55n S U 0n UR"R%U S 5 ['UUX%UUR)5S 9n SSS5 W cU/4$[R"X-5 UR+5U44UR+5U 44X]44/nUHnUR-X445 M X-U4$s sn f!,(df  N}=f)NrAs *** r1r@rBrrs%s,%srrCrr&)rU)r*rr(rrr rCrrrrOrr rrrr$rPrrZrUrrE)rgrPr\roldctxnewnodeinternalchangesrT newmessagerrr rnrfichs r8rfold.finishfolds/! !hhj 7  *J__&'6EFoAw**,oFG))+,-   ",: >>  "%((*Jw "%chhj&++-"@Jw  ==%8 9 9"*"3"3"5Jw    "%- 6::5%5%r;rrbs:checkout changeset and apply further changesets from therec,\rSrSrSrSrSrSrSrg)rXicURSR5UR:wa-[R"URUR5 UR 5$Nr)r\rr* clean_updaterrs r8rbase.runsI 99T?   !TYY .  ! !$))DII"6 7!!##r;c[5 gr4)rbrs r8rbase.continuedirtys r;c(URSnU/4$rr^)rgbasectxs r8rbase.continuecleans))D/{r;cURU;aJ[S5n[R"X@R[ UR54-[S5S9eg)Ns.%s "%s" changeset was an edited list candidates&base must only use unlisted changesetsr)rrrrrr)rgrrrmsgs r8rbase._verifynodeconstraintssR 99 EFC""yy% "233@A  !r;rN) rrrrrrrrrrr;r8rXrXs $ r;rXs _multifoldsvfold subclass used for when multiple folds happen in a row We only want to fire the editor for the folded message once when (say) four changes are folded down into a single change. This is similar to rollup, but we should preserve both messages so that when the last fold operation runs we can show the user all the commit messages in their editor. )rhc\rSrSrSrSrg) _multifoldicgNTrrs r8rU_multifold.skippromptr;rN)rrrrrUrrr;r8rrsr;rrollrs9like fold, but discard this commit's description and datec&\rSrSrSrSrSrSrg)rollupicg)NFrrs r8rrollup.mergedescssr;cgrrrs r8rUrollup.skippromptrr;cgrrrs r8rrollup.firstdaterr;rN)rrrrrrUrrrr;r8rrs r;rdropdsremove commit from historyc\rSrSrSrSrg)dropicxURURRnXR[ 54/4$r4)r\rr_rr)rgrs r8rdrop.runs1IIdjj667 IIuw/000r;rN)rrrrrrrr;r8rrs1r;rmessms3edit commit message without changing commit contentc\rSrSrSrSrg)r@i c,[R"SSS9$)NTs histedit.messrDr}rs r8r message.commiteditorrr;rN)rrrrr rrr;r8r@r@ s Mr;r@cUc0n[R"SXU5nUR[S5[R"UR 5-5 [ R"XUR/4S5upg[ R"XU5nU(a UV s/sHoRU 5PM nn [R"XXcS9n U R(d[R"[S55e[!UR#SU R55n [%U 5S:a*[S5n [S 5n [R"XS 9eXS R'5$s sn f) zRutility function to find the first outgoing changeset Used by initialization codeNr&scomparing with %s )forcesno outgoing ancestors roots(%ln)r>s&there are ambiguous outgoing revisionss&see 'hg help histedit' for more detailrr)r!get_unique_push_pathstatusr hidepasswordlocr addbranchrevsrpeerlookupr findcommonoutgoingr\rrarIrevsr6r)rPr\remoterr.r8rcheckoutotherroutgoingrootsrrs r8 findoutgoingrs. |  ' ' Tv FDIIa&''*>*>txx*HHI%%d4;;2CTJND GGD %E ,01DS C D1++DKH   q!9:;; =(*:*:;    2s!E5)rlrwrrrrs^folds^roll)rr)r>)) )r>r)rrrrr)rr>rrglobal next-action prev-actionquit showpatchhelp) hs KEY_RIGHTr2sKEY_LEFTqcCv?s action-drops action-edits action-folds action-messs action-picks action-rollrselectjdownkupKEY_DOWNKEY_UPJ move-downKmove-up KEY_NPAGE KEY_PPAGE0goto page-downpage-up line-downline-up) rrrrrrrrrcx[R"S[R"S[R S55$)Nshhr>s )structunpackfcntlioctltermios TIOCGWINSZrr;r8 screen_sizer ps& == Aw/A/A7 K LLr;c\rSrSrS SjrSr\R"\5r\ S5r \ RS5r SrSrg) histeditruleitcNXlX lX@lX0lX0l/Ulgr4)rPrrorigpospos conflicts)rgrPrrrs r8rhhisteditrule.__init__us"  r;c8SURUR4-$)Ns%s%s)prefixdescrs r8 __bytes__histeditrule.__bytes__}s$++tyy111r;c,[RURUR5nURR 5SSnURR 5nSSUR -RS5URS5UU4-$)Nrrs#%s %s %d:%s s%drr) ACTION_LABELSrrrrrrljust)rgrhrs r8rhisteditrule.prefixs} ""4;; < HHLLN1R  HHLLN! T\\ ! ( ( + LLO %   r;c[R"URURR SS55nU(aU$[ R "URR55$)Nr&r,)r rrrPrr rr )rgrs r8rhisteditrule.descsU(( HHdggnn[2EF  N##DHH$8$8$:;;r;cURUR:aURUR::az[URR 55[URR 55-[5:wa'UR R U5 UR $XR ;aUR RU5 UR $r4)rrrJrrHrrEremove)rgrs r8checkconflictshisteditrule.checkconflictss 99txx EMMT\\$A599??$%DHHNN,<(==F%%e,~~% NN " NN ! !% (~~r;)rrrrrrPN)rl)rrrrrhrr strmethod__str__propertyrr propertycacherr rrr;r8r r tsO 2  +G     < <r;r cp/nUH-nURSURUR4-5 M/ U$)zWReturns a list of commands consumable by histedit --commands based on our list of ruless%s %s )rErr)rcommandss r8 makecommandsr(s6H ellEII%>>? Or;cUR5upVUS- U- n[U5RU5SUnUS:aXQ-nUS:aXb-nU(aURXX45 gURXU5 g)zAdd a line to the given window left padding but 100% filled with whitespace characters, so that the color appears on the whole liner>Nr)getmaxyxbytesraddstr)winyxrcolormaxymaxxlengths r8addlnr4stJD AX\F ;  V $Wf -D1u H1u H  1% 1r;c:[U5U::aU$SXS- *S-$)Ns> rr5rrs r8 _trunc_headr7s( 4yA~ 4a% # ##r;c:[U5U::aU$USUS- S-$)Nrs >r5r6s r8 _trunc_tailr9s' 4yA~ !a%=5  r;c\rSrSrSrSrSrSrSrSr Sr SS jr S r S r S rS rSrSrSrSrSSjrSrSrg)_chistedit_stateicXlX lX0lURR SS5UlSUlSUl[[4Ul SUl [SS0[SS00Ul g)Nr&r-r line_offset)r\rstdscrrPrO later_on_toprselected MODE_INITmode page_height MODE_RULES MODE_PATCHmodes)rgr\rr>s r8rh_chistedit_state.__init__sy     GG.. /    *      r;c URURUR5nURnUR 5 UR 5upEUS- nSUR 5UR5SS4-nURSSUSU5 SUR5-nURSSUSU5 URRUR55nSS RU5-nURSSUSU5 S [R"UR!55-nURS SUSU5 S nURS SU5 S[#U5-n Xi- S-n S n USU -- S- n UR%5n ['U 5Hpup[#U 5U :a<XS- :Xa4URX[)SRXS5U 55 U S-n O$URX[+X55 U S-n Mr UR,n[#U5S:a"SR[/SU55nSU-nOSnURU SUSU5 UR15 g)zKRenders the commit window that shows the log of the current selected commitrschangeset: %d:%sNrr>s user: %srs bookmark: %srs summary: %srs files: r,rc<URR5SS$)Nr)rr)rs r8r90_chistedit_state.render_commit..s!%%))+cr2Br;schanged files overlap with %ss no overlap)rdisplay_pos_to_rule_posrrboxr*rrr,rr\ nodebookmarksrrCr rr r6rH enumerater9r7rmap noutrefresh)rgr-rrr1r2r3rbmsfnxfnmaxxr.fnmaxnrHrline1r conflictstrs r8 render_commit_chistedit_state.render_commits6zz$66txx@Ahh  \\^ "cggi3B%@@ 1agv'#((*, 1agv'ii%%chhj1$))C.0 1agv'*"6"6s7H"II 1agv' 1a#d)m! Q!# !%(HA5zF"qQJ 1;tyyr/CV#LME JJq{59 :AA )NN y>A ))C(BI$NOK:[HK'K 1aWf-. r;cURS[:XaSnUR5$SnUR(aUS- nUR5$US- nUR5$)Nrs}?: help, k/up: line up, j/down: line down, v: stop viewing patch pgup: prev page, space/pgdn: next page, c: commit, q: abort s?: help, k/up: move up, j/down: move down, space: select, v: view patch d: drop, e: edit, f: fold, m: mess, p: pick, r: roll pgup/K: move patch up, pgdn/J: move patch down, c: commit, q: abort s-Newer commits are shown above older commits. s-Older commits are shown above newer commits. )rBrEr? splitlines)rghelps r8 helplines_chistedit_state.helplines%sn 99Q<: %D  D   II  II  r;c UR5up#[UR55H2upEXB:a O*[XSU[R "[ 55 M4 UR5 gNr)r*rOr]r4curses color_pair COLOR_HELPrQ)rgr-r1r2r.rs r8 render_help_chistedit_state.render_help7sT\\^  !12GAy #!T6#4#4Z#@ A3 r;cURR5up[UR55nX- S- nUS:a+[R "[ S5X4-[ S5S9eSU4X24XB4S.$)Nrr>s:terminal dimensions %d by %d too small for curses histedits7enlarge your terminal or use --config ui.interface=textr)commitrmain)r>r*r6r]rAbortr)rgr1r2helplenmainlens r8layout_chistedit_state.layout?s[[))+ dnn&'.2% Q;++OP,N Dz__  r;c^UR(a[UR5S- U- $U$)aConverts a position in display order to rule order. The `display_pos` is the order from the top in display order, not considering which items are currently visible on the screen. Thus, `display_pos=0` is the item at the top (possibly after scrolling to the top) r>)r?r6r)rg display_poss r8rL(_chistedit_state.display_pos_to_rule_posQs+   tzz?Q&4 4 r;c UR[SnURVs/sH!o3R(dMURPM# nn[ U5S:aSSSR [[RU55-n[USSU[R"[55 [U[ UR55GHnXb- nUS:dXpR:aMUR!U5nURUn [ U R5S:a-UR#USS[R"[55 O"UR#USS[R$5 X`R&:Xa-[(n [XSU [R"[*55 OaX`R,:Xa?[.n [UUSU [R"[05[R2-5 O[4n [XSU 5 U R6S:XdGMWUR#US[ U R85-U R:[R"U 55 GM UR=5 gs snf) Nr=rspotential conflict in %srIrrrr)rFrDrrrr6rCrPrbytestrr4rarb COLOR_WARNrrCrLr, COLOR_BLACKr@COLOR_ROLL_SELECTEDCOLOR_SELECTEDrCOLOR_ROLL_CURRENT COLOR_CURRENTA_BOLD COLOR_ROLLrrrrQ) rgrulesscrstartrrrror.rule_posr rollcolors r8 render_rules_chistedit_state.render_rules^s :&~6$(JJ>Jq++UQUUJ > y>A .H$$i02D (B4):)::)F G DJJ8K#A1u---33K@H::h'D4>>"Q&1dF,=,=j,IJ1dF,>,>?mm+/ h1dF,=,=n,MN(. %%m4v}}D ' h1d+{{g%DKK((II%%i0 99F U?s JJc UR5upE[US- [U55n[SU5GHnX'nU(aUR S5(a.UR USU[ R"[55 MSUR S5(a.UR USU[ R"[55 MUR S5(a.UR USU[ R"[55 MUR USU5 MUR USU5 GM UR5 g)Nr>r+-s@@ ) r*minr6rr{r,rarbCOLOR_DIFF_ADD_LINECOLOR_DIFF_DEL_LINECOLOR_DIFF_OFFSETrQ) rgr-output diffcolorsr1r2r3r.rs r8 render_string_chistedit_state.render_strings\\^ TAXs6{+q&!A9D??4((JJ1dF$5$56I$J__T**JJ1dF$5$56I$J__V,,JJq!T6+<+<=N+OPJJq!T* 1a&!"" r;cUR[SnUR[SnURXUSSS9 g)Nr= patchcontentsT)r)rFrEr)rgr-r|contents r8 render_patch_chistedit_state.render_patchsB :&~6**Z()9: 3DAr;c^URnT[RS4;a[$TnTbSTs=::aS::aO OSnURupE[ UR U[ SR U55nUcgUS;a\[US-[UR5S- 5nURX'5 URcUS:XaURX'5 ggUS ;aF[S US- 5nURX'5 URcUS :XaURX'5 ggUS :XaURUS S9 gUS:XaURUSS9 gUS:Xa2URcUOSUl URUR5 gUS:Xa[!T5[UR5s=:aS::agO Od[#U4SjUR55nURX(R5 URbURX(R5 ggUR%S5(aUR'X&SS5 gUS:Xa"UR)U[*:wa[*OU5 gUS:Xa"UR)U[,:wa[,OU5 gUS:Xa[.$US:Xa[0$US:Xa[2$US:Xa[4$US:Xa[6$US:Xa[8$g)zChange state based on the current character input This takes the current state and based on the current character input from the user we change the state. s KEY_RESIZENr9r)rrr>r)rrrrrT)nextrFrrrc3\># UH!oR[T5:XdMUv M# g7fr4)rr)rrchs r8r)_chistedit_state.event..s IjIIR4H11js, ,saction-rrrrr&rrrr)rra KEY_RESIZEE_RESIZErBKEYTABLErrr6r move_cursorr@swapr cycle_actionmake_selectionrrr{ change_action change_moderE MODE_HELPE_QUIT E_HISTEDIT E_PAGEDOWNE_PAGEUP E_LINEDOWNE_LINEUP) rgroldpos lookup_chcurmodeprevmodernewposnewrules ` r8event_chistedit_state.events  &##]3 3O >db0D0I II'"&& x *..y9  >  , ,!S_q%89F   V ,}}(Fl,B &)-C * *FQJ'F   V ,}}(Fj,@ &)-A ~ %   f4  0 ~ %   f5  1 y &*mm&;FDM    . w 3r7S_#B#BIdjjIIG   V[[ 1}}( &++.)   z * *   vabz 2 | #   7j+@Zh O w    'Y*>YH M w M { "  | #  z !O | #  z !O"r;cURnURURUR5n[R "UR USSS.SS9nSS0nUR RUSS9 URUR5 UR5 SSS5 URURR5R5$!,(df  NC=f)NTsstatus)spatchstemplate)buffered)r+sverboser&)source)r\rrLrrchangesetdisplayerrPrshowrrhunkrr[)rgr\r displayerrs r8patch_contents_chistedit_state.patch_contentssyyzz$66txx@A11 GG ) 4  )$/ WW # #Ik # B NN488 $ OO C~~dhhlln-88::C Bs 7,C  C.cX lURup4U[:XaLUR[nX%S:aX%S'O,X%SUR-S- :aX R- S-US'SUR[ S'g)zChange the rule/changeset that the cursor is pointing to, regardless of current mode (you can switch between patches from the view patch window). r=r>rN)rrBrDrFrCrE)rgrrrBr modestates r8r_chistedit_state.move_cursors)) :  :.I.11,2.)N3d6F6FFJJ,25E5E,E,I .)23 :~.r;cURup#X4UlU[:Xa%UR5UR[S'gg)Nr)rBrErrF)rgrBrrs r8r_chistedit_state.change_mode s@YY O : 7;7J7J7LDJJz "#3 4 r;cXlgr4)r@)rgrs r8r_chistedit_state.make_selections r;cURU5nURU5nURnSUs=::a[U5:aO eSUs=::a[U5:de eXTXSsXS'XT'XEUlX5Ul[ X45n[ X45n[ XgS-5H-nXTRXX5 XSRXX5 M/ UR(aURU5 gg)zOSwap two positions and calculate necessary conflicts in O(|newpos-oldpos|) timerr>N) rLrr6rrrrr r@r) rgrr old_rule_pos new_rule_posrr|endrs r8r_chistedit_state.swaps33F; 33F;  L-3u:-PP!|2Pc%j2PPP2PPP     1U0 #/l".lL/,-uAg&A   . .ux 8   . .ux 8' ==    ' r;cURU5nSUs=::a[UR5:de eX RUlg)z?Change the action state on the given position to the new actionrN)rLr6rr)rgrrr}s r8r_chistedit_state.change_action-sB//4H.s4::.....&, 8#r;cZURU5nSUs=::a[UR5:de eURURnU[;de[R U5nU(aUS- nOUS-nUR U[U[[5-5 g)zMChanges the action state the next or the previous action from the action listrr>N)rLr6rrKEY_LISTrr)rgrrr}currentrs r8r_chistedit_state.cycle_action3s//4H.s4::.....**X&--("""w'  QJE QJE 3X)> ?@r;cURup4U[:wagURUn[US5nURnUS:XaUOSnSUS- U--nUS- U-n USX--n [ S[ X55US'g)zChange the region of whatever is being viewed (a patch or the list of changesets). 'delta' is an amount (+/- 1) and 'unit' is 'page' or 'line'. Nrpager>r=r)rBrErFr6rCrr) rgdeltaunitrBr mode_state num_linesrC num_pages max_offsetnewlines r8 change_view_chistedit_state.change_viewEs)) :  ZZ%  #345 && "go{1Q;66 !m{2 ^,u|;%(C ,D%E >"r;) r?rBrFrCrr\rr@r>NF)rrrrrhrXr]rdrlrLrrrrrrrrrrrrrrr;r8r;r;sc 6/b!$ $ -^,B <| ;3(M (6- A$Fr;r;c [R"5 [R"[[R [R 5 [R"[[R[R 5 [R"[[R[R5 [R"[[R[R5 [R"[[R [R5 [R"[[RS5 [R"[ [R"S5 [R"[$[RS5 [R"[&[R"S5 [R"[([R[R5 [R"[*[R"[R 5 [R,"S5 Sn[/XU5nSnUR15 UR35 UR4upgU[6:XaUR9[:5 UR=U5nU[>:XagU[@:Xa URB$U[D:Xa0[G5n XRI5:wa[RJ"U 6 URM5n UR4upX:wa3U SSUl'URQURRURR5 SupU"U SX5upn U"U SX5upn U"U SX5unpU[T[V[X[Z4;asU[T:XaUR]S S 5 OVU[V:XaUR]SS 5 O9U[X:XaUR]S S 5 OU[Z:XaUR]SS 5 UR_5 UR_5 UR_5 U [`:XaURcU5 O_U [d:Xa3URgU[hRk5Rm55 O"URoU5 URqU5 URsU5 [Rt"5 [vRx"UR{55nGM![Ra GN5f=f![Ra GN f=f) NrrcT[R"USUSX5nXS- nX1U4$re)ranewwin)sizer.r/r-s r8 drawvertwin#_chisteditmain..drawvertwinqs1mmDGT!Wa3 !W qyr;Frh)rrrrgr>rsline)>rause_default_colorsr init_pairrc COLOR_WHITE COLOR_BLUErvrtrs COLOR_YELLOWCOLOR_OK COLOR_GREENrx COLOR_MAGENTArr COLOR_REDrrzrwrucurs_setr;rrefreshrBrArrDrrrrrr r* resizetermrlrCrrrrrrreraserErrr__doc__rr[rrXrddoupdater strtolocalgetkey)r\rr>rrroldmodeunusedersizesrr.r/helpwinmainwin commitwins r8_chisteditmainrVs !!#  Z!3!3V5F5FG ^V%7%79K9KL Z!3!3V5H5HI Xv1163E3EF ]F$6$68L8LM (&*<*X55nSSS5 WS LaURA[S 55 g [CU5[LavURE[S 55 [GU5n URISS5nU Hn URAU 5 M URJUS'SSS5 [MXX#U5$g!,(df  N=f!,(df  N.=f![Na gf=f)zinteractively edit changeset history via a curses interface Provides a ncurses interface to histedit. Press ? in chistedit mode to see an extensive help. Requires python-curses to be installed.NsPython curses library requiredrmrevr>/histedit requires exactly one ancestor revision roots(%ld)9The specified revisions must have exactly one common rootr*%s is not an ancestor of working directoryFshistedit aborted sperforming changes s chisteditsw+commandsr)(rarrir _colormoderr checkunfinished bailifchangedrFr desthisteditrEr6 InputErrorrIrJrrevrangerrr(betweenrrOr r with_lc_ctypewrapper functoolspartialrrtyperr(rzname _texthisteditKeyboardInterrupt)rPr\rfreeargsr.r]r defaultrevrrrootr^rrrrcrs r8 _chisteditrs ~kk!=>??BM2 xx xx#A&%d# H!..r8J% J' t9>""DE $((=**=*=d*IJ K r7a<""/  !uzz|--""$t71""?@5;N dODA LLbq'15 6$    ! 1 1.$ NOB" ; HHQ,- . 8t  IIa/0 1 $E,."AHHQK$&GG[!/!5DA A  " !/.    sIGL0K$2'LA L#*K5 L$ K2.L5 L?L LLr;rs*read history edits from the specified filesFILErcontinues$continue an edit already in progress edit-plansedit remaining actions listrms,don't strip old nodes after edit is completeabortsabort an edit in progressooutgoings#changesets not found in destinationforces.force outgoing even for unrelated repositoriesrsfirst revision to be editedsREVs)[OPTIONS] ([ANCESTOR] | --outgoing [URL])) helpcategoryc [R"U5n[U5nUR5oQR 5nXTlXdlUR S5S:Xa2[ U5[:Xa[XXBU5sSSS5 sSSS5 $[XXBU5sSSS5 sSSS5 $!,(df  O=fSSS5 g!,(df  g=f)a< interactively edit changeset history This command lets you edit a linear series of changesets (up to and including the working directory, which should be clean). You can: - `pick` to [re]order a changeset - `drop` to omit changeset - `mess` to reword the changeset commit message - `fold` to combine it with the preceding changeset (using the later date) - `roll` like fold, but discarding this commit's description and date - `edit` to edit this changeset (preserving date) - `base` to checkout changeset and apply further changesets from there There are a number of ways to select the root changeset: - Specify ANCESTOR directly - Use --outgoing -- it will be the first linear changeset not included in destination. (See :hg:`help config.paths.default-push`) - Otherwise, the value from the "histedit.defaultrev" config option is used as a revset to select the base revision when ANCESTOR is not specified. The first revision returned by the revset is used. By default, this selects the editable history that is unique to the ancestry of the working directory. .. container:: verbose If you use --outgoing, this command will abort if there are ambiguous outgoing revisions. For example, if there are multiple branches containing outgoing revisions. Use "min(outgoing() and ::.)" or similar revset specification instead of --outgoing to specify edit target revision exactly in such ambiguous situation. See :hg:`help revsets` for detail about selecting revisions. .. container:: verbose Examples: - A number of changes have been made. Revision 3 is no longer needed. Start history editing from revision 3:: hg histedit -r 3 An editor opens, containing the list of revisions, with specific actions specified:: pick 5339bf82f0ca 3 Zworgle the foobar pick 8ef592ce7cc4 4 Bedazzle the zerlog pick 0a9639fcda9d 5 Morgify the cromulancy Additional information about the possible actions to take appears below the list of revisions. To remove revision 3 from the history, its action (at the beginning of the relevant line) is changed to 'drop':: drop 5339bf82f0ca 3 Zworgle the foobar pick 8ef592ce7cc4 4 Bedazzle the zerlog pick 0a9639fcda9d 5 Morgify the cromulancy - A number of changes have been made. Revision 2 and 4 need to be swapped. Start history editing from revision 2:: hg histedit -r 2 An editor opens, containing the list of revisions, with specific actions specified:: pick 252a1af424ad 2 Blorb a morgwazzle pick 5339bf82f0ca 3 Zworgle the foobar pick 8ef592ce7cc4 4 Bedazzle the zerlog To swap revision 2 and 4, its lines are swapped in the editor:: pick 8ef592ce7cc4 4 Bedazzle the zerlog pick 5339bf82f0ca 3 Zworgle the foobar pick 252a1af424ad 2 Blorb a morgwazzle Returns 0 on success, 1 if user intervention is required (not only for intentional "edit" command, but also for resolving unexpected conflicts). r&scursesN) r byteskwargsrXrar` interface_getgoalgoalnewrr )rPr\r r.rrar`s r8histeditrsF    %D $ E  t   << $ 1htn6Ob>!, Ru=!,  s0CAB5 C B5" C5 C ?C Cc[XX#U5 gr4) _histedit)rPr\rr r.s r8r r s b.r;snewcURS5(a[$URS5(a[$URS5(a[$[$)Nrr edit_plan)r goalcontinue goalabort goaleditplanr)r.s r8rrsF xx  xx xx  Nr;cUS:Xa5URS5 URR5sSSS5 $[R"U5$!,(df  g=f)Nrr&)timeblockedsectionfinrvrreadfile)rPr8s r8 _readfiler)sF t|  " "; /66;;=0 /}}T""0 /s A A cj[USS5nU(a0UR(a[R"[ S55eUR S5nUR S5n UR S5n UR S5n U (a&U(d[R "[ S55eUS:Xa3[XXbXY45(a[R "[ S 55egUS:Xa3[XX%U 45(a[R "[ S 55egUS :Xa2[XU45(a[R "[ S 55egU(aUU(a[R "[ S 55e[U5S:a[R "[ S55egURU5 [U5S:Xa*[R"X5n U bURU 5 [U5S:wa[R "[ S55eg)Nmqssource has mq patches appliedrr!rrs$--force only allowed with --outgoingrs$no arguments allowed with --continues!no arguments allowed with --abortrs1only --commands argument allowed with --edit-plans$no revisions allowed with --outgoingr>s.only one repo argument allowed with --outgoingrr) getattrappliedrrarrranyr6rFr rrE) rPr\r r.goalrrr+outgeditplanabortrr s r8 _validateargsr3s tT "B bjjq!ABCC 88K Dxx %H HHX E HHX E Tq!HIJJ { TU= > >""1%L#MN N ?   HX6 7 7""1%I#JK K 8   H% & &""FG  ' &&=>8}q &&GH! KK !4yA~%222< )KK +4yA~&&HIr;c URSU5nUR5 [U5nURS/5nUR SS5(+nURSS5n URSS5Ul[ XX4XiU5 Sn U(an[R"X5nUV s/sHoU PM n n U H>n U R5Vs/sH oS :wdM UPM nnU (aM3[U5n M@ U (a=UR[S 5S S 9(a[R"[S 55eU[:XaUR!5 [#XU5nO9U[$:Xa ['XX)5 gU[(:Xa [+XX(S9 g[-XX'X45 [/XU5 [1XX%5 UR35 gs sn fs snf)Nr&rr backup-bundlerr;rmFstips{warning: tags associated with the given changeset will be lost after histedit. do you want to continue (yN)? $$ &Yes $$ &Nor>r$shistedit cancelled nobackup) formatter startitemrrrOr]r3rrtagsr6 promptchoicerr CanceledErrorr"rvbootstrapcontinuer$_edithisteditplanr#_aborthistedit _newhistedit_continuehistedit_finishhisteditr)rPr\rr r.fmr/rr7rhastagsrrVrtagr:s r8rrs k4 (BLLN D>D 88FB D==-=>>H HH[# &E'5)EJ"HD>G ""4.%)*TcS T*C#&88:?:CC:D?7d) ?? @    %%a(?&@A A | !"T2  "E1  r: RuH;b&Be(FFH?+?s1G G%GcfURSSn[[X3SSS/-55HMunupVURS:XdMU(dM#URS:XdM5[URUlMO UR 5 SnURSS5(aURS5nUR[S5[S5[UR5S9nU [R"U5 UR(aUR US 9 URS n URU R5S 9 UR!S U RU R54-5 U R#5upU R%5UlUR(R+U 5 URR-S 5 UR(aMSSS5 SSS5 UR 5 g!,(df  N'=f!,(df  N0=f) zwThis function runs after either: - bootstrapcontinue (if the goal is 'continue') - _newhistedit (if the goal is 'new') Nr>rr&r*seditingschanges)rtotal)rr)itemshistedit: processing %s %s )rIrOziprrrsrrO transaction makeprogressrr6racceptintervention incrementrrqrrr_rfrFpop) rPr\rrIidxrnextactrprogressactobjr replacement_s r8rArAsmmAG"+Cv9M,N"O f ;;' !gg',,'2I+5EMM#  (#P  KKM B }}["677  k * * AjMU]]1CH 4**2.mm KK2K ]]1%F   FMMO  4 HH/6;; 2PP '-jjl #I"+.."2E     % %l 3 MM  a mmm/ KKM/.s%.H"C)H0H" H H"" H0c^[R"XR5 [U5upEpgU(aUR 5HupU (dUR S[ U5-5 M+UR S[ U5[ U S54-5 [U 5S:dMgSn U SSH n UR U [ U 5-5 M" M UR(dU(a[XRU5 O0nUHn X;dM SXK'M UR5RRRmUR 5V V s0sH2upT"U 5(dM[U4SjU 55(dM0X_M4 nn n [ R""XS 5 UR$nUR&nUR(nU"UR 5VVV s0sH*unnU"U5U"UV s/sH o"U 5PM sn S S 9_M, sn nnS S S9nUR+US9 UR-5 [.R0R3UR5S55(a%[.R6"UR5S55 UR8R3S5(aUR8R7S5 ggs sn n fs sn fs sn nnf)z7This action runs when histedit is finishing its sessionshistedit: %s is dropped shistedit: %s is replaced by %s rr>s'histedit: %sNrc34># UH nT"U5v M g7fr4rrrhas_nodes r8r"_finishhistedit..Ss6Aqx{{Asr&snode)rsoldnodesnewnodes)r=value) nodechangessundohistedit-last-edit.txt)r*rr_processreplacementitemsrqrr6r]movetopmostbookmarksr^ unfiltered changelogrrWr&r cleanupnodeshexfunc formatlist formatdictrurosr8rqsjoinrrz)rPr\rrCmappingtmpnodescreatedntmprecsuccsmrkr7hfflfdoldnnewnrZrWs @r8rBrB0s_ OOD,,-.&8&?#Gw"==?KD5d CD7T{E%(O45u:>BA"12YU1X.'+ ::  }}c :  9GJ  **0099HMMO#DA A; 6A66 #    4 B B B&mmo - d tHb.A"Q%.W= =-   KGG G$ KKM ww~~djj)** $**W%& xx011 122-/ s*%K <K K 2K+ K& K+ &K+ c UR5 [U5upEpdURS[UR5-5 URU;aUR (aUR RUR 5n[R"X5n[R"XU5n URS5n [R"UU U SSU-S9 SSS5 [R "U5 UR#5R%SUR&XV-5(a [R("XRSSS9 [+XXcS 9 [+XXSS 9 UR55 g!,(df  N=f![,a1 UR/5(aUR1[3S 55 ef=f!UR55 f=f) Nsrestore wc to old parent %s shistedit.abortr&sbundle:)rurlsparents() and (%n or %ln::)T) show_statsrr6srwarning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up )rvr\rqrr^rbrzrCropenpathr readbundlerJr applybundlererr_rr_clean cleanupnode Exceptionrrrr) rPr\rr7__leafsrhrbrgenrs r8r?r?js) "4U";8 1E%--4HHI}}$)9)9u'7'78J B+A%%bZ8C!!"34##&"Z/ 5 IIj ! ??  ! ! +       HHT==Td KBh:Be7  ?54(        GG$     s1C F E='BF= F F;G  G Gc [U5nURSS5(+nUR5oAR5nXBlXRl[ XX#S9 SSS5 SSS5 g!,(df  N=f!,(df  g=f)Nrr5r6)rXrOrar`r?)rPr\rr7rar`s r8hgaborthisteditrsZ $ E==-=>>H  t  r:!, s#A<A+A<+ A9 5A<< B cUR5 U(dK[U[UR5[UR55n[ XUR U5nO [X5n[X25nUR Vs/sH#ofR(dMXRPM% nn[XXRU5 XRlUR5 gs snfr4) rvrVrr_r^ ruleeditorrIr)rtrwarnverifyactionsr)rPr\rrcommentrIactrVs r8r>r>s JJL  e))*E%--,@ 4U]]G<"$&G&+mm @msxxNDNmD @b5M KKM As CCc *URS5nURSS5nURS5n[R"U5 [R"U5 URR 5n U(aU(aUSn OSn [ XXU5n Op[URS[R"X555n [U 5S:wa[R"[S55eU SR5n [!XXR"5nU(d+[R"[S 5[%U 5-5eUV s/sHoU PM nn USnUS /nUSR 5/U-Hn[&R("UUUUS S S S S 9 M! U(dH[/U[%U 5[%U 55nUV s/sHn [1X-5PM nn [3XUU5nO [5X5n[7Xr5n[9XUX.5 XR 5R5nUUlUUlXl/Ul URCSS[U5[U5S9 Sn[DRF"U[DRH5(d[JRL"UU/U /U S5nUUl'gs sn f![R*a# [R,"[S 5U-5ef=fs sn f)Nrrr;rrrr>rrrF) branchmerger acceptremote followcopiess>untracked files in working directory conflict with files in %sr&s%d actions to histedit )histedit_num_actions)(rr rrrr(rrIrJrrr6rrrrrr]rr*calculateupdatesrirarVrorr)rtrr_rIr^rflogr isenabledcreatemarkersoptr backupbundlerb)rPr\rrr r.r0rrr^rrr rrVwctxancsrWrrIr_rbs r8r@r@s 88K D HH[# &E HHX E D! $mm G a[FFBfT: $((=**=*=d*IJ K r7a<""/  !uzz| 4w 3D  ; 404Wg6"$&Gb5JMMO((*M'EEMMEFF# G  \  J   dH$=$= > >(( =/G9dK "E} #2{{ ""U  1sKKL7L cJ[R"UR55$r4)r rr )rs r8 _getsummaryr s    1 22r;cURn[RRU5n[R "U5 UR (aUR RS5n[U5(a*UR5 [U5(a [5 UR5upgUR5Ul URRU5 U$r`)r\ mergestatemodrrvrcheckunresolvedrIrNr_rrbrrr_rfrF)rPrr.r\msrRrrfs r8r=r= s ::D  ! ! & &t ,B b! }}""1% d    "$ "("6"6"8 'nn. !!,/ Lr;cURS05nUR5 [U5nUR5oAR 5nXClXSlUR 5 [ XS5n[XU5 [XX25 UR5 SSS5 SSS5 g!,(df  N=f!,(df  g=f)Nr) r8r9rXrar`rvr=rArBr)rPr\rCrrar`s r8hgcontinuehisteditr+ s k2 &BLLN $ E  t   !"T2"E*%, !, s$CAB0C0 B> :C Cc2URSX5nU(aTU(dM[R"XS5 URSU5(a[R"[ S55e[ R"URRU5$)zkselect and validate the set of revision to edit When keep is false, the specified set can't have children.s%n::%nrws(%ld) and merge()s(cannot edit history that contains merges) rrprecheckrrarrmaplistr`r)r\oldrYr]rs r8rr: sv 99Y )D DT1 99)4 0 0""=>    DNN// 66r;c>URRSS5(GaR[R"5nUGHnXRn[ U5nUR SS5SR5nSn URS5(aUSS nU[[-[-;aXl U[U5S-SR5n [[!UR#555H8upX Rn [ U 5nX:XdM%S n U R%U5 O U (aGM/XE'GM /nUR#5HupUR%U 5 X,- nM S R'UVs/sHoUR)5PM sn5nUS - nX- nUR+UUR-5S S0UR.SS9nUR1SS5nUR3U5 SSS5 U$s snf!,(df  U$=f)z]open an editor to edit rules rules are in the format [ [act, ctx], ...] like in state.rules r"r#rr>rF!NrTr1s sprefixr&)repopathrr[swb)rPrOrsortdictrrrAlowerendswithrLrMrNrr6lstripreversedrIr]rErCrrEusernamer8rzr)r\rPrI editcommentnewactrrrfwordaddedtsumnarUactxasumrrs r8rrH s  ww/+?@@Cxx.C!#&GMM$*1-335EE~~d##cr N-==OO$H"3u:>#34;;=D"*$v||~*>!?#GG}*40<$(EHHSM! "@5  16\\^EB NN2  LG$ JJ8 8 9E WE E GG  K   E +U 3q  4 L#9 4 3 LsH,H  HcSUR55Vs/sH&nU(dM URS5(aM$UPM( nn/nUHnSU;a"[R"[ S5U-5eUR SS5upVU[ ;a"[R"[ S5U-5e[ URX5nURU5 M U$s snf)z@Read the histedit rules string and return list of action objectsc3@# UHoR5v M g7fr4)rrs r8rparserules.. s8%7''))%7s#rsmalformed line "%s"r>sunknown action "%s") r[r{rrrrAr?rrE)rrrUrIrrrrs r8rtrt s9U%5%5%78 8A  \\$' 8   G  q=""1%;#Nr)rrrr_r`rget_revobsstorerIrJunionrN successorsrrErf)r\oldreplacementsunfirrnewreplacementsroldsuccs seensuccs succstocheckrr\markersmarkernsuccsnsuccs r8adjustreplacementsfrommarkersr s:   dH$=$= > > ?? Dnn""**G}}H?+O-.o!oH. I ?L     !*$%%))!R0 7  " "Ar7 +FAYF  " "A; /)MM%( ''.  , +/s8E%c8[URUR5n[5n[5n0nUHZnUR US5 UR US5 UR US[55R US5 M\ X#- nX#-n[U5n0n U(ay[U5Han XJn [U 5H6n X;a MX;dMU RU 5 U R X5 M8 XU 'URU 5 Mc U(aMyUHn X M URRRRnU R5Hup[XS9X'M U(a+[X`RRRS9SnO`U (dSnOVURRRnUR[U US9SR5R!5nXUU4$)zprocess the list of replacements to return 1) the final mapping between original and created nodes 2) the list of temporary node created by histedit 3) the list of new commit created by histeditr>rr<rN)rr\rfrJrrf setdefaultrIrr`rrr]rDrr(r)rrfallsuccsreplaced fullmappingreprYrh toproceedfinalr/rlsrrrk newtopmostrs r8r\r\ s 1U=O=OPLuHuHKA SVs1vsu-44SV<  C"HK I E iANE%[>ZLLOLL*!!a  #! )  Hjj""((00G{{} U0 % CZZ%9%9%=%=>rB   JJ $ $ZZu! 4Q 78;;=BBD C ++r;ctU(aU(dgURU5nU(aoUR5 URS5nURn/nUHnUR Xr45 M UR XU5 SSS5 SSS5 gg!,(df  N=f!,(df  g=f)zMove bookmark from oldtopmost to newly created topmost This is arguably a feature and we may only want that for the active bookmark. But the behavior is kept compatible with the old version for now. Nr&)rNr`rJ _bookmarksrEr)r\ oldtopmostr oldbmarksrmarkschangesrs r8r^r^7 s Z"":.I YY[$**;72OOEG!12"   t 1 8[[77[[s#B) # UHnT"U5(dMUv M g7fr4rrVs r8rcleanupnode..U s7%Q8A;qq%s! !r)backupN) r`r_r`rrWrDrJrrr)rPr\nodesr7rWrrrWs @r8r{r{I s  >>''007%77#'88M5#AB#Aa#AB !\F LL5 8 C sAB8,B3%B83B88 Cc[U[5(aU/n[U5nUR5(aUR 5 UR Vs1sH!owR (dMUR iM# nnU[U5-n U (a8[R"[S5SRSU 55-5eU"XU/UQ70UD6$s snf)Ns$histedit in progress, can't strip %sr2c38# UHn[U5v M g7fr4)r)rr/s r8rstripwrapper..i s<|!U1XX|r) isinstancer+rXrrvrIrrJrrirrC) origrPr\nodelistargsrrrhistedit_nodes common_nodess r8 stripwrapperr\ s(E"": $ E  &+mm &3F{{KFKKm  &H 5 ++9:**<|<<=  ( 4T 4V 44 s C/Crc"[U5nUR5(dgUR5 UR(aMUR [ S5UR [ S5S5[UR5--5 gg)Ns!hist: %s (histedit --continue) s %d remainingshistedit.remaining)rXrrvrIrrlabelr6)rPr\rs r8 summaryhookrq sr $ E      JJL }}  3 4?+-BCemm$%  r;c [RRS[5 [R "SSSS[ [S9 g)Nr&r[T)fname allowcommit continueflag abortfunc continuefunc)r summaryhooksrfrrc addunfinishedrr)rPs r8extsetupr s8 [+6 !' r;r)FF)NFNr4)r;)r __future__rrr ImportErrorrrrer}rmercurial.i18nrmercurial.noderrr mercurialrr r r r r rrrrrrrr*rrrrrrrrrrrcrmercurial.utilsrr r!cmdtablecommand configtable configitem testedwithr?rJrLrMrNrgrVrXrr rrZr_rbrrorErrXrrrr@rrarrrcrvrrsrxrrrrzrwrurrrrrrrrArErDrrr r r(r4r7r9r;rr formatteroptsCATEGORY_CHANGE_MANAGEMENTrr r"r#r$rrr)r3rrArBr?rr>r@rr=rrrrtrrrr\r^r{r wrapfunctionrrrr;r8rsxt#   2    H %  ! !+ .                    ;+5NO 'T#  5%%0EfH7H7VF1F1R.8IX*.$=)D9>: dO=>  M>M  M"$KLMI%>I%NI%X dOCD> .O      dOBCT $89:1>1;1  dO<=  MnM  M !8 B   CP? NHj->E;(*;6?3  3 7D4 Hh H/9, :z9$#  n n n n  n  n  i g e W 5 l j l j g!$" ! rS* ZM<<~  $ ! {F{F| \6~?D     ; < gJ   {E1%L#MN lE1%C#DE    = >  hq!=>? {E1%K#LM    ? @  vr1;A@n>b/   #-`- `)X73t*Z;  ^"B3,  78v* * Z#L;,|2$9&5$ 6  uM EGV Fs#O!O$ O! O!$O0/O0