5@O dZ ddlZddlZddlZddlZddlZddlZddlZddl m Z ddl m Z m Z ddlmZmZmZddlmZmZmZmZmZmZmZmZmZmZmZmZmZ m!Z"m#Z#m$Z$m%Z%m&Z&m'Z'm(Z(m)Z)m*Z+m,Z,ddl-m.Z.m/Z/m0Z0iZ1e&jde1Z2iZ3e&jhe3Z4e4dd d e4d d d e4d dd e4d dd e4d dd e4ddd e4d dd e4d dd ddZ5iZ6e7Z8e7Z9e7Z:e7Z;dZ<GddZ=GddZ>dZ?d Z@dd!ZAd"ZBd#ZCdd$ZDeDd%d&ge d'd(Gd)d*e>ZEeDd+d,ge d-d(Gd.d/e>ZFeDd0d1ge d2Gd3d4e>ZGeDd5d6ge d7Gd8d9e>ZHeDd:ge d;d<Gd=d>eGZIeDd?d@ge dAGdBdCeGZJeDdDdEge dFGdGdHe>ZKeDdIdJge dKd(GdLdMe>ZLddNZM ddlNZNgdOZOdPdQdRZPdS\ZQZRZSZTZUdT\ZVZWZXdU\ZYZZZ[dV\Z\Z]dW\Z^Z_Z`ZaZbdX\ZcZdZeZfdYdZdZd[d[d\d d d]d^d_ eeidEd`d,dad1dbdJdcd&ddd@dedfdgdhdidjdkdldidmdkdndodpdqdrdodsdqdtdueddvdvdwdxdydxdydidkdz efiiZgd{ZhGd|d}Zid~ZjddZkdZldZmGddZndZodZpe2d ddde de dfddd e dfddd e dfdjdd e dfddd e dfddd e dfd1dd e dfd@dge de dfgejze de2jdZsdZtdZudZvdZwdZxdZydZzdZ{dZ|dZ}dZ~ddZdZdZdZdZdZdZddZdZdZdZdZdZdZddZdZeje'dedZdZy#e$rdZdZYwxYw#e$rdZNYwxYw)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 N)_)getattropen)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 td}g fd}ttttzttzD] }||  j dg}|j ddr|j d|||fzjd z|z}dj|Dcgc] }|rd|znd  c}Scc}w) 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:t|}|jjd}t|jr'dj t |jd}jd||dfzjdgt|dz zy) N , ct|SNlen)vs 2usr/lib/python3.12/site-packages/hgext/histedit.pyz1geteditcomment..addverb..KsQkeys %s = %srs %s) actiontablemessagesplitr7verbsjoinsortedappendextend)r8alinesactionss r9addverbzgeteditcomment..addverbGsw N & qww< 6!''/?@AA{aq]23yCJN34r;r;r'r(sKDeleting a changeset from the list will DISCARD it from the edited history!r2s# %s s# ) rrDprimaryactionssecondaryactionstertiaryactionsrE configboolrArC) uifirstlastintrorJr8hintsrHlrIs @r9geteditcommentrU0s   EG5 ~ ! " #  ! "   "  NN3 E }}[.1  8 eT] " ) )% 07 :U BE 88UCUaY]V3UC DDCs1Cc>eZdZdZdZdZd dZdZdZdZ d Z y) histeditstatec||_d|_d|_d|_d|_d|_d|_d|_tj|d|_ g|_ yNhistedit-state) reporIkeeptopmost parentctxnodelockwlock backupfilestatemodcmdstatestateobj replacements)selfr[s r9__init__zhisteditstate.__init__dsX    !   ))$0AB r;c:|jjs)tj|jt d|j }|d|_t|d|}||_ |d|_ |d|_ |d|_ |d|_ y) z;Load histedit state from disk and set fields appropriately.r' parentctxnoderuleskeeptopmost replacements backupfileN)rdexistsr wrongtooltocontinuer[r_readr^ parserulesrIr\r]rera)rfdatarIs r9readzhisteditstate.readps}}##%  ' ' 1[> Bzz|!"23T(^T2 M J'  1}-r;c P|jjjd}|jdr|j }|\}}}}}}nt j |}|\}}}}}d}dj|D cgc] \} } d| | fzc} } }||||||dScc} } w)NrZv1 r2s%s %s)rirjrkrlrmrn)r[vfsrt startswith_loadpickleloadsrC) rffprsr^rulesr\r]reraverbrests r9rqzhisteditstate._reads YY]]   1 2 == !::z'histeditstate._write..s<^SV^r>) rrr^r]r\r7rItostatererCra)rfr|action replacementras r9rzhisteditstate._writes(  3t11223 3t||,,- tyyGh?@ 3t||,,-llF HHWv~~// 0# 3t00112,,K HH A'HH<[^<< -__ J :%&r;c |jjdd}|jDcgc]}|dd }}d}|||dz }t||}|dz }t||}|dz }||dk(}|dz }g}t ||} |dz }t | D])} ||} |dz }||} |dz }|j | | f+g} t ||}|dz }t |D]_} ||}t|dd}t dt|dD cgc]} t|| | dz}} | j ||f|dz }a||}|dz }|j||||| |fScc}wcc} w)NrZrrr>r() r[rw readlinesrintrangerEr7close)rfr|rTrHindexr^r]r\r}ruleleni ruleactionrulerereplacementlenroriginalsuccras r9ryzhisteditstate._loads YY]],d 3!#0A3B0 e   E%L)   eEl#  U|w&  eEl#  wAuJ QJErsinvalid changeset %s) striprArbinasciiErrorr revsingler[rrRepoLookupError ParseErrorr)clsrrruleidrev_ctxrulehashs r9fromrulezhisteditaction.fromrules##D!,Q/ Lf+C5#~~ L L((V<88:(m(( L&&q)@'AF'JKK L  Ls' 9C ;B C 5B>>CCc|j}t|j}tj|||_|j$t j td|ddz|j|||y)z)Verifies semantic correctness of the ruleNsunknown changeset %s listed ) r[rrrresolvehexnodeidprefixrrr_verifynodeconstraints)rfprevexpectedseenr[has r9verifyzhisteditaction.verifysjyy ^224< 99 ""1%C#Dr#2w#NO O ##D(D9r;c:|j|vrKtjtd|jt |jfztd|j|vr4tjtdt |jzy)Ns%%s "%s" changeset was not a candidatesonly use listed changesetshints#duplicated command for changeset %s)rrrrr~r)rfrrrs r9rz%histeditaction._verifynodeconstraintss 99H $"":;99eDII./045  99 ""89E$)) )s templatealiass label(l,x)xr'r-Ns%s %s %sr)) r[rrOconfigoverrider rendertemplateconfigr~r! firstline configintmaxellipsis)rfctxrOsummarylinemaxlens r9torulezhisteditaction.torules ii " YY\\   . 5{ ,,RYY{,?@G diij.B.B7.KLL'' Z@VR""400  s 'C  C)cJd|jt|jfzS)zPrint an action in format used by histedit state files (the first line is a verb, the remainder is the second) s%s %s)r~rrrs r9rzhisteditaction.tostate3s DIIs499~666r;cb|j|j|jS)znRuns the action. The default behavior is simply apply the action's rulectx onto the current parentctx.) applychange continuedirty continuecleanrs r9runzhisteditaction.run9s+  !!##r;c>|j}||j}|jj5t j ||j jddddt|j||i}|jj|j|j|jrKtjt!d|j"t%|jfzt!dy#1swYxYw)zlApplies 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[rrOsilentrupdaterr^ applychangesdirstate setbranchbranchcurrenttransactionunresolvedcountrInterventionRequiredrr~r)rfr[rulectxstatss r9rzhisteditaction.applychange@syytyy/ WW^^  IIdDJJ44 FTWWdGR8  0$2I2I2KL  ,,./499eDII>N2OO:;  !  s -DDcb|j}||j}|j}t||}|jj ddrt j}n|j}||j|j||j|y)zContinues 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 commitfuncforrOrNr makedater descriptionrr)rfr[rrcommitrs r9rzhisteditaction.continuedirtyOsyytyy/""$tW- 77  j*= >$$&D<<>D$$&--/  r;cy)z1The editor to be used to edit the commit message.Frrs r9rzhisteditaction.commiteditorcsr;c|jd}|j|jjk(r]|jjj t dt|jz||jtfgfS|j|jk(r|gfS||j|jffgfS)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^rOwarnrrtuple)rfrs r9rzhisteditaction.continuecleangsiio 88:11 1 IILL  :;eDII>NN $))UW-.. . 88: "7Ndii#((*/000r;N)rrrrg classmethodrrrrrrrrrrrr;r9rrsH  : 1.7 $  ( 1r;rc:jfd}|S)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. cdi}jj|d5|jdij}j |d<||d<j di|cdddS#1swYyxYw)Nsphasess new-commitr'rhistedit_sourcer)rOrgetcopyrr)kwargs overridesrphaseminr[srcs r9 commitfuncz!commitfuncfor..commitfuncsq/: WW # #I{ ;JJw+002E(+ E$ %#F7O4;;(( < ; ;s A A66A?)phase)r[r r r s`` @r9rrwsyy{H) r;c>|jj|jjk(rL|j5t j |||dt jdddd}ddd|S |jjdd|jddd t j||gd  }|jjdddd |S#1swYSxYw#|jjdddd wxYw) z@Merge changeset from ctx (only) in the current working directoryT)allrNr,s forcemergestoolr;r')salready editedscurrent changesparent of current change)labels) p1rrrr revertmergemod updateresultrO setconfigrgraft)rOr[roptsrs r9rrs vvx}}$--**,,YY[ NN2tSd 3))!Q15E( L! F GG  }dhhw&.filectxfnsj 6>4=DJJLE%%  u}u}!::d+DKr;messageuserdateextraTs histedit.foldediteditform)parentsrfilesr&rrrr)listsetrmutablerrrrrrrr/r pathcopiesr samefilemanifestrrp2getcommiteditorr memctx commitctx)r[firstctxr% commitopts skippromptctxscbaser/rrr&r@rrrr.rnewr#r$s ` @@r9collapserAs 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 (HHc,|djdS)NT)missing)dirtyr[s r9 _isdirtywcrFs :  D  ))r;cTtjtdtd)Ns working copy has pending changessYamend, commit, or revert them and run histedit --continue, or abort with histedit --abortr)r StateErrorrrr;r9 abortdirtyrIs+    -.  :  r;cfd}|S)Nc:rrJd}rtj|nQrtj|n9tdkDrtj|nt j|||_|_|_D] }|t|< |SNrr>) rKaddinternalactionsr7rLrMr~rBr@r?)rr~internalr@priorityrBs r9wrapzaction..wraps8++Qx    t $     % Z!^   &    %  D #K  r;r)rBr@rPrOrQs```` r9rrs& Kr;pickps use commit)rPceZdZfdZxZS)pickcB|j|j}|jj|jjk(r?|jj j dt|jz|gfStt|+S)Nsnode %s unchanged ) r[rrrr^rOdebugrsuperrUr)rfr __class__s r9rzpick.runsu))DII& ::<   $**":": : IILL  5dii8HH IB; T4$&&r;)rrrr __classcell__rYs@r9rUrUs ''r;rUedites4use commit, but allow edits before making new commitceZdZdZdZy)r,cn|j}||j}tj||jj dt |j||itd}tjtdt|jz|t|jz)NTrs9to edit %s, `hg histedit --continue` after making changess6Editing (%s), commit as needed now to split the changer) r[rrrrr^rrOrrrr)rfr[rrs r9rzedit.run,syytyy/ $ 00TBTWWdGR0MN(( G HDII dii((  r;c0tjddS)NTs histedit.editr+r r7rs r9rzedit.commiteditor8&&D;KLLr;N)rrrrrrr;r9r,r,&s  Mr;r,foldfs-use commit, but combine it with the one abovecBeZdZfdZdZdZdZdZdZdZ xZ S)foldcTtt| ||||j}|s||jj }n|j dvry||j}|js8tjtdt|j zy)z.Verifies semantic correctness of the fold rule)rRbaseNr) rXrfrr[rrr~r2rrrr)rfrrrr[r>rYs r9rz fold.verify>s dD x6yyTYY""$A00 TYYAyy{""67%/I r;c|j}||j}t||}|dt|jz|j |j |j y)Nsfold-temp-revision %s)rrrr)r[rrrrrr)rfr[rrs r9rzfold.continuedirtyMsXyytyy/tW-)E$)),<<--/  r;c\|j}|d}||j}|jj}|j|k(rL|jj t dt|jz||j|ffgfS||}|jd|j|jDchc]}|j}}|se|jj t dt|jt|fz||j|jffgfS|j}|j|j|j|j||||j|Scc}w)Nrs%s: empty changeset s (%d::. - %d)sI%s: cannot fold - working copy is not a descendant of previous commit %s ) r[rrr^rOrrrr1rrdiscard finishfold) rfr[rrr^ parentctxr> newcommits middlecommitss r9rzfold.continuecleanYstyy4jtyy/ 00 88: & GGLL34uTYY7GG H$))m%5677 7' XXoy}} P P FFHP   GGLL:#U=%9: ; $))chhj]344 4") chhj) GGT9gsxxz=  # s F)cy)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 r9r<zfold.skippromptxs r;cy)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 r9 mergedescszfold.mergedescss r;cy)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 r9 firstdatezfold.firstdatesr;c tj|ji}|j|d<|j s|j }nWdj |j g|D cgc]} || j c} z|j gzdz}||d<|jr|j|d<n+t|j|j|d<|jddrtj|d<|jj} d|j|jfz| d <| |d <t|j!|j!} d | i} |j"j%| d 5t'||||||j) } ddd |gfStj|| |j+|ff|j+| ff|| ffg}|D]}|j-|| ff|| |fScc} w#1swYxxYw)Nr(s *** r2r'r)rrs%s,%srr*rr')r<)rrrrrrrrCrtrrrNr rrrrr rOrrAr<rrE)rfrOr[roldctxnewnodeinternalchangesr; newmessagerrr rnreichs r9rlzfold.finishfolds6! !hhj 7 *J__&'6EFotAw**,oFG))+,-   ", : >> "%((*Jw "%chhj&++-"@Jw  ==%8 9"*"3"3"5Jw    "%- 6::5%r;rfrhbs:checkout changeset and apply further changesets from therec$eZdZdZdZdZdZy)r?c|jdj|jk7r,tj|j|j|j SNr)r[rr clean_updaterrs r9rzbase.runsI 99T?   !TYY .  ! !$))DII"6 7!!##r;ctyr5)rIrs r9rzbase.continuedirtys r;c(|jd}|gfSrrE)rfbasectxs r9rzbase.continuecleans))D/{r;c|j|vrMtd}tj||jt |jfztdy)Ns.%s "%s" changeset was an edited list candidates&base must only use unlisted changesetsr)rrrrr~r)rfrrrmsgs r9rzbase._verifynodeconstraintssT 99 EFC""tyy% "233@A  !r;N)rrrrrrrrr;r9r?r?s $ r;r?s _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. )rOceZdZdZy) _multifoldcyNTrrs r9r<z_multifold.skippromptr;N)rrrr<rr;r9rrsr;rrollrs9like fold, but discard this commit's description and dateceZdZdZdZdZy)rollupcy)NFrrs r9rrzrollup.mergedescssr;cyrrrs r9r<zrollup.skippromptrr;cyrrrs r9rtzrollup.firstdaterr;N)rrrrrr<rtrr;r9rrs r;rdropdsremove commit from historyceZdZdZy)dropcz|j|jj}||jt fgfSr5)r[rr^rr)rfrms r9rzdrop.runs3IIdjj667 DIIuw/000r;N)rrrrrr;r9rrs1r;rmessms3edit commit message without changing commit contentceZdZdZy)r@c0tjddS)NTs histedit.messr+rars r9rzmessage.commiteditorrbr;N)rrrrrr;r9r@r@ s Mr;r@c|i}tjd|||}|jtdtj|j zt j|||jgfd\}}t j|||}|r|D cgc]} |j| }} tj||||} | jstjtdt!|j#d| j} t%| dkDr-td} td } tj| | || d j'Scc} w) zVutility 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 addbranchrevsrpeerlookuprfindcommonoutgoingrCrrHr0revsr7r)rOr[remoterrr rcheckoutotherroutgoingrootsrrs r9 findoutgoingrs@ |  ' ' T2v FDIIa&''*>*>txx*HHI%%dD4;;2CTJND( GGD$ %E ,01DS C D1++D%UKH   q!9:;; =(*:*:;    2sE.)rRr\rcrrrs^folds^roll)rcr)r>)) )r>r)rrrrr)rr>rrglobal next-action prev-actionquit showpatchhelp) hs KEY_RIGHTrsKEY_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) rrrrrrrrrcttjdtjdtj dS)Nshhr>s )structunpackfcntlioctltermios TIOCGWINSZrr;r9 screen_sizerss& == Aw/A/A7 K LLr;cxeZdZddZdZej eZedZ e jdZ dZ y) histeditrulecX||_||_||_||_||_g|_yr5)rOrrorigpospos conflicts)rfrOrrrs r9rgzhisteditrule.__init__xs,  r;c8d|j|jfzS)Ns%s%s)prefixdescrs r9 __bytes__zhisteditrule.__bytes__s$++tyy111r;c,tj|j|j}|jj dd}|jj }dd|j zjd|jd||fzS)Nrrs#%s %s %d:%s s%drr) ACTION_LABELSrrrrrrljust)rfrhrs r9rzhisteditrule.prefixs} ""4;; < HHLLN1R  HHLLN! T\\ ! ( ( + LLO %   r;ctj|j|jj dd}|r|St j |jjS)Nr'r-)r rrrOrr!rr)rfrs r9rzhisteditrule.descsU(( HHdggnn[2EF  N##DHH$8$8$:;;r;c|j|jkDr|j|jkryt|jj t|jj ztk7r'|j j ||j S||j vr|j j||j Sr5)rrr1rr/rrEremove)rfrs r9checkconflictszhisteditrule.checkconflictss 99txx EMMT\\$A599??$%DHHNN,<(==F%%e,~~% DNN " NN ! !% (~~r;N)rR)rrrrgrr strmethod__str__propertyrr propertycacherrrr;r9rrwsQ 2!h  +G     < <r;rclg}|D],}|jd|j|jfz.|S)z[Returns a list of commands consumable by histedit --commands based on our list of ruless%s %s )rErr)r}commandss r9 makecommandsrs6H ellEII%>>? Or;c|j\}}|dz |z }t|j|d|}|dkr||z}|dkr||z}|r|j||||y|j|||y)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 r9addlnrsJD$ AX\F ;  V $Wf -D1u 1H1u 1H  1au% 1ar;c:t||kr|Sd||dz dzS)Ns> rr6rrzs r9 _trunc_headrs* 4yA~ 4!a% # ##r;c8t||kr|S|d|dz dzS)Nrs >r6rs r9 _trunc_tailrs' 4yA~ !a%=5  r;c|eZdZdZdZdZdZdZdZdZ ddZ d Z d Z d Z d Zd ZdZdZdZddZdZy)_chistedit_statec||_||_||_|jj dd|_d|_d|_ttf|_ d|_ tdditddii|_ y)Nr'r.r line_offset)r[r}stdscrrOrN later_on_toprselected MODE_INITmode page_height MODE_RULES MODE_PATCHmodes)rfr[r}r s r9rgz_chistedit_state.__init__s     GG.. /    *      r;c |j|j|j}|j}|j |j \}}|dz }d|j |jddfz}|jdd|d|d|jz}|jdd|d||jj|j}dd j|z}|jdd|d|d tj|j!z}|jd d|d|d }|jd d|dt#|z} || z dz} d } |d| zz dz } |j%} t'| D]s\}}t#| | kDr>|| dz k(r6|j| | t)dj| |d| | dz} n$|j| | t+|| | dz} u|j,}t#|dkDr"djt/d|}d|z}nd}|j| d|d||j1y)zSRenders the commit window that shows the log of the current selected commitrschangeset: %d:%sNrr>s user: %srs bookmark: %srs summary: %srs files: r,rc<|jjddS)Nr)rr)rs r9r:z0_chistedit_state.render_commit.. s!%%))+cr2Br;schanged files overlap with %ss no overlap)r}display_pos_to_rule_posrrboxrrrrrr[ nodebookmarksrrCr!rrr7r/ enumeraterrrmap noutrefresh)rfrrrrrrrbmsfnxfnmaxxrfnmaxnr/rline1r conflictstrs r9 render_commitz_chistedit_state.render_commitsFzz$66txx@Ahh  \\^ d"cggi3B%@@ 1agv'#((*, 1agv'ii%%chhj1$))C.0 1agv'*"6"6s7H"II 1agv' 1a#d)m#! Q!# !%(HAu5zF"qFQJ 1c;tyyqr/CV#LME JJq#{5&9 :AA )NN y>A ))C(BI$NOK:[HK'K 1aWf-. r;c|jdtk(rd}|jSd}|jr|dz }|jS|dz }|jS)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. )rrr  splitlines)rfhelps r9 helplinesz_chistedit_state.helplines(sn 99Q<: %D  D   II  II  r;c |j\}}t|jD]2\}}||k\rn(t||d|t j t 4|jyNr)rrr'rcurses color_pair COLOR_HELPr)rfrrrrrs r9 render_helpz_chistedit_state.render_help:s\\\^ d !12GAtDy #q!T6#4#4Z#@ A3 r;c|jj\}}t|j}||z dz }|dkr.t j t d||fzt dd|f||f||fdS)Nrr>s:terminal dimensions %d by %d too small for curses histedits7enlarge your terminal or use --config ui.interface=textr)commitrmain)r rr7r'rAbortr)rfrrhelplenmainlens r9layoutz_chistedit_state.layoutBs[[))+ ddnn&'.2% Q;++OP,N Dzt_t_  r;cT|jrt|jdz |z S|S)a/Converts 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 r7r})rf display_poss r9rz(_chistedit_state.display_pos_to_rule_posTs+   tzz?Q&4 4 r;c |jtd}|jDcgc]}|js|j}}t |dkDrRddj ttj|z}t|dd|tjtt|t |jD]}||z }|dks||jk\r|j!|}|j|} t | jdkDr,|j#|ddtjtn"|j#|ddtj$||j&k(r-t(} t||d| tjt*na||j,k(r>t.} t||d| tjt0tj2znt4} t||d| | j6dk(sR|j#|dt | j8z| j:tj| |j=ycc}w) Nr rspotential conflict in %srrrrr)rrr}rrr7rCrrbytestrrr*r+ COLOR_WARNrrrr COLOR_BLACKr COLOR_ROLL_SELECTEDCOLOR_SELECTEDrCOLOR_ROLL_CURRENT COLOR_CURRENTA_BOLD COLOR_ROLLrrrr) rfrulesscrstartrrrr6rrule_posr rollcolors r9 render_rulesz_chistedit_state.render_rulesas :&~6$(JJ>Jq!++QUUJ > y>A .H$$i02D (B4):)::)F G DJJ8Ke#A1uT---33K@H::h'D4>>"Q&1dF,=,=j,IJ1dF,>,>?dmm+/ h1dF,=,=n,MN(. %%m4v}}D ' h1d+{{g%DKK((II%%i0 99F U?s I3I3c f|j\}}t|dz t|}td|D]}||}|r|j dr,|j |d|t jtG|j dr,|j |d|t jt|j dr,|j |d|t jt|j |d||j |d||jy)Nr>r+-s@@ ) rminr7rrxrr*r+COLOR_DIFF_ADD_LINECOLOR_DIFF_DEL_LINECOLOR_DIFF_OFFSETr) rfroutput diffcolorsrrrrrs r9 render_stringz_chistedit_state.render_strings\\^ dTAXs6{+q&!A!9D??4(JJ1dF$5$56I$J__T*JJ1dF$5$56I$J__V,JJq!T6+<+<=N+OPJJq!T* 1a&!"" r;c|jtd}|jtd}|j|||ddy)Nr  patchcontentsT)rN)rrrO)rfrrBcontents r9 render_patchz_chistedit_state.render_patchsD :&~6**Z()9: 3DAr;c|j}tjdfvrtS}dcxkrdkrnnd}|j\}}t |j |t dj |}|y|dvr\t|dzt|jdz }|j|||j|dk(r|j||yy|d vrFtd |dz }|j|||j|d k(r|j||yy|d k(r|j|d y|dk(r|j|dy|dk(r1|j|nd|_ |j|jy|dk(rt!t|jcxkrdkrgnndt#fd|jD}|j||j|j|j||jyy|j%dr|j'||ddy|dk(r&|j)|t*k7r t*y|y|dk(r&|j)|t,k7r t,y|y|dk(rt.S|dk(rt0S|dk(rt2S|dk(rt4S|dk(rt6S|dk(rt8Sy)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)nextrFrrrc3TK|]}|jtk(s|!ywr5)rr)rrchs r9rz)_chistedit_state.event..s!Jz!QYY#b'5IAzs((saction-rrrrr'rrrr)rr* KEY_RESIZEE_RESIZErKEYTABLErrIr7r} move_cursorr swapr cycle_actionmake_selectionrrVrx change_action change_moder MODE_HELPE_QUIT E_HISTEDIT E_PAGEDOWNE_PAGEUP E_LINEDOWNE_LINEUP) rfrXoldpos lookup_chcurmodeprevmodernewposnewrules ` r9eventz_chistedit_state.events  &##]3 3O >db0D0I II'"&& x *..y9  >  , ,!S_q%89F   VV ,}}(Fl,B &&)-C * *FQJ'F   VV ,}}(Fj,@ &&)-A ~ %   f4  0 ~ %   f5  1 y &*mm&;FDM    . w 3r7S_#B#BJtzzJKG   VW[[ 1}}( &'++.)   z *   vvabz 2 | #   7j+@Z Oh O w    'Y*>Y MH M w M { "  | #  z !O | #  z !O"r;c|j}|j|j|j}t j |j |dddd}ddi}|j j|d5|j|j|jddd|j|jjjS#1swY>xYw)NTsstatus)spatchstemplate)buffered)r,sverboser')source)r[r}rrrchangesetdisplayerrOrshowrrhunkrr%)rfr[r displayerrs r9patch_contentsz_chistedit_state.patch_contentssyyzz$66txx@A11 GG ) 4  )$/ WW # #Ik # B NN488 $ OO C~~dhhlln-88::C Bs <,C%%C.c ||_|j\}}|tk(rN|jt}||dkr||d<n-||d|jzdz kDr||jz dz|d<d|jt d<y)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)rrrrrr)rfrirmrr modestates r9r\z_chistedit_state.move_cursors))a :  :.I .11,2 .))N3d6F6FFJJ,2T5E5E,E,I .)23 :~.r;c|j\}}||f|_|tk(r%|j|jtd<yy)NrQ)rrrwr)rfrrkrs r9raz_chistedit_state.change_mode sDYY 7O : 7;7J7J7LDJJz "#3 4 r;c||_yr5)r )rfrs r9r_z_chistedit_state.make_selections  r;c|j|}|j|}|j}d|cxkrt|krnJd|cxkrt|ksJJ||||c||<||<|||_|||_t ||}t ||}t ||dzD]0}||j||||j||2|jr|j|yy)zWSwap two positions and calculate necessary conflicts in O(|newpos-oldpos|) timerr>N) rr}r7rrIrrrr r_) rfrirm old_rule_pos new_rule_posr}rBendrs r9r]z_chistedit_state.swaps33F; 33F;  L-3u:-PP!|2Pc%j2PPP2PPP ,  ,  1lU<0 #/l".lL,/, -ucAg&A ,  . .uQx 8 ,  . .uQx 8' ==    ' r;crd|cxkrt|jksJJ||j|_y)z?Change the action state on the given position to the new actionrN)r7r}r)rfrrs r9r`z_chistedit_state.change_action/s3C)#djj/)))))!' 3r;c&d|cxkrt|jksJJ|j|j}|tvsJtj |}|r|dz }n|dz}|j |t|ttzy)zUChanges the action state the next or the previous action from the action listrr>N)r7r}rKEY_LISTrr`)rfrrVcurrentrs r9r^z_chistedit_state.cycle_action4sC)#djj/)))))**S/((("""w'  QJE QJE 3X)> ?@r;c|j\}}|tk7ry|j|}t|d}|j}|dk(r|nd}d|dz |zz}|dz |z} |d||zz} t dt | | |d<y)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'.NrQpager>r r)rrrr7rrrI) rfdeltaunitrr mode_state num_linesr num_pages max_offsetnewlines r9 change_viewz_chistedit_state.change_viewCs))a :  ZZ%  #345 && "go{1Q;66 !m{2 ^,ut|;%(C G,D%E >"r;NF)rrrrgr#r'r-r4rrErOrSrorwr\rar_r]r`r^rrr;r9rrsc 6/b!$ $ -^,B <| ;3&M (6( A Fr;rc tjtjttj tj tjttjtj tjttjtjtjttjtjtjttj tjtjttjdtjt tj"dtjt$tjdtjt&tj"dtjt(tjtjtjt*tj"tj  tj,dd}t/|||}d}|j1|j3 |j4\}}|t6k(r|j9t:|j=|}|t>k(ry|t@k(r |jBS|tDk(r/tG} | |jIk7rtjJ| |jM} |j4\} }| |k7r3| dd|_'|jQ|jR|jRd\} } || d| | \}} } || d| | \}} } || d| | \}} } |tTtVtXtZfvro|tTk(r|j]d d nS|tVk(r|j]dd n7|tXk(r|j]d d n|tZk(r|j]dd |j_|j_|j_| t`k(r|jc|n^| tdk(r3|jg|thjkjmn"|jo||jq||js|tjttwjx|j{}#tj$rY"wxYw#tj$rYwxYw) NrrcXtj|d|d||}||dz }|||fSrL)r*newwin)sizerrrs r9 drawvertwinz#_chisteditmain..drawvertwinns7mmDGT!Wa3 T!W Aqyr;Fr0)rrrr/r>rsline)>r*use_default_colorsr init_pairr, COLOR_WHITE COLOR_BLUEr<r:r9 COLOR_YELLOWCOLOR_OK COLOR_GREENr> COLOR_MAGENTArJrK COLOR_REDrLr@r=r;curs_setrrrefreshrrrarrorcrdr}rZrr resizetermr4rr\rrerfrgrhreraserrSrbrO__doc__rr%rEr#r-doupdater strtolocalgetkey)r[r}r rrrXoldmodeunusedersizesrkrrhelpwinmainwin commitwins r9_chisteditmainrSs !!#  Z!3!3V5F5FG ^V%7%79K9KL Z!3!3V5H5HI Xv1163E3EF ]F$6$68L8LM (&*<*|| } dddtj@tjB d ur|jEtd y tG| turu|jItd tK| } |jMdd5}| D]} |jE| |jN|d<dddtQ||||S y#1swYxYw#1swY%xYw#tR$rYywxYw)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 requiredrkrevr>/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)*r*rr1r _colormoderr checkunfinished bailifchangedrFr desthisteditrEr7 InputErrorr0r1rrevrangerrrbetweenrrrr with_lc_ctypewrapper functoolspartialrechoendwinrtyperrrwname _texthisteditKeyboardInterrupt)rOr[freeargsrr\r defaultrevrrrootr]r}rrrcr|s r9 _chisteditrs ~kk!=>??BM4 xx xx#A&%d# H!..r48J% J' t9>""DE $((=**=*=dD*IJ K r7a<""/  !uzz|--""$tT7D1""?@5;N dODAq LLb$q'15 6$    ! 1 1.$ NOB"   ; HHQ,- . 8t  IIa/0 1 $E,."AHHQK$&GG[!/!T8T: :  #" !/.    sJGL //K5AL -AL 5(LL 5K>:L L L LLr;rs*read history edits from the specified filesFILErcontinues$continue an edit already in progress edit-plansedit remaining actions listrks,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])) helpcategoryctj|}|jddk(r t|tk(rt ||||St ||||S)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'scurses)r byteskwargs interface_getgoalgoalnewrr)rOr[rrs r9histeditrsUF    %D  ||K I-(4.G2K"dHd33 T8T 22r;c t|}|j5}|j5}||_||_t|||||ddddddy#1swYxYw#1swYyxYwr5)rWr`r_ _histedit)rOr[rrrr`r_s r9rrsR $ E  t  "dE8T2!, s"A(A A(A% !A((A1snewc|jdrtS|jdrtS|jdrtStS)Nrr edit_plan)r goalcontinue goalabort goaleditplanr)rs r9rrs= xx  xx xx  Nr;c|dk(r5|jd5|jjcdddSt|d5}|jcdddS#1swYyxYw#1swYyxYw)NrHr'srb)timeblockedsectionfinrtr)rOr rs r9 _readfilers] t|  " "; /66;;=0 /$ !668 0 / sA!A-!A*-A6ct|dd}|r*|jrtjt d|j d}|j d} |j d} |j d} | r |stj t d|dk(r0t|| |||| frtj t d y|dk(r/t||||| frtj t d y|d k(r-t|||frtj t d y|rM|rtj t d t|dkDrtj t dy|j|t|dk(r)tj||} | |j| t|dk7rtj t dy)Nmqssource has mq patches appliedrrrrs$--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) rappliedrrHrrranyr7rFr rrE) rOr[rrgoalr}rroutgeditplanabortrrs r9 _validateargsrs tT "B bjjq!ABCC 88K Dxx %H HHX E HHX E Tq!HIJJ { eT8UH= >""1%L#MN N ?   dHeX6 7""1%I#JK K 8   dH% &""FG  ' &&=>8}q &&GH! KK !4yA~%222t< )KK +4yA~&&HIr;c |jd|}|jt|}|jdg}|j dd }|jdd} |jdd|_t |||||| |d} |r`tj||}|D cgc]} ||  } } | D]3} | jDcgc] }|d k7s | }}| r)t|} 5| r:|jtd d rtjtd |tk(r|j!t#|||}nA|t$k(rt'|||| y|t(k(rt+||||yt-||||||t/|||t1|||||j3ycc} wcc}w)Nr'rr backup-bundlerr;rkFstips{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 startitemrrrNr\rrrtagsr7 promptchoicerr CanceledErrorrrtbootstrapcontinuer_edithisteditplanr_aborthistedit _newhistedit_continuehistedit_finishhisteditr)rOr[rrrfmrrrr}hastagsrr=rtagrs r9rrs k4 (BLLN D>D 88FB D==-=>>H HH[# &E'5)EJ"dHdD%>G ""4.%)*TcS T*C#&88:?:CC:D?d) ?? @    %%a(?&@A A | !"eT2  "dE51  r4: RudHd;b$&BeR(FFH?+?s+ G GGc0|jdd}tt||dddgzD]C\}\}}|jdk(s|s|jdk(s,t|j|_E|j d}|jddr|jd}|jtdtdt|j}|5tj|5|jr|j | |jd } |j| j |j!d | j| jfz| j#\} } | j%|_|j(j+| |jj-d |jrdddddd|j y#1swY"xYw#1swY&xYw) zThis function runs after either: - bootstrapcontinue (if the goal is 'continue') - _newhistedit (if the goal is 'new') Nr>rcr'r+seditingschanges)rtotal)rr)itemshistedit: processing %s %s )rIrzipr~rrYrrN transaction makeprogressrr7racceptintervention incrementrrWrrr^rerFpop) rOr[rrIidxrnextactrprogressactobjrm replacement_s r9rrsmmAG"+Cv9M,N"O fg ;;' !g',,'2I+5EMM#  (#P  KKM B }}["67  k * * AjMU]]1CH 4**2.mm KK2K ]]1%F   FMMO  4 HH/6;; 2PP '-jjl #I|"+.."2E     % %l 3 MM  a mm/ KKM/.s%"H 8C&HH H H  Hctj||jt|\}}}}|r|j D]\}} | s|j dt |z&|j dt |t | dfzt| dkDs`d} | ddD]} |j | t | z!|js|rt||j|ni}|D] } | |vsd|| <|jjjj|j D cic]$\} } | rtfd| Dr| | &}} } t!j"||d |j$}|j&}|j(}||j D cic]*\}}||||D cgc] } ||  c} d ,c} }}d d }|j+||j-t.j0j3|j5dr$t/j6|j5d|j8j3dr|j8j7dyycc} } wcc} wcc} }}w)z7This action runs when histedit is finishing its sessionshistedit: %s is dropped shistedit: %s is replaced by %s rr>s'histedit: %sNrc3.K|] }|ywr5rrrzhas_nodes r9rz"_finishhistedit..Ss6Aqx{Asr'snode)rsoldnodesnewnodes)r=value) nodechangessundohistedit-last-edit.txt)rrr^processreplacementitemsrWrr7r\movetopmostbookmarksr] unfiltered changelogrrrr cleanupnodeshexfunc formatlist formatdictrsrosr rosjoinrrw)rOr[rrmappingtmpnodescreatedntmprecsuccsmrzkr8hfflfdoldnnewnrrs @r9rr0sd OOD,,-.&8&?#GXw"==?KD%5d CD7T{E%(O45u:>BA"12YU1X.'+ ::  u}}c :  9GAJ  **0099HMMO#DAq A;36A66 1#   w 4 B B B&mmo - d tHb.A"Q%.W= =-   KGG G$ KKM ww~~djj)* $**W%& xx01 122-/ s )J/J: J5, J: 5J: c  |jt|\}}}}|jdt|jz|j|vr|j r|j j|j }tj||}tj|||} |jd5} tj|| | dd|zdddtj ||j#j%d|j&||zr#tj(||jddt+|||| t+||||  |j5y#1swYxYw#t,$r,|j/r|j1t3d wxYw#|j5wxYw) Nsrestore wc to old parent %s shistedit.abortr'sbundle:)rrurlsparents() and (%n or %ln::)T) show_statsrrsrwarning: encountered an exception during histedit --abort; the repository may not have been completely cleaned up )rtrrWrr]rarwrCropenpathr readbundlerr applybundlerrrrr^clean cleanupnode Exceptionrrrr) rOr[rr__leafsrrargenrs r9rrjs) "4U";E8R 1E%--4HHI}}$)9)9u'7'78J B +A%%b!Z8C!!"34##&"Z/ 5 IIj ! ??  ! ! +    H  HHT5==Td KBh:Beh7  ?54(       GG$     s1CFF$B FF F5GGGct|}|jdd }|j5}|j5}||_||_t ||||ddddddy#1swYxYw#1swYyxYw)Nrrr)rWrNr`r_r)rOr[rrr`r_s r9hgaborthisteditr8sd $ E==-=>>H  t  r4:!, s#A;A/A;/A8 4A;;Bc|j|sLt|t|jt|j}t |||j |}n t||}t||}|j Dcgc]}|js||j }}t|||||||_|jycc}wr5) rtrUrr^r] ruleeditorrIrrrrwarnverifyactionsr)rOr[rr}commentrIactr=s r9rrs JJL  e))*E%--,@ 4U]]G<"e$&G&+mm @mssxxDNmD @b$5EM KKM As CCc |jd}|jdd}|jd}tj|tj||jj } |r|r|d} nd} t ||| ||} nnt|jdtj||} t| dk7rtjtd| dj} t!|| | |j"}|s*tjtd t%| z|D cgc]} ||  }} |d}|d g}|dj g|zD] } t'j(||||d d d d "|sGt/|t%| t%| }|D cgc]} t1|| }} t3||||}n t5||}t7||}t9||||||| j j}||_||_| |_g|_ |jCddt|t|d}tEjF|tDjHstKjL||g| g| d}||_'ycc} w#tj*$r"tj,td |zwxYwcc} w)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 rrrrrr0r1rrr7rrrrrr\rrcalculateupdatesr1rHrUrUr:rrrr;r^rIr]relogr isenabledcreatemarkersoptr backupbundlera)rOr[rrrrrr}rr]rrrrr=wctxancsr>r<rIr^ras r9rrs 88K D HH[# &E HHX E D! $mm G a[FFBfeT: $((=**=*=dD*IJ K r7a<""/  !uzz| 4w 3D  ; 404Wg6"e$&Gb$5JMMO((*M'EEMEMEFF# G  \  J   dH$=$= >(( =/G9dK "E} #2{{ ""U  1s J;?KK85K5cHtj|jSr5)r!rr)rs r9 _getsummaryrK s    1 22r;c|j}tjj|}t j ||j r|j jd}t|r%|jt|r t|j\}}|j|_ |jj||Sr))r[ mergestatemodrrtrcheckunresolvedrIrrFrrIrrr^rerF)rOrrr[msr rmres r9rr s ::D  ! ! & &t ,B b! }}""1% d   "$ "("6"6"8 <'nn. !!,/ Lr;c|jd||}|rI|sGtj||d|jd|rtjt dt j|jj|S)zoselect and validate the set of revision to edit When keep is false, the specified set can't have children.s%n::%nr\s(%ld) and merge()s(cannot edit history that contains merges) rrprecheckrrHrrmaplistrr)r[oldr@r\rs r9rr+ sw 99YS )D DT41 99)4 0""=>    DNN// 66r;c|jjddrBtj}|D]}||j}t |}|j dddj}d} |jdr|dd }|ttztzvr||_ |t|dzdj} tt!|j#D]9\} } || j} t | }|| k(s&d } | j%|n| rg||<g}|j#D]\} } |j%| || z }d j'|Dcgc]}|j)c}}|d z }||z }|j+||j-d di|j.d}|j1dd5}|j3|ddd|Scc}w#1swY|SxYw)zeopen an editor to edit rules rules are in the format [ [act, ctx], ...] like in state.rules r#r$rr>rF!NrTr2s sprefixr')repopathrrswb)rOrNrsortdictrrKrAlowerendswithrKrLrMr~r7lstripreversedr0rrErCrr,usernamer rwr)r[rOrI editcommentnewactr=rrfwordaddedtsumnarTactxasumr}rs r9r:r:9 s  ww/+?@Csxx.C!#&GMM$*1-335EE~~d#cr N-==OO$CH"3u:>#34;;=D"*$v||~*>!?A#BGG}*404<$(EHHSM! "@ s 16\\^EB NN2  qLG$ JJ8 8 9E WE [E GG  K   E +U 3q  4 L#9 4 Ls/G5G::Hcd|jDDcgc]}|r|jds|}}g}|D]}d|vr!tjt d|z|j dd\}}|t vr!tjt d|zt |j||}|j||Scc}w)z@Read the histedit rules string and return list of action objectsc3<K|]}|jywr5)rrs r9rzparserules..x s8%7!'')%7s#rsmalformed line "%s"r>sunknown action "%s") r%rxrrrrAr?rrE)r}rrTrIrr~rrs r9rrrrt s9U%5%5%78 8A Q\\$' 8   G  q=""1%;#rrrrrCrzdropss r9riri s#''$Q$H' 5D D71:??&88 5 6 H   dHd+ ;; " HHV[[ !  X_%G zz}} ^< w<1 ""&'?@  *11AeQ1  / 053D D0GAJ     7(.2s FFctj|tjs|S|j}|jj j }|j}t|}|Dcgc]}|d }}tj|}t|} | r| j} || du} |jj| d} | r| s|j| df| D]H} | d}|j| |f|D])}||vs|j|| j|+J| r|Scc}w)a Adjust replacements from obsolescence markers Replacements structure is originally generated based on histedit's state and does not account for changes that are not recorded there. This function fixes that by adding data read from obsolescence markersr>Nr)rrErFrrrget_revobsstorer0r1unionr successorsrrErM)r[oldreplacementsunfirmrnnewreplacementsroldsuccs seensuccs succstocheckrzrCmarkersmarkernsuccsnsuccs r9adjustreplacementsfrommarkersr{ s=   dH$=$= > ?? Dnn""**G}}H?+O-.o!oH. I ?L     !*$%%))!R0 7  " "Ar7 +FAYF  " "Av; / )MM%( ''.   +/s2 Ect|j|j}t}t}i}|D]Y}|j |d|j |d|j |dtj |d[||z }||z}t|}i} |rnt|D]]} || } t| D]2} | |vr| | vs| j| | j | | 4| | | <|j| _|rn|D]} | | =|jjjj}| jD]\}} t| || |<|r/t||jjjd}n^| sd}nY|jjj}|jt| |djj!}| |||fS)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)r{r[rer1rrM setdefaultr0rrrrmrrDrrr)rreallsuccsreplaced fullmappingrepr@r toproceedfinalrr#srzrmr" newtopmostrs r9rr s 1U=O=OPLuHuHKA SVs1vsu-44SV< X C("HK I E iANE%[ >%ZLLOLLq*!!a  #!   !Hjj""((00G{{} eU0d % CUZZ%9%9%=%=>rB   JJ $ $ZZu! 4Q 78;;=BBD (C ++r;cB|r|sy|j|}|ro|j5|jd5}|j}g}|D]}|j ||f|j |||ddddddyy#1swYxYw#1swYyxYw)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')rr_r _bookmarksrEr)r[ oldtopmostr oldbmarksrmarkschangesrs r9rr( s Z"":.I YY[$**;72OOEG!j12"   tR 1 8[[77[[s"B.F s7%Q8A;q%s r)backupN) r_rrrrrDr1rrr)rOr[nodesrr>rrrs @r9r2r2: s  >>''007%77#'88M5#AB#Aa#AB !\F LLT5 8 C sAB0+B+ B0+B00B9ct|tr|g}t|}|jr|j |j Dchc]}|j s|j }}|t|z} | r7tjtddjd| Dz||||g|i|Scc}w)Ns$histedit in progress, can't strip %sr3c32K|]}t|ywr5)r)rrs r9rzstripwrapper..Z s<|!U1X|r) isinstancerrWrrtrIrr1rr1rrC) origrOr[nodelistargsrrrhistedit_nodes common_nodess r9 stripwrapperrM s(E": $ E  &+mm &3Fv{{FKKm  &H 5 ++9:**<|<<=  D( 4T 4V 44 s CCsstripct|}|jsy|j|jrM|j t d|j t ddt|jzzyy)Ns!hist: %s (histedit --continue) s %d remainingshistedit.remaining)rWrrtrIrrlabelr7)rOr[rs r9 summaryhookrb so $ E     JJL }}  3 4?+-BCemm$%  r;ctjjdtt j ddddt y)Nr'rZT)fname allowcommit continueflag abortfunc)r summaryhooksrMrrb addunfinishedr8)rOs r9extsetuprr s5 [+6 ! r;r)FF)NFNr5)r;)rrr ImportErrorrrrrzrmercurial.i18nrmercurial.pycompatrrmercurial.noderrr mercurialr r r r r rrrrrrrrrrrMrrrrrrrrrbrmercurial.utilsr r!r"cmdtablecommand configtable configitem testedwithr?r1rKrLrMrNrUrWrrrrArFrIrrUr,rfr?rrrr@rr*rrr,r<rr9r>rJrKrLr@r=r;rcrdrerfrhrgrZrrrrbr[rrrrrrrrr formatteroptsCATEGORY_CHANGE_MANAGEMENTrrrrrrrrrrrrrr8rrrKrrr:rrr;rir{rrr2r wrapfunctionrrrr;r9rsxx   2  )  H % !Y ! !+ .                    ;+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<<~  $ ! uFuFp \6~AH     ; < gJ   {E1%L#MN lE1%C#DE    = >  hq!=>? {E1%K#LM    ? @  vr1;O?P  P