OHndZddlZddlZddlZddlZddlmZddlmZm Z m Z m Z ddl m Z mZmZddlmZmZmZmZmZmZmZmZmZmZmZmZmZm Z m!Z!m"Z"m#Z#m$Z$m%Z%m&Z'ddl(m)Z)m*Z*m+Z+ejXZ,dd ded fgZ-iZ.ej^e.Z/d Z0iZ1ejde1Z2e2d d de2d dde2d dde2d dd ejfde#jFZ#d dZ7e%jpZ9GddZ:gdZ;ddddZGd!d"Z?d#Z@Gd$d%ejZBGd&d'ZCd(ZDe/d)d*d+ded,fd-d.ged/ed0fged1e/j2d3ZFe/d4d5d6ded7fge-zed8e/j2d d9ZGe/d:d5d;ded<fge-zed=e/j2d d>ZHe/d?d@dAdedBfdCdDdedEedFfdGdHdedIfd-d.gedJed0fdKd dedLfdMdNdedOfgedPe/j2dQZJdRZKe/dSdTdUdedVfgedWe/jdXYdZZMe/d[dd\ded]fd^d_ded`fddadedbfdcdddedeedffgejzedge/jdXhd diZOe/djejdkdedle/jdXmdnZRe/dodpdqdedrfge-zedse/j2dtZSe/due-edve/j2dwZTe/dxe-edye/j2dzZUe/d{e-ed|e/j2d}ZVd~ZWe/dd@ddedfdGdHdedfdKd dedLfd^ddedfdddededfdddedfdddededfgejzejzede/jdXdXdZZe/dd@ddedfdKd dedLfdddedfd^ddedfdddededfdddedfdddededfgejzejzede/jdXdXdZ[e/dejejzejzede/jdXdXdZ_e/dd@ddedfd*d+dedfgejzede/j2dZae/ddddedfdGdHdedfdddedfgede/j2dZbe/ddddedfdCddedfgede/j2dZce/dgede/j2d dZddZedZfe/ddddedfdGdHdedfd@ddedfdddedfdddedfdpddedfdCdDded«edFfdddedīfdddedfg edūe/jdXYd dƄZge/ddddedȫfdCdDdedɫedFfdddedfdGdHdedʫfdddedfged˫e/jdXYd d̄Zhe/dgedΫe/j2d dτZie/ddddedҫfdddedԫfgedիe/j2dքZje/ddTdded٫fdCdDdedګedFfd@ddedܫfdGdHdedݫfgejzedޫe/j2d߄Zke/ddCddedfdddedfdddedfdddedfgede/j2dZle/ddddedfgede/j2dZme/ddddedfdddedfdTddedfdddedfdddedfdddedfgede/j2d dZndZodZpdZqdZrdZsdZtejZueuddZvevgZwdZxddddd d d d Zyy#e4$r'GddZ5ejle5ddYLwxYw( a manage a stack of patches This extension lets you work with a stack of patches in a Mercurial repository. It manages two stacks of patches - all known patches, and applied patches (subset of known patches). Known patches are represented as patch files in the .hg/patches directory. Applied patches are both patch files and changesets. Common tasks (use :hg:`help COMMAND` for more details):: create new patch qnew import existing patch qimport print patch series qseries print applied patches qapplied add known patch to applied stack qpush remove patch from applied stack qpop refresh contents of top applied patch qrefresh By default, mq will automatically use git patches when required to avoid losing file mode changes, copy records, binary files or empty files creations or deletions. This behavior can be configured with:: [mq] git = auto/keep/yes/no If set to 'keep', mq will obey the [diff] section configuration while preserving existing git patches upon qrefresh. If set to 'yes' or 'no', mq will override the [diff] section and always generate git or regular patches, possibly losing data in the second case. It may be desirable for mq changesets to be kept in the secret phase (see :hg:`help phases`), which can be enabled with the following setting:: [mq] secret = True You will by default be managing a patch queue named "patches". You can create other, independent patch queues with the :hg:`qqueue` command. If the working directory contains uncommitted files, qpush, qpop and qgoto abort immediately. If -f/--force is used, the changes are discarded. Setting:: [mq] keepchanges = True make them behave as if --keep-changes were passed, and non-conflicting local changes will be tolerated and preserved. If incompatible options such as -f/--force or --exact are passed, this setting is ignored. This extension used to provide a strip command. This command now lives in the strip extension. N_)binhexnullrevshort)delattrgetattropen)cmdutilcommandsencodingerror extensionshg localrepolock logcmdutilpatchphasespycompat registrar revsetlangscmutilsmartsetstrip subrepoutilutilvfs)dateutil stringutilurlutilssummarys print first line of patch headersships-with-hg-coremqgitauto)default keepchangesFplainsecretsstripceZdZdZdZy)dummyuicyN)selfmsgs ,usr/lib/python3.12/site-packages/hgext/mq.pydebugz dummyui.debug cyr/r0)r1eventmsgfmtmsgargsoptss r3logz dummyui.logr5r6N)__name__ __module__ __qualname__r4r<r0r6r3r-r-s   r6r-r6c6g}|d}|r||}n|j}t|jD]a}|j|j d||jvs |j|j sQ|j |c|S)zrreturn list of subrepos at a different revision than substate. Abort if any subrepos have uncommitted changes.NT)p1sortedsubstatesub bailifchangeddirtyappend)repobaserevinclsubswctxbctxss r3 checksubstaterNsH :DG}wwy DMM "  !!$' DMM !TXXa[%6%6%8 OOA # Or6c`eZdZdZdZej eZej eZy) statusentryc"||c|_|_yr/)nodename)r1rRrSs r3__init__zstatusentry.__init__s#T 49r6cLt|jdz|jzS)N:)rrRrSr1s r3 __bytes__zstatusentry.__bytes__s499~$tyy00r6N) r=r>r?rTrXr strmethod__str____repr__r0r6r3rPrPs2*1!h  +G!x!!),Hr6rP)# User # Date s# # Branch # Node ID # Parent )sfromdatessubjectc|jddz}tj|}t|}t|t|D]t}||}|j dst ||}nPt tD]<\}} |j | s||k(r||z||<|ccS||kDr t ||}tv|j|||z|S)aAssuming lines contains a HG patch header, add a header line with value. >>> try: inserthgheader([], b'# Date ', b'z') ... except ValueError as inst: print("oops") oops >>> inserthgheader([b'# HG changeset patch'], b'# Date ', b'z') ['# HG changeset patch', '# Date z'] >>> inserthgheader([b'# HG changeset patch', b''], b'# Date ', b'z') ['# HG changeset patch', '# Date z', ''] >>> inserthgheader([b'# HG changeset patch', b'# User y'], b'# Date ', b'z') ['# HG changeset patch', '# User y', '# Date z'] >>> inserthgheader([b'# HG changeset patch', b'# Date x', b'# User y'], ... b'# User ', b'z') ['# HG changeset patch', '# Date x', '# User z'] >>> inserthgheader([b'# HG changeset patch', b'# Date y'], b'# Date ', b'z') ['# HG changeset patch', '# Date z'] >>> inserthgheader([b'# HG changeset patch', b'', b'# Date y'], ... b'# Date ', b'z') ['# HG changeset patch', '# Date z', '', '# Date y'] >>> inserthgheader([b'# HG changeset patch', b'# Parent y'], ... b'# Date ', b'z') ['# HG changeset patch', '# Date z', '# Parent y'] # HG changeset patchra# )index HGHEADERSlenrange startswithmin enumerateinsert) linesheadervaluestartnewindexbestposiline lineindexhs r3inserthgheaderrys. KK/ 01 4Ev&H%jG 5#e* %Qxu%'1oG %i0LIqq!(%~E!H Lx'!'1oG1 & LL&5.) Lr6ct|j}t|}t|D]\}}d|vrl|j dddj j}tj ||dz}||k(rd||fz||<|cS||kDsm||kss|}v|r|j|d||kr|}n|j|d||fz|S)aFor lines containing a plain patch header, add a header line with value. >>> insertplainheader([], b'Date', b'z') ['Date: z'] >>> insertplainheader([b''], b'Date', b'z') ['Date: z', ''] >>> insertplainheader([b'x'], b'Date', b'z') ['Date: z', '', 'x'] >>> insertplainheader([b'From: y', b'x'], b'Date', b'z') ['From: y', 'Date: z', '', 'x'] >>> insertplainheader([b' date : x', b' from : y', b''], b'From', b'z') [' date : x', 'From: z', ''] >>> insertplainheader([b'', b'Date: y'], b'Date', b'z') ['Date: z', '', 'Date: y'] >>> insertplainheader([b'foo: bar', b'DATE: z', b'x'], b'From', b'y') ['From: y', 'foo: bar', 'DATE: z', '', 'x'] rVrar%s: %sr6) PLAINHEADERSlowerrirmsplitrgetrn) rorprqnewpriortrurvlheaderlprios r3insertplainheaderrs"6<<>*G%jGU#4 4<jjq)!,224::.eatdiff(sA"ILL+||I.||N3b r6c@|r|djs|d=ny|ryy)Nr)r)ros r3eatemptyz&patchheader.__init__..eatempty4s"Ry(b  r6rsrb diff --gits+++ rbs--- rashgpatchr\r]s # Parent r^r_ rfrestagdones Subject: subject: stagFrom: sfrom: Date: sdate: r6c3dK|](}|jdxs|jd*yw)rrNr).0cs r3 z'patchheader.__init__..s2&A Y'B1<< +BB&s.0)r rstriprklstriprGri diffstartlinernmessagecommentsuserdateparentnodeidbranchhaspatchany plainmode)r1pfrrrrrrrrformatsubjectrr diffstartrvs r3rTzpatchheader.__init__'s   UOD;;=D}-doog6 Iw' :%??:.8D__Z08D__\2!!"X__.F__\2!!"XF__]3!"#YF/DNN4(!F00#:% -1Nqr(:% *dooi.HABx:% *dooi.HABx6!dck$Dt$ OOD !e$h !] f''/G NN1g &        !A   &dmm; r6c t|jd|||_y#t$rI|jrt |jd|ndd|zg}||jz|_Y||_ywxYw)Nr\sFromre)ryr ValueErrorrrr)r1rtmps r3setuserzpatchheader.setusero 4 4==*d ;  4~~!$--$?. T0AB #dmm 3   4!AA32A3c t|jd|||_y#t$rI|jrt |jd|ndd|zg}||jz|_Y||_ywxYw)Nr]sDatere)ryrrrrr)r1rrs r3setdatezpatchheader.setdaterrc t|jd|||_y#t$r1|jsdd|zg}||jz|_Y||_ywxYw)Nr`re)ryrrrr)r1rrs r3 setparentzpatchheader.setparents_ 4 4==- @   4>>. 0FG #dmm 3   4s!0AAc |jr|j|g|_|r^|jr6|jr*|jdr|jj d|jj |yy)Nrr6)r_delmsgrrrG)r1rs r3 setmessagezpatchheader.setmessages_ == LLNy ~~$--DMM"4E $$S) MM  ) r6cddj|jj}|sy|dzS)N r6s )joinrr)r1rMs r3rXzpatchheader.__bytes__s- JJt}} % , , .7{r6c|jrd|jdjz}tt|jD]E}||j|jk(s$|j|=|jdd|_nd}|jD]9}||j|k7r|dz }||j|k7r|j|=;y)zRemove existing message, keeping the rest of the comments fields. If comments contains 'subject: ', message will prepend the field and a blank line.rrrbNra)rr}rjrir)r1subjrucimis r3rzpatchheader._delmsgs <<$,,q/"7"7"99D3t}}-.4==+1133 a(#'<<#3DL / ,,B b))a b)) b!r6NF) r=r>r?rTrrrrrXrrYrZrr0r6r3rr&s;o b  * !h  +G"r6rcV|j}|,|jjddrtj}ddi}|||d<|jj |d5|jj ddd|j|i|cdddS#1swYyxYw) zhelper dedicated to ensure a commit respect mq.secret setting It should be used instead of repo.commit inside the mq source for operation creating new changeset. Nr%r+)uiallowemptycommitT)sphasess new-commitrr) unfilteredui configboolrsecretconfigoverride setconfigcommit)rHphaseargskwargs overridess r3 newcommitrs ?? D } 77  eY /MME-t4I 05 ,-    5 1 %!4d;t{{D+F+ 2 1 1s &/BB(c eZdZy)AbortNoCleanupN)r=r>r?r0r6r3rrsr6rceZdZddZdZdZd>dZ d?dZdZddZ#dZ$d Z%d!Z&d"Z'd#Z(dAd$Z)d%Z*d&Z+d>d'Z,d(Z-d)Z.d*Z/d+Z0d>d,Z1 dBd-Z2 dCd.Z3d/Z4dd1Z6dd5Z:dEd6Z;dd9Z>d:Z? dFd;Z@y)GqueueNcl||_ ttjj |dd5}|j j }ddds!tjj |d}n#tjj |d|z}|xs||_tj|j|_ ||_ ||_ d|_ d|_g|_d|_d|_d|_d|_d|_|j+d d j-}t/j0|} | | rd }nd }||_|j5d d |_d|_y#1swY)xYw#t$r$tjj |d}YwxYw)N patches.queuerbpatchespatches-Fseriesstatusguardsr%r&yesnor*T)basepathr ospathrreadrIOErrorvfsmodropenerrbaseui applieddirty seriesdirtyadded seriespath statuspath guardspath activeguards guardsdirtyconfigr}r! parseboolgitmoderr checkapplied) r1rrrpatchdirfhcurcurpathrboolmodes r3rTzqueue.__init__sn  5bggll4)9:DARggi&&(B'',,tZ8'',,t[3->?' jj+  !  ###  ))E6*002''0    uh7 ABA 5ggll44G 5s)*FE9AF9F>F)F32F3cfd} jjjj}t ||S#t $rgcYSwxYw)Nc3,K|D]}|jdd}t|dkDr|\}}tt||@|j sQj j tdtj|zyw)NrVrasmalformated mq status line: %s ) r~rirPrrrwarnrr!pprint)rorentrynrSr1s r3 parselinesz!queue.applied..parseliness{a(u:>#GAt%c!fd33WWYGGLL=>$++E23 s AB=B)rrr splitlineslistFileNotFoundError)r1rros` r3appliedz queue.appliedsR  KK$$T__5@@BE 5)* *  I sAA AAc |jj|jjS#t$rgcYSwxYwr/)rrrrrrWs r3 fullserieszqueue.fullseries+s= ;;##DOO4??A A  I s25 AAc:|j|jSr/) parseseriesseriesrWs r3rz queue.series2s {{r6c:|j|jSr/)r seriesguardsrWs r3rzqueue.seriesguards7s    r6cdjD]}||jvst||d|_d|_d|_d|_y)Nz&applied fullseries series seriesguardsF)r~__dict__r rrrr)r1as r3 invalidatezqueue.invalidate<sN9??AADMM!a B"   r6cdtj|j|d| | }|jdk(rd|_n^|jdk(rnN|jdvr|jdk(|_n+t jtd|jz|r|j||}|S)zReturn diff options tweaked for this mq use, possibly upgrading to git format, and possibly plain and without lossy options.T)git whitespaceformatchangingr'keep)rrrs,mq.git option can be auto/keep/yes/no got %s) patchmoddifffeatureoptsrrupgrader rAbortr patchopts)r1r;patchfnplaindiffoptss r3rzqueue.diffoptsEs++ GG  y$9   <<7 "#H  \\W $  \\_ ,<<61HL++AB,,  ~~h8Hr6c|j}|jsO|jdk(r@|D];}|j|d}t d|D|_|j =|S)zReturn a copy of input diff options with git set to true if referenced patch is a git patch and should be preserved as such. rrc3>K|]}|jdyw)rNr)rrvs r3rz"queue.patchopts..gs#?EtDOOM2vs)copyr rrrclose)r1rpatchesrpatchfs r3rzqueue.patchopts^sf==?||  7"Wd3"#?E#    #r6cVtjj|jg|Sr/)rrr)r1ps r3rz queue.joinmsww||DII***r6cbfd}t|jD]\}}||s|cSy)NcT|jddd}|jk(S)N#rar)r~r)rrs r3 matchpatchz$queue.findseries..matchpatchqs)a #A779% %r6)rmr)r1rr%rgrs ` r3 findserieszqueue.findseriesps2 &"$//2HE1!} 3r6s'\s?#([-+][^-+# \t\r\n\f][^# \t\r\n\f]*)cg|_g|_|jD]}|jd}|dk(r|}d}n|dk(r$|d|}||d}|j }|sA||jvr ""5)!!(()>)>w)GH%!r6c|s tdSd}|d}|dvrtd||fzS|D]}||vstd||fzcSy)Nsguard cannot be an empty strings# r-+s*guard %r starts with invalid character: %rs!invalid character in guard %r: %rr)r1guard bad_charsfirstrs r3 checkguardzqueue.checkguardsm78 8! a E>BCG AEz=>%KKr6c|D]*}|j|}|stj|tt |}|j j ddj|z||_d|_ y)Nsactive guards: %s  T) r1rrrBsetrr4rrr)r1guardsr.bads r3 setactivezqueue.setactiveskE//%(Ckk#&&F $  ,tyy/@@A"r6c|jg|_ |jj|jj }t |D]q\}}|j|}|r>|jjd|j|j|dz|fzW|jj|s|jS#t $rg}YwxYw)Ns %s:%d: %s ra) rrrrr~rrmr1rrrrG)r1r5rur.r6s r3activez queue.actives    $ "D  ))$//:@@B&f-5ooe,GGLL&99T__5q1ucBC %%,,U3.   %  s3C C! C!c|D]}t|dkr!tjtd|z|ddvr!tjtd|z|j |dd}|sqtj||j j d|j|}|dj|Dcgc]}d|z c}z|j|<|jd |_ ycc}w) Nrbsguard %r too shortrr-s!guard %r starts with invalid charrar6 #T) rirrrr1r)rDrrrr)r1idxr5gr6drops r3 setguardszqueue.setguardssA1vzkk!$9":Q">??t5 kk!$H"IA"MNN//!AB%(Ckk#&&}}  dooc&:;#chh6/J6a 6/J&KK 0Ks C= c dt|tr|jj|}|j|}|sy|j }|Dcgc]}|j ds|dd|vs| }}|rdtj|dfS|Dcgc]}|j ds|}}|Dcgc] }|dd|vs |}}|rP|rdtj|dfSddj|Dcgc]}tj|c}fSy cc}wcc}wcc}wcc}w) N)TN-raFr+Tr3)Tr6) isinstancebytesrrgrr9rkr!rr) r1r< patchguardsr5r=exactnegposexactposr!s r3pushablezqueue.pushables6 c5 !++##C(C'', " "!all4&8QqrUf_A{   *++HQK88 8%<+Qd);q+<"6s!aevoAs6 Z..x{;;;$))3$G3aZ%6%6q%93$GHH H =6%Hs0D)D1DD#.D#8 D(D(9D- c|r|jj}n|jj}|s|jjrt |t r|j j|}|j|\}}|rm|rk|"|td|j |znG|s"|td|j |zn#|td|j ||fz|sH|r$|td|j ||fzy|td|j |zyyy)Ns"allowing %s - no guards in effect s*allowing %s - no matching negative guards sallowing %s - guarded by %s sskipping %s - guarded by %s s!skipping %s - no matching guards ) rwriterverboserCrDrrgrIr)r1r< all_patchesrKrIwhys r3explainpushablezqueue.explainpushables5 GGMMEGGLLE $''//#u%kk'', MM#.MHcx;@A++c*+ LM"kk#./ >?#{{3/56:;;;s+S12 ?@++c*++*r6cfd}jr2|ttjjd_j r$|j jd_jr$|jjd_jr~jrdj5jj5dj!fdjDddddddg_ yy#1swYxYw#1swYxYw)Ncj|d}|D]}|jd|z|jy)Nswb%s )rrKr)itemsrfprur1s r3 writelistz"queue.savedirty..writelists6T5)B1% HHJr6Fc32K|]}|dvs |ywr/r0)rfqrepos r3rz"queue.savedirty..s $#-a%+1E:s )rmaprDrrrrrrrrrrXwlockdirstatechanging_filesadd)r1rUrXs` @r3 savedirtyzqueue.savedirtys     c%. @ %D     doot 7$D     d'' 9$D  ::JJLE[[]ENN$A$A%$H$KOO$#'::$%I]DJ %I$H]]s$D=0(D1D=1D: 6D==Ec2|jd}tjj|sy tj|y#t $rD}|j jtdtj|zYd}~yd}~wwxYw)Nsundoserror removing undo: %s ) sjoinrrexistsunlinkOSErrorrrrr! forcebytestr)r1rHundoinsts r3 removeundozqueue.removeundosqzz'"ww~~d#   IIdO  GGLL./*2I2I$2OO   sA B:BBct|D]}|j|}tjj |s4t j |j||}|jjtd|tjj|fz|rtj||tj||y)Ns#saving current version of %s as %s )rBwjoinrrlexistsr backuppathrnoterrelpathrcopyfilerename)r1rHfilesrrWabsfabsorigs r3backupz queue.backup*sA::a=Dwwt$!,,TWWdA> =>"''//'234 MM$0KKg.r6c |i}|jd} tj||||} tj|j ||||||| || | y)Nsstat)rrmatchrdiffordiffstatr) r1rHrnode1node2rprTchangesr;statms r3 printdiffzqueue.printdiff:sg <Dxx  MM$u+ud 3!! GG   K K    r6c|j||gdd|\}}|dk(r||fS|!tjtd|z|jj td|zt j||t|j||gdd||} t j| d} | r!tjtd | zt|d| j| jd }|tjtd  t|j||j} |j#||}|j%|d } t'| } | r| j)| |j+||||| | j-|j/|d|fS#t $r"tjtd |zwxYw)NFT) update_statusstrictmergersapply failed for patch %ss"patch didn't work out, merging %s updaters)remindsupdate returned %dforcerepo commit failedsunable to read %sw)rT)applyrrrrrrcleanrrr descriptionrrrr ExceptionrrrDrKr|rrg)r1rHmergeqheadrrevrerrrctxretphrrs r3mergeonezqueue.mergeoneUs:: 5't3 a !88O 9++a <=EF F  Q=>FG t dggtaSu=3ihhs5) ++a 56<= = dD#//"3SXXZt L 9++a 567 7 ?V[[/@B>>(E2UD)9  LL " tXtQ6:  1v  ?++a 45=> > ?s +%G +G8cf|T|jj\}}||jk(r|S|jsy|jdjS|j j|\}}||jk7r(||jDcgc]}|jc}vr|S|Scc}w)areturn the mq handled parent or p1 In some case where mq get himself in being the parent of a merge the appropriate parent may be p2. (eg: an in progress merge started with mq disabled) If no parent are managed by mq, p1 is returned. Nr)r[parentsnullidrrR changelog)r1rHrrAp2xs r3qparentszqueue.qparents}s ;}},,.HRT[[  <<<<#(( ('',B   'E 1 'E!EI (FsB.c |jsNd}t|ddd}|j||jjt ||d|_|j |}|D]}|j|d}|s)|jjtd|zy|j|\} } | s|j|dk|j|} | s)|jjtd |zy| d } |j||||| |\} }|r,|jjt ||d|_| s| |fcS|jd |fS) Ns.hg.patches.merge.markers[mq]: merge markerTrrspatch %s does not exist )raNrMspatch %s is not applied rar)rrrgrGrPrrlookuprrrrIrO isappliedrr^)r1rHrrrpnamerrrrIreasoninforrs r3 mergepatchzqueue.mergepatchsb||0E$&;4HA OOD ! LL   Au 5 6 $D }}T"EMM%M5E Q;>yD$u+t, , / GGLL006> ?77?? QMNO GG   4;. .  /s2? C%BC C% C%c :dx} x} } |j} |j} |jd} |j||||||||| |  }| j |j |t | | | |j|S#t$r"| j |j  | j|j#|jwxYwxYw#t | | | |j|wxYw)Nqpush all_filestobackup keepchanges) rZr transaction_applyrr^releasergrabortr )r1rHrrr~rrrrrrrZrtrrs r3rz queue.applys!  r "JJLE99;D!!(+B kk!'% +"    Be $ OOD !"    &HHJOO%OO% Be $ OOD !s41C:||xsg}|j@jC}tE|d||jF|jH|d} |j@jC|k(rtKjLt d| tKjLt d|r%|jNjtQ| | |r+|jjt dd} | | fS|sl|sp|jjt dd} | | fS| | fS#t$r0|jjt d| zd} Y| | fSwxYw#1swYxYw)zreturns (error, hash) error = 1 for unable to read, 2 for patch failed, 3 for patch fuzz. tobackup is None or a set of files to backup before they are modified by a patch. rNTrs applying %s sunable to read %s rasimported patch %s s imported patch %srsconflicting local changes foundsdid you forget to qrefresh?hint)rspatch %s is empty  p1_tracked .hgsubstate.F)rurs(qpush exactly duplicates child changesetsrepository commit faileds0patch failed, rejects left in working directory rbs)fuzz found when applying patch, stopping ))rrIrOrstatusrrrrrrrrrGrr changedfilesr4rrsrrr[changing_parentsupdate_file_p1rA setparentsrsubmergekeysr matchfilesrtiprrrrrrrP)r1rHrrr~rrrrrrrr patchnamerIrrrrtouchedpatcherrrprrWrArKpctx overwritemergedsubstateruoldtips r3rz queue._applys(yyH I#}}Y7 Hf$$YD$A GGNN1-.: ;h 2B  9!5t~~F jjG09<NN#9I#EF**W-{{&33DGGT2FG!'lX5G;,@A!"#A!BKKgDK9''1H*.**T2*>'5$($$U+'< Q56BC()2q%]]33D9" 44Q44H#))+BOOB. : ^y8DzDz! !,!5!5$dI",,..&&tU[b9E^^'')FdGRWWbggU$A~~!!#v-kkABykk!$?"@AA ##K9$=> JK Qx  QLMNQxo nQx[  Q56BCTQx[ H:9s %N5AO152O.-O.1O; c |s|j}|rQ|j5|jj|5|dj |dddddd|D]'} t j |j|)g}|r%|jd|}|jd|=d|_ g}g}|D]<}|j|} | |jd|f*|j| |f>|jd|D])\} }| dk7r|j| =|j|+|r|rc|D cic]} | j| j } } |D]9}t#d |j$j' t)| ||fz;n8t#d t+j,dj fd|D|j/d|_|D cgc]} | j c} S#1swYxYw#1swYxYw#t$rYwxYwcc} wcc} w)NTrreverses*revision %s refers to unknown patches: %s sunknown patches: %s r6c3(K|] }|z ywr/r0)rr!r2s r3rz!queue._cleanup..s*DGq37Gs)rXrZr[r\forgetrrbrrrrr&rGsortrrSrRrrrrrrrr)r1rnumrevskeeprr! qfinishedunknown sortedseriesr<rurrr2s @r3_cleanupzqueue._cleanupjs  AWWY 9 9! <dGNN7+!=YIIdiil+   Xg.I XgX& $D  A//!$C{##RG,##S!H-  $' DAqBwOOA&q! ! ;DE9%uzz5::-9E AJKCGGLLc!f q'9!9:!01kk#((*DG*D"DEE (12 u 22W!= 9 21s C33C<c|s/|jdstjtdg}|D]}|j |d}|j |}|r!tjtd|z||j vr!tjtd|z||vs~|j|d}|jdr|jstjtdtj||jd}|j|j||} || z }t| }|j|||jd y) Nrevs4qdelete requires at least one revision or patch nameTrscannot delete applied patch %sspatch %s not in series filerno patches appliedr)rrrrrrrrGrrrevrangerrrir) r1rHrr; realpatchesrrrr revpatchess r3deletez queue.deletesEtxx/++IJ  EKKdK3E>>%(Dkk!$E"F"NOODKK'kk!$B"Ce"KLLK'""5) 88F <<kk!$9":;;&&tTXXf-=>D IIK))$5J : %K*oG k7DHHW,=>r6c|jrq|jdj}|jdj}|jj |k7rt j td||fSy)z'check that working directory is at qtiprs&working directory revision is not qtipNN)rrRrSr[rArrr)r1rHtoprs r3 checktoppatchzqueue.checktoppatchsh <<,,r"''CLL$))E}}!S(kk!$M"NOO: r6c`t|tr|dd}n#|j|j|jf}t d|Dry|js |j s|djdy|jr|djdy|djdy)Nrc3$K|]}d|v yw)rNr0)rrps r3rz,queue.putsubstate2changes..s9SE%'Ssrarrbr)rCrmodifiedrremovedr any_trackedrG)r1 substatestaterymars r3putsubstate2changeszqueue.putsubstate2changess gt $"1+C##W]]GOODC 9S9 :    m&?&? FMM. )  " " FMM. ) FMM. )r6cd}|rd}tdtd|j}|stj||js$|j s|j s |jr,tdtjtd|zt|r,tdtjtd|z|Stj|d|S) Nr6s, qrefresh first#local changes found, qrefresh firsts,local changed subrepos found, qrefresh firstslocal changes foundslocal changed subrepos foundT) skipmerge) rrr checkunfinishedrrrdeletedrrrN)r1rHrrefresh excsuffixrMs r3checklocalchangeszqueue.checklocalchangess +I 4 5 = > KKM  # #D )zzQWW QYY()kk!$:Y$F"GHHT"12kk5 AB   # #DD 9r6)rrrrs..c||jvr!tjtd|z||j k7rtjtddD]4}|j |stjtd|zdD]:}||vstjtdt j|zy)Ns*"%s" cannot be used as the name of a patchs.patch name cannot begin or end with whitespace).hgs.mqs!patch name cannot begin with "%s")r$rV rs(%r cannot be used in the name of a patch) _reservedrrrrrkrbytestr)r1rSprefixrs r3checkreservednamezqueue.checkreservednames 4>> !++?@4G  4::< ++CD 'Fv&kk:;fD' ,ADykkAB&&q)*,r6ch|j||stjj|j |rptjj |j |r!t jtd|zt jtd|zyy)Ns""%s" already exists as a directoryspatch "%s" already exists) r rrrarisdirrrr)r1rSrs r3checkpatchnamezqueue.checkpatchname%s t$ $8ww}}TYYt_-kk;|j@fzd}~wwxYw#1swY|xYw#1swYxYw#|jxYw#t$r_|jY|} tj|#t$r*|jjt1d!|zYwxYwwxYw#1swYyxYw)"zToptions: msg: a string or a no-argument function returning a string msgediteditformsmq.qnewuserrcr&Trs checknamersincludesexcludecB|dk7rtjd||fzy)Nrr{)rr)rWr2s r3badfnzqueue.new..badfn`s'&++i1c(&:;;'r6N)rrurrascannot manage merge changesetsrscannot write patch "%s": %sreditformc,|jr|SSr/)r)desc defaultmsgs r3 finishdesczqueue.new..finishdescs;;=#'K#--r6+Leave message empty to use default message.r%extramsgr!rureditorr%d %dr6)rwrxryr;serror unlinking %s )Ir byteskwargsrr parsedaterr rNr[ get_entryrrurrrextendrrrrrirrrrr fullseriesendrZrrr strtolocalstrerrorr getcommiteditorrrrrGrPrrrrrrrrrrrArRrrrrKrDrrrdiffrrXr\r]rollbackrrrbrcrrrg)!r1rHrpatsr;r2editr!rrrrJrrrury commitfilesrnr!er*r%r( commitmsgrnctxrrchunkschunkr patchpathr$s! @r3newz queue.newLs ##D)hhvxx 88K4xx xx  %%d+D==&$((6*:!;4=H 88L$ '    ( &  MM33NCM 88J 488J#74 <MM$t*dDFEkkk.G,,T,>G8n 7++,7==)7??+""45 tDz!!# $q (++a ABC C 4 ##% ZZ\ KK. O (72  00(C. !!OPH$44#-!)!)F !$I # 1zI! 9++a(=&>??&6=YDOOF62LL'' Aw(?@$$&'+D$(,D%7D$TYYw%7HB 4( 8d?3LLTWWY^^%5!67**,224Cj..00!MM#&GGE"I&"!%tQ!7# 44]GL!) "("#$+!) "&,EGGEN&,GGI AWWY (A(A!(DdGKK 2)EY OOD !s\ kk45 3 3AJJ ?@A R)E(DYYMMO  IIg. IIIi(IGGLL#:!;i!GHI  e\s<W>S5BU4GUU5U UUW5 U>AT>>UWU UU UU11U44WV%$W%0WWWWWW(ct|jD]/\}}|j|k(s||j|jfcSy)zreturns (index, rev, patch)N)rmrrSrR)r1rrur s r3rzqueue.isapplieds>dll+DAqvv166166**,r6cfd}|jvr|Stjjj |sM t |}t j |cxkrt jkrnnj|S|s||}|r|S|jd}|dk\rX||d|}|rKjj|} t ||dzdxsd}||z dk\rj||z S|jd} | dk\rk||d| }|r^jj|} t || dzdxsd}||zt jkrj||zStjtd|z#ttf$rY0wxYw#ttf$rYwxYw#ttf$rY]wxYw)Nc|jvr|SjDcgc] }||vs| }}t|dkDrMjjt d|z|D] }jjd|z"y|r|dSjrFj r:|dk(r!jj ddz S|dk(rjdSycc}w)Nraspatch name "%s" is ambiguous: s %s rqtipTqbase)rrirrrr seriesend)rMrmatchesr{r1s r3 partialnamez!queue.lookup..partialnamesDKK"&++8+Qaq+G87|a QABQFG AGGLLQ/!qz!{{t||<;;t~~d';a'?@@=;;q>)9s C%C%rArrarBspatch %s not in series)rrrisfilerintrir OverflowErrorrfindrgrrr) r1rrrGsnoresminusruoffpluss ` r3rz queue.lookups $ DKK Lww~~dii./ ,%j $$>c$++.>>;;s++!%(J D)A:%eFUm4C KK--c2<"%eEAIK&8&=A">C !3w!|'+{{1s7'; ;{{4(19%eETl3C KK--c2<"%eD1HJ&7&<1"=C !3wT[[)99'+{{1s7'; ;kk!56>??E .  "!+M:! !!+M:! !s6 F4#G G4GG GGG10G1c |j| ||j} |j5g} |jj D]} | j | | s |j g} |jj| vr&|s$|jjtd|js.|jjtd dddy|r%|j|}|j|}|rO|dt!|j"dz k\r1|jjtd|z dddy|j%|\}}|rM|jj'||j)krt+j,td|z|rtd|z}n td}|jjtd ||fz dddy|rN|jd }|j|r.|jjtd  dddy|j)}|t!|jk(r.|jjtd  dddy|s| s|j/||j" |r| rt+j,td|rt+j,td|j"rt+j,td|j|}t1|j3||j4j6}|s!t+j,td|z|||dk(st9j:|||r |st+j,tdt=|j>D]6\}}|j@jC|dd|j|k(s6nt=|j>dD])\}}|j@jC|dd|k(s)n|z}|t!|j>ksJ|j>|}|j>|=|j>jE|||jGd|_$d|_%|dkDr|jM||s|j|}|dz}n|jj'||dz}tO}| s|s| r|j/|d}| rC|j;|jP|jRz|jTz|jVzn(|j;|jP|jRz|j||}tO} |r|jY|||| }n|j[|||||| }|j"s|dcdddS|j"d jf} |dr2|ddkDr*td}!|jji|!| zn'|jjitd| z|dcdddS#t\$r|jjtdt_j`|j||dd|D].}||jvs|jbje|d0|jjtdxYw#1swYyxYw)Ns"(working directory not at a head) sno patches in series rras qpush: %s is already at the top s#cannot push to a previous patch: %ss guarded by %ssno matching guardsscannot push '%s' - %s rs"all patches are currently applied s#patch series already fully applied )rs.cannot use --exact and --keep-changes togethers&cannot use --exact and --move togethers(cannot push --exact with applied patchess"%s does not have a parent recordedrs please specify the patch to moveTrrs!cleaning up working directory... ) no_backup ignoremissingsdone s0errors during apply, please fix and qrefresh %s now at: %s )5rrrZ branchmap iterheadsr/rr[rArrrrrrrrirrIrgrErrrrrrrrrrmrr)r~rnrrrrr4rrrrrrrr revertwvfs unlinkpathrSrK)"r1rHrrrrallmoveexactnobackuprrheadshsrrIrrrroottarget fullstartrpnrurg fullpatchendrrrMrrrWrr2s" r3pushz queue.pushs} k51==? ZZ\Enn&002 R 3 }}!.uq!GHI;; Q89:\" E*~~e,DGs4<<'81'<<GGLL>?%G1\4$(==#7 &{{((/$..2BB#kkDEM!"#3!4v!=!"#8!9GGLL45GQ\R B>>%(GGLL#I!JK[\hNN$EDKK(( QFGHo\p&&tT\\&B++KL++CD<<++EF{{5)$TYYt_dnnELL++?@4GF|tDz1IIdF+++a(K&LMM&/&@NIs}}**3215U9KK'A( (CDFAs}}**3215>E"A s4??3333 OOE2 OOE*&&y)<  "#' $D qy""4( E*aikk''u59uH;//D/AOO ,,' ..)!..)OOFOOfll$BC E#&AI //$8DC**"+!)$/ %C4<<1vw\x,,r"''C1v#a&1*LM cCi( a0367q6E\P"   QDEFGGJ" #A - ,,Qd,C# Qy\*q\sdB9]/5A-]/+B)]/A]/-A ]/E<]/A]/E-]/2.Z? ]/:A;]/?A(],(A],,]//]8c H |j|||j5|rX|j|}|s|j|}|j|}|s!t j t d|z|js0|jjt d| cdddS|rd} n#|r ddz} nt|jdz } | t|jk\r1|jjt d|z dddy|sp|jj|jD cgc]} | j} } D]-} | | vs|jjt dd}/nP|djD cgc]} | jc} tfd|j| dD}t} |r|j!||xs| }|r+|sm| j#|j$|j&znD|rB| j#|j$|j&z|j(z|j*zd|_t|j}|j| j} |j.j1|}||jd jgk7rt j t d ||jd jj7s)t j t d t d|r|j9||}||}|j;|d}|j$|j&|j(|j*f\}}}}|rt j t dt||z|z| z} |r | rt j t d|j=|| |jj?|5|D]=}|j@jC|d|jjE|dd?||zD]T}||}|jG||jI|jK|jjE|ddV|jM||jNdddtQ|j| |D]3}|jj;t d|jRz5|j| |=tU|j||gdd|djVjYD](\}}|dj[|j]|*|jr?|jj_t d|jd jRzn$|jj_t ddddycc} wcc} w#tj2$r-t5|}t j t d |zwxYw#1swYxYw#1swYyxYw)Nspatch %s is not appliedno patches applied rrasqpop: %s is already at the top sqpop: forcing dirstate update Tc3:K|]}|jvywr/)rR)rrrs r3rzqueue.pop..s7KeEJJ')7Ksrstrying to pop unknown node %srs?popping would remove a revision not managed by this patch queues&popping would remove a public revision see 'hg help phases' for detailsrrs!deletions found between repo revsrrSFr wc_trackeds popping %s rrUspatch queue now empty )0rrZrrrrrrrrrir[rrRrr4rrrrrrrrr_ LookupErrorrmutablerrrsrrYrZ update_filewwritedataflagsrrreversedrSrrCrSrDrrK)r1rHrrrr[r^rrrrrrrr!rrMrfrr_rRqprstr{r rdrWfctxstaters @r3popz queue.pops k51 ZZ\~~e, KK.E~~e,++a(B&Ce&KLL<< Q678w\ Q! DLL)A-DLL)) QBCeKL3\6--//1&*ll3laffl3 ABw Q'I%JK!%! .2$Z-?-?-AB-A1668-AB7;||EF7KuH**4u7K *L#  QWW(<= OO QWW,qyy8199D!%D dll#C,,u%**C N,,S1 b)..//kk7  R(--.668kk?@>?]]4-2h[[T*[["((BJJ J 1a++a(L&MNNq1uqy>H48++a(N&OPP D(+]]33D9 ,,Qd,C 11%E2 U"1v Atyy{DJJLA 11$42# OOB 4:"$,,uS"9:q1EJJ>?; U3Y' $''4#uU C J//5575T q!%%e,8|| a04<<3C3H3HHI a :;<]\:4 C,$$ NSzkk!$D"E"LMM N>:9q\srB Z;A(Z,*ZX>) Z5>Z3Y C-Z8YE0ZB;Z >D7Z> ZAZZ Z ZZ!c$|j|\}}|s%|jjtdy|j ||}|j drd|}}n|d}}|j ||} |j|| ||||y)Nrisreverse)rpr;)rrrKrrrrr|) r1rHr6r;rrrvrwrxrs r3r4z queue.diffDs''- U GGMM!34 5  ]]4 % 88J 5Et5E==u- tXue4dKr6c H>?tj|}|js%|jj t dy|j ddj}|j d}|j dd}|j d}|j d }|rd tj|z}|j} |j||jd j|jd j} } |jj| | gk7rt!j"t d || j%s)t!j"t d t d|jj'| } |j)|| } t+|| }|r|j,j/d}t1|j3| |j4?|j7d|j di| d}|r?j9||r?j;|?j=t?| |jA| dd}|jC| | }|jD|jF|jH}}}|| }|dd}tKjL|d||}|j drHtKjN|||z|z|jQz}tKjL|d|}ntKjR|}|jC|}|jD|jF|jH|jTf\}}}}tW|}tW|}tW|}|D]}||vs|jY||D]:}||vr#|j[||jY|*|jY|<g} ||zD]K}||vr#|j[|| j]|*|j_||jY|Mta|}ta|}ta|}|jC| |}|jD|jF|jH|jTf\}!}"}#}$tW|!|"z|#z|$z}%|||fDcgc]}|jc|%}&}tW|}'|&D]}|'je|tKjN||'}|| jg}(|j,ji|5|jjs |jlri})|D]l}*|j,jo|*}+|+/|+|j,vr!|)jq|+gj]|*|j,js|*ddn|D]h}*||*ju}+|+rI|)jq|+gjw|)j |*g|*|vr|)|+j]|*|*|)vsf|)|*=j|)jyD](\}+},|,D]}*|j,j{|+|* *ni|D] }*|j,js|*dd"ta|j,j}D]}-|j,j{d|- |D]}-|j,j|-d!g}tt|dz d d D]%}.|||.r|j]||.||.='|D]}-|j,j|-d!|D]}-|j,j|-d!| D]}-|j,j|-d!?jxs|j}/|| j}0|j| |j,j |j|jjd|_Gt|j|| gddddd d| z>tj|}1|rI>?fd}2t d }3tj|2|3|!}1|xsd"j3?j}4n@|s+?js>}4n/d"j3?j}4n|}4?j|dx}5}6 |j}5|jd#}6t|0|4/?j|d|1$}7|&Dcgc] }ta|}8}|r|j|8tj|| |8|%}9t?}:|:r|j |:|9D]};|j |;|j|j}<|.finishdescs#;;=MM$/#'K))r6r&r'rr%r))ryr;rsNqrefresh interrupted while patch was popped! (revert --all, qpush to recover) )`rr,rrrKrrrr r-rZrrRrSrr_rrrorrrNr[r.rrrrrrrrrrrrrrrurrpmatchallrr4r]removerGdiscardr intersectionr bookmarksrr rcopied setdefaultrp copysourcer/rSrcopiesrrjrirrrcurrenttransactionr{rrr r3rrrrrrrrr4rDr _bookmarks applychangesrPlockmodrrebuildmanifestr^rrg)@r1rHr6r;r2r7r!newusernewdaterZrrcparents patchparentrJrrrrwmmaaddraaamatch1rustbr{r rrxrrcmcacrcd allmatchesrefreshchangesrpbmlistrdstsrcdstsrWruroldphaser*r%r(rrrrrr<rr=marksbmr$rs@ @@r3rz queue.refreshQs ##D)|| GGMM!34 5hhvs#**,xx 88K8((7#((7# !3!3G!<? ~~--c2H--c2K$T;7H $ 7 7 G TYYw/@B}}&)*G4%H 7# 7# LL[) *[[$4[@F[#.Bbhh BBs)CQ%C]]4:tT:Fxx! **4b2 1NO tDz=((.++E+*Csyy#++s{{JJAq!QRBRBRB B;FF1I 7IIaLFF1IFF1I FU7IIaLMM!$JJqMq RARARA[7B[["((BJJ JNBBR"Wr\B./JCEr2,O,QannZ8,NOME# Q$&&tU3E#Y((*F//5<<8#3#3F "mm2237?sdmm/C"--c26==cB 11Ed2 ! #!#h113"--c26== & 3 3 #ax &s 2 23 7&= &s  #&,\\^ T#'C MM..sC8$(&4 ! 11Ed2 ! "$--"6"6"89 **43:AMM00t0Ds1vz2r2A!!A$< !A$aD3AMM00t0DAMM00t0DAMM00u0E ww,#((*9??, * ##D$;$;$=>   "$(!dggtcU5Gy6|N )72  00(C* !!OPH$44#-!)!)F ";UZZ %;G::","'**RZZ"8!GMM#&! r!.99;D))%0B! #"% A+99.Qa.A900B%]]k18F %RyH X.!' U+"(LLN OOE&&tRF1KFb2q'F1KLHHJLL'' Aw(?@OOB- MMO OOD !qP65Z:2L OOB- ]]33D9x{+CMM))#((*cllnE:99  >  MMO OOD !sK'm>D)m>*jA)m>+C4j! C7j!D*j!m> B*k6Aj88j. Bj8 j3 '!j+&m>. j88kkm;0Al:1 m;:m ?>#n!c"|sGtjj|jrtjt d tj |j|r|jdSy#t$r|sY#wxYw)Ns$patch queue directory already existsTcreate) rrr rrrmkdirFileExistsErrorrX)r1rHrs r3initz queue.init[sy"''-- 2++a GHI I  HHTYY  ::T:* *   s A?? B Bc|r/||jvr!tjtd|z|s|j }n|jj |dz}g}t |t|jD]I}|j|\}}|r |j||j|f|j|K|S)Npatch %s is not in series filera) rrrrrErgrjrirIrGrO)r1rHrrr unappliedrurIrs r3rzqueue.unappliedfs U$++-++a ABUJK KNN$EKK%%e,q0E uc$++./A#}}Q/ Hf  !T[[^!45   # 0 r6cfd}jDchc]}|j} }|tj|z }|sjj rtd||zdz z} t |||zD]m} j| } | | vrd\} }nj| drd\} }nd\} }d}jj r d  | | fz}n|r|| k7rd||| |oyg}tjjD]\}}}|tjdzd}|D]z}tjj||}|jvs2|jjjfvsX|jd rj|j!||t#|D]*}jj xrd xsd}|||d ,ycc}w) Nc|rjj|r tj|j}|j r|j d}nd}jj rSjjt|z t|z dz }|dkDrtj||}nd}jj|d|zjjdjj|d|zn jj|d|zjjdy) Nrr6rbsqseries.labels: sqseries.message.r) rrKrrrr formatted termwidthrir!ellipsis)pfxrrzrr2widthr1summarys r3 displaynamez"queue.qseries..displayname~s c" 9!5t~~F::**Q-CC77$$& GG--/#c(:S^KaOEqy(11#u=! i{U/B C e$ c)%-Fwwu(:;<5%&.1 AG#"2KD%]]1%a("4KD%"2KD%77??$!T'::C$C.2I%'WWTYY%7!dETYY!+-.Aa+B$++- OO OO OO  !# d 3!((,&8I&ggoo/%63CJ/'K1sG/c$|jdk(ryy)N.hg.patches.save.lineT)rS)r1rs r3 issavelinezqueue.issavelines 66- - .r6c|jj}|jjr|jsw|jj|_|j dd|jj ddd|j dd|jj ddd|s.t jj|jdr"tj||j|Sy)Nrs formattedsmqpagers interactiver)rr) rrr pageractiverrrrr rr repository)r1rrs r3rXz queue.qrepos [[    77  r~~!WW00BN LLul3   LLun5   RWW]]499V#45==$))FC C6r6c||jj}|j}d}g}g} d} t|D]\} } | dk(r| dz}| j dr=| j } | ddj d} | Dcgc] }t|} }_|b| j } | j dd\}}|r%| jtt|||j| |%|jjtdy|jjtd|d z||_ | |_|jd |_d |_|j$j'}|r||vr%|jjtd nn|jjtd t)|z|j*j-}||vrd }nd }t|j||g|d | r|jjtdt)| d t)| dfz|ru|jj/td|j1}|s%|jjtdyt3j4|| d yyycc}w)Ns Patch Data:ras Dirstate:rr3rVsno saved patch data found srestoring status: %s rTs*save entry has children, leaving it alone sremoving save entry %s Frs&saved queue repository parents: %s %s supdating queue directory s unable to load queue repository )rrrrmrkrr~rrGrPrrrrrrrrrr_rr[rrrXrr)r1rHrrqupdater#ro datastartrrqpprurvrrrrSr_pprrs r3restorez queue.restoresCy$$&,,.!  'GAt~%E .KKMbcFLL&'()q!s1vq)&KKM''$*4NN;s1vt#<=MM!$(   GGLL9: ;  Q01E!H<=    $$& % QMNO Q:;eCjHI]]**,"9!F"FdggtcU6%H  GGLL<=Q=%A-01 q!>?@JJLGGLL#G!HICF#  ;*sK2cX|js%|jjtdy|j |jdr%|jjtdy|s td}nd|j dz}|j }|r<|jj}|dt|d t|dfzz }|d z }|d jd |jDz }|d jd |jDz }|j|d}|s%|jjtdy|jjt|dd|_|j!|y)Ns"save: no patches applied, exiting rarsstatus is already saved shg patches saved states hg patches: s s Dirstate: %s %srs Patch Data: r6c3&K|] }d|z yw)rRNr0rrs r3rzqueue.save.. s:\! \c3&K|] }d|z yw)s:%s Nr0rs r3rzqueue.save.. s>o1 orTrsrepo commit failed r)rrrrrrrXr[rrrrrrGrPrrg)r1rHr2rrrs r3savez queue.save sW|| GGLLAB C ??4<<+ , GGLL78 9-.C!CJJw$77C JJL ##%B '3r!u:s2a5z*BB BC ## sxx:T\\::: sxx>doo>>> KK4K ( GGLL23 4 K+CDE  r6c|jrF|jdj}|j|}|t|jS|dzSy)Nrrar)rrSr&rir)r1r!rfs r3r0zqueue.fullseriesend) sK << R %%A//!$C{4??++7Nr6cd}fd}jr@jdj} jj|}||dzS||S#t$rYywxYw)zIf all_patches is False, return the index of the next pushable patch in the series, or the series length. If all_patches is True, return the index of the first patch past the last applied one. rcs|tjk\r|St|tjD]-}j|\}}|r|cSj |/tjSr/)rirrjrIrO)rrrur!rrMr1s r3 nextpatchz"queue.seriesend..nextpatch9 snes4;;'77 5#dkk"23 MM!, 6H$$Q' 4 t{{# #r6rra)rrSrrgr)r1rMrfrr!s`` r3rEzqueue.seriesend2 st  $ << R %%A kk''*S1W% %~  sA A+*A+c|j|j}|jjs|}|Sd|jj |zdz|z}|S)Nrr3)rrSrrLrrg)r1rgrr!s r3 appliednamezqueue.appliednameL sW U#((wwA**511T9EAAr6c fd}|rI|rtjtdtj||}|j dn |stjtdt |dkDst |dkDr |rtjtdg} |ri|jj|jj|j} t | dkDr/tjtd|jzjr|jj|j} | jD cgc]} | jc} vr/tjtd |jz| jd jgk7r/tjtd |jz|jjjd j} |jj| d } n^| |jj|jgk7r/tjtd |jzd} jd|i}|j!d5}|D]0}||j#s,tjtd|ztd|jj|\}}|jj|} |t$k7r!tjtd|z| r(| |k7r#tjtd|| fz|} |s9j'||j)j+ddd d|z}||j-||j.j1d |j3|d5}t5j6|| g||dddt9| |}jj1d |j:j=|| j=|d}|rC|j>jAddr'tCjD||tBjF| gjId_%d_&3 dddtO|D]\}}|r|dk(rtjtdtQ|}jS|tUjV|jYrQj[|}t\j^ja|s!tjtd|z|rbj-||j>jctd||fztejfj[|n|}n|dk(r |stjtd|s7tQt\j^ji|jkd }j-|| |dk(r%j>jljo}n@tqjrj>|}|jo}|juj3|d}|jc||ju|s|||jzvr#j}|z}|gj.||jId_&j>jtd"|zj:j=|| j=|d}j|| Scc} w#1swYxYw#1swYxYw#tvtxf$r"tjtd!|zwxYw)#Ncd|jvr!tjtd|zy)Ns&patch %s is already in the series file)rrrr)rr1s r3 checkseriesz"queue.qimport..checkseries^ s3DKK'kk?@9L(r6s*option "-r" not valid when importing filesTrsno files or revisions specifiedras5option "-n" not valid when importing multiple patchess/revision %d is the root of more than one branchsrevision %d is already managedrs*revision %d is not the parent of the queuers"revision %d has unmanaged childrenr&qimportsrevision %d is not mutablerkrscannot import merge revision %ds#revision %d is not the parent of %drs%d.diffrrr%r+rAs%-e is incompatible with import from -spatch %s does not existrenaming %s to %s s$need --name to import a patch from -/sunable to read file %ssadding %s to series file )Arrrrrrrirr_rRr0lastrr parentrevsrrrorrrr~r rrnrr exportfilerPrrGrrrretractboundaryrrrrrmnormnamer r"urlislocalrrrrHrKrrobasenamerfinrropenpathrrcrrr0rrg)r1rHrprrexistingrr rimportedr_rr lastparentrrrrArrTserufilename originpathtextrrgs` r3qimportz queue.qimportT s   kkCD%%dC0C HHTH "++a BCD D JNc#hl ++JK  NN(()<)*>?!^^66t>++?@399;N" }}fc]3H!!*-A7??,#kk;>*5#kk89HD'' 59GGMM01Xy4IIKK DIIi,@A (It#I++AB# ((()>?!I##Iu5O4'#ww{{//1[[(;!wwy Y5 T" I& +**,q009{e,    #D  GGLL89IE F JJ  i ( OOI &Is,v y:`65;.-n )O++a(A&BX&MNNOs97`E`)4`C`)=A*`6`& !`))`361a'r/)NNFr)NNNNN)FTFNNNNF)FT) NFFNFFFFF)NFTFFF)NrNNFr)NNNNF)Ar=r>r?rTr propertycacherrrrr rrrr&rcompiler)rr1r7r9r?rIrOr^rgrsr|rrrrrrrrrrrrrrr r rrr?rrrgr{r4rrrrrrXrrr0rErrr0r6r3rrs=#!J (    !!!2 +rzzEFHI. L !$  (%N2 /*   6&P*%N/(."hob/3b. H?: *.?I,J2P~"@;@@   ql y=v LH"T + $G0RD*5$n64  fr6rc|jddr"|jds|jdr|St|}d|d<|S)Nr%r)forceexactT keep_changes)rrdictrr;s r3fixkeepchangesoptsr sE MM% 0 88H  88H  :D D Kr6sqdelete|qremove|qrmkrskeep patch filerrs%stop managing a revision (DEPRECATED)sREVshg qdelete [-k] [PATCH]...) helpcategoryc|j}|j||tj||j y)a=remove patches from queue The patches must not be applied, and at least one patch is required. Exact patch identifiers must be given. With -k/--keep, the patch files are preserved in the patch directory. To stop managing a patch and move it into permanent history, use the :hg:`qfinish` command.r)mqrrr,r^)rrHrr;qs r3rr s40 AHHT7H0067KKM r6sqapplied1lasts%show only the preceding applied patchshg qapplied [-1] [-s] [PATCH]c F|j}tj|}|rN||jvr!t j t d|z|jj|dz}n|jd}|jdr|s|jt dy|jdr |dk(r|jt dy|jdr|dz }d}nd}|j|||d |jd  y ) zhg qimport [-e] [-n NAME] [-f] [-g] [-P] [-r REV]... [FILE]...c tj|}|j5|j} |j |||j d|j d|j d|j d|j d}|j  dddr7|j dr&|j dsj||d Sy #|j wxYw#1swYXxYw) aimport a patch or existing changeset The patch is inserted into the series after the last applied patch. If no patches have been applied, qimport prepends the patch to the series. The patch will have the same name as its source file unless you give it a new one with -n/--name. You can register an existing patch inside the patch directory with the -e/--existing flag. With -f/--force, an existing patch of the same name will be overwritten. An existing changeset may be placed under mq control with -r/--rev (e.g. qimport --rev . -n patch will place the current revision under mq control). With -g/--git, patches imported with --rev will use the git diff format. See the diffs help topic for information on why this is important for preserving rename/copy information and permission changes. Use :hg:`qfinish` to remove changesets from mq control. To import a patch from standard input, pass - as the patch file. When importing from standard input, a patch name must be specified using the --name flag. To import an existing patch while renaming it:: hg qimport -e existing-patch -n new-name Returns 0 if import succeeded. rrrrr&)rrrrr Nrrr)rr,rr rrr^rg)rrHrr;r rs r3rrs sj    %D  GG yy((7++.hhx(HHV$HHV$!H KKM DHHW%dhhv.>vvdHRL)) KKM s# C?A#C*C?*C<<C??DcP|j}|j||}|j|r]|j5|jj |5t jj|jdsw|jdd}|jd|jd|jd|jd|jd|jt jj|jds |jddj|d jddgtj||d d d d d d y y #1swYxYw#1swYy xYw) a"initialize a new queue repository This command also creates a series file for ordering patches, and an mq-specific .hgignore file in the queue repository, to exclude the status and guards files (these contain mostly transient state). Returns 0 if initialization succeeded.s .hgignorers^\.hg s^\.mq s syntax: glob sstatus sguards rNr)r rr^rZr[r\rrrarirYrKrr]r )rrHrr rrTs r3qinitr s" A tVAKKM WWY 11!477>>!'',"78VVL$/%%*+%% 77>>!'')"45y$'--/ dGKKy1 2 LLQ 5Y 54Y s%FD F>FF FF%sqinitcs create-reposcreate queue repositorys hg qinit [-c]T)r helpbasicc <t|||jdS)ainit a new queue repository (DEPRECATED) The queue repository is unversioned by default. If -c/--create-repo is specified, qinit will create a separate nested repository for patches (qinit -c may also be run later to convert an unversioned patch repository into a versioned one). You can use qcommit to commit changes to this queue repository. This command is deprecated. Without -c, it's implied by other relevant commands. With -c, use :hg:`init --mq` instead. create_repor)rrrrHr;s r3rr s$ T$((="9 ::r6sqclonepulls"use pull protocol to copy metadatarnoupdates)do not update the new working directories uncompresseds)use uncompressed transfer (fast over LAN)prs#location of source patch repositorysREPOs#hg qclone [OPTION]... SOURCE [DEST])rnorepoc ~tj|}d}|tj|}t j ||}tj |||}|jdr&t j ||jd}n||} tj |||d\}} |jr|j} | jjr| |jt j"k7r| jjdj$}tj&|st)| j+} t-| j/| j+|} | j1| j2j5|dn#|j7dr |j9d}|j;td tj<|||j?||jd | d |jd  \}} |j;tdtj<|||jdxs|||| |jd |jd |jd | jr| j} |r+|j;tdtA|| |gd d|jdsI|j;tdtjB| | j2jEyyy#tj$rtjtdwxYw#tj$rYwxYw)aTclone main and patch repository at same time If source is local, destination will have no patches applied. If source is remote, this command can not check if patches are applied in source, so cannot guarantee that patches are not applied in destination. If you clone remote repository, be sure before that it has no patches applied. Source patch repository is looked for in /.hg/patches by default. Use -p to change. The patch directory must be a nested Mercurial repository, as would be created by :hg:`init --mq`. Return 0 on success. cX|j}|jdr|dd}|dzS)z+compute a patch repo url from a repo objectrNrs /.hg/patches)rendswith)rHrs r3rzclone..patchdir s/hhj << cr(C_$$r6Nrs4versioned patch repository not found (see init --mq)rrslookuprDscloning main repository r#Fr%)pullrrstreamscloning patch repository r$)r+rr,s6stripping applied patches from destination repository rs updating destination repository )#rr,r defaultdestr"get_clone_path_objpeerrr RepoErrorrrlocalr rrrrrRrr4r_r differencerGrrcapablerrlclonerrrr) rsourcedestr;r source_pathsr patches_pathqbasedestrevrHr_drs r3r4r4 s\    %D% |~~f%,,R8K T; 'B xx 11"dhhz6JK  |   D,'  NE7 xxzxxz 77??tE{002fmmCGGOOA&++E::d#DJJL)u// 50ABCt~~55eprint the name of the current patch Returns 0 on success.TrrarrrriN)r rrErrrKr)rrHr;r ts r3rr sn Ayy KK   a%HHY'   *+,r6sqnexts hg qnext [-s]c |j}|j}|t|jk(r|j t dy|j ||d|jdy)zDprint the name of the next pushable patch Returns 0 on success.rrar)rrrrN)r rErirrKrrr)rrHr;r rfs r3nextrE sZ A ++-C c!((m +,-IId#a)1DIEr6sqprevs hg qprev [-s]c n|j}t|j}|dk(r|jt dy|s|jt dy|j j |jdj}|j||dd|jdy) zHprint the name of the preceding applied patch Returns 0 on success.rarrirrrN) r rirrKrrrgrSrr)rrHr;r rr<s r3prevrH s A AIIAAv ./0  *+, ((..2++ ,CII C$8Kr6c|jds$|jdr|j|d<|jds-|jdrdtjz|d<yyy)Nr currentuserrc currentdater+)rusernamer makedaters r3setupheaderoptsrN s^ 88G .!9 W 88G .!9 8#4#4#66W ": r6sqnewrs invoke editor on commit messagess'import uncommitted changes (DEPRECATED)rJs#add "From: " to patchursadd "From: " to patchsUSERDrKs#add "Date: " to patchdrcsadd "Date: " to patchsDATEs0hg qnew [-e] [-m TEXT] [-l FILE] PATCH [FILE]...)rrr=ctj|}tj||}|j}||d<t |||j ||g|itj||jy)acreate a new patch qnew creates a new patch on top of the currently-applied patch (if any). The patch will be initialized with any outstanding changes in the working directory. You may also use -I/--include, -X/--exclude, and/or a list of files after the patch name to add only changes to matching files to the new patch, leaving the rest as uncommitted modifications. -u/--user and -d/--date can be used to set the (given) user and date, respectively. -U/--currentuser and -D/--currentdate set user to current user and date to current date. -e/--edit, -m/--message or -l/--logfile set the patch header as well as the commit message. If none is specified, the header is empty and the commit message is '[mq]: PATCH'. Use the -g/--git option to keep the patch in the git extended diff format. Read the diffs help topic for more information on why this is important for preserving permission changes and copy/rename information. Returns 0 on successful creation of a new patch. rr) rr,r logmessager rNr? strkwargsr^)rrHrrr;r2r s r3r?r? stV    %D   R &C ADLB AEE$99 2 24 89KKM r6sqrefreshrs;refresh only files already in the patch and specified filess2add/update author field in patch with current users0add/update author field in patch with given users0add/update date field in patch with current dates.add/update date field in patch with given dates=hg qrefresh [-I] [-X] [-e] [-m TEXT] [-l FILE] [-s] [FILE]...cJtj|}|j}tj||}t |||j 5|j||fd|itj|}|j|cdddS#1swYyxYw)a>update the current patch If any file patterns are provided, the refreshed patch will contain only the modifications that match those patterns; the remaining modifications will remain in the working directory. If -s/--short is specified, files currently included in the patch will be refreshed just like matched files and remain in the patch. If -e/--edit is specified, Mercurial will start your configured editor for you to enter a message. In case qrefresh fails, you will find a backup of your message in ``.hg/last-message.txt``. hg add/remove/copy/rename work as usual, though you might want to use git-style patches (-g/--git or [diff] git=1) to track copies and renames. See the diffs help topic for more information on the git diff format. Returns 0 on success. r2N) rr,r r rSrNrZrrTr^)rrHr6r;r rrs r3rr sD    %D A  T*GB aiidLL83E3Ed3KL  s ;BB"qdiffshg qdiff [OPTION]... [FILE]...c|jd|jj||tj|y)adiff of the current patch and subsequent modifications Shows a diff which includes the current patch as well as any changes which have been made in the working directory since the last refresh (thus showing what the current patch would become after a qrefresh). Use :hg:`diff` if you only want to see the changes made since the last qrefresh, or :hg:`export qtip` if you want to see changes made by the current patch without including changes made since the qrefresh. Returns 0 on success. rVr)pagerr r4rr,)rrHr6r;s r3r4r4` s2.HHXGGLLtX11$78 r6sqfoldskeep folded patch filess/hg qfold [-e] [-k] [-m TEXT] [-l FILE] PATCH...c tj|}|j}|stjt d|j |dstjt d|j5|j|tj||}|jd}g}g}|D]|} |j| } | |vs| |k(r|jt d| z|j| r!tjt d| z|j| ~|D]} |sLt|j!| |j"} | j$r|j| j$|j!| } |j'|| \} }}| r{tjt d| z|spt|j!||j"} | j$}|D])}|s|r|jd|j)|+d j!|}|j*|j-g|}|j/|||j0|j3d d |j5||||j7d d d y #1swYy xYw)a,fold the named patches into the current patch Patches must not yet be applied. Each patch will be successively applied to the current patch in the order given. If all the patches apply successfully, the current patch will be refreshed with the new cumulative patch, and the folded patches will be deleted. With -k/--keep, the folded patch files will not be removed afterwards. The header for each folded patch will be concatenated with the current patch header, separated by a line of ``* * *``. Returns 0 on success.s&qfold requires at least one patch namerrrCs!skipping already folded patch %s s*qfold cannot fold already applied patch %sserror folding patch %ss* * *rrsmq.qfold)r2r r7r!N)rr,r rrrrrZrr rSrrrrGrrrrrr/rrrr rrr^)rrHrpr;r rrrmessagesrWr!rr patchsuccessrr2rs r3foldr\| sZ0    %D A kk!EFGG ??4  #kk!1233  D!$$R.'"A AG|qF{?@1DE{{1~kkCDqH NN1 A AKK8::OOBJJ/B*+''$*; '\5$kk!$=">"BCCQVVF^Q[[9BjjGx0NN3'  jj)G1;;qzz|6g6  '"   w% _ sD:K?AKB*KKsqgotos keep-changess&tolerate non-conflicting local changessoverwrite any local changess no-backups"do not save backup copies of filesshg qgoto [OPTION]... PATCHc tj|}t||}|j}|j |}|j d}|j d}|j |r&|j|||j d||}n%|j|||j d||}|j|S)zSpush or pop patches until named patch is at top of stack Returns 0 on success. no_backuprr)rr^r) rr,rr rrrr{rgr^)rrHrr;r r^rrs r3gotor_ s&    %D b$ 'D A HHUOExx %H((?+K{{5ee  ((8$#  ff  ((8$#  KKM Jr6sqguardllistslist all patches and guardsnonesdrop all guardss8hg qguard [-l] [-n] [PATCH] [-- [+GUARD]... [-GUARD]...]c fd}|j jDchc]}|jc} d}t|}|j dr]|s|j drt j tdtt jD] }|| y|r |ddddvrC jst j td  jd j}||ddddvr|jd}|t j td |s|j drW j|}|!t j td |z j|| jy| jj j!|ycc}w) aset or print guards for a patch Guards control whether a patch can be pushed. A patch with no guards is always pushed. A patch with a positive guard ("+foo") is pushed only if the :hg:`qselect` command has activated it. A patch with a negative guard ("-foo") is never pushed if the :hg:`qselect` command has activated it. With no arguments, print the currently active guards. With arguments, set guards for the named patch. .. note:: Specifying negative guards now requires '--'. To set guards on another patch:: hg qguard other.patch -- +2.6.17 -stable Returns 0 on success. c@j|xsdg}j|vrd}nj|drd}nd}d||fz}jdj j||zt |D]\}}|j drj|d n8|j d rj|d nj|d |t|dz k7sujdjdy)Ns unguardedrrrrs!qguard.patch qguard.%s qseries.%ss%s: rBqguard.positiverrAqguard.negativeqguard.unguardedrar3r)rrrIrKrrmrkri) r<r5rzrrur.rr rs r3rzguard..status s$6 88C=G #E ZZ_Q  EE4u~E 288AHHSM599:!&)HAu%&89!!$'&89&9:CK!O#* r6Nrnones.cannot mix -l/--list with options or argumentsrrar-rrsno patch to work withsno patch named %s)r rrSrrrrrrjrirr{r&r?r^rgr) rrHrr;rr!rrur<rr s ` @@r3r.r. s@, A yy)y!qvvy)G E :D xx 488F#++CD s188}%A 1I& 471Q<5(yy++a 567 7 " "" }a1U2  }kk!4566 txxll5! ;++a 45=> > C qxx~~ahhuo./5*sGsqheadershg qheader [PATCH]cX|j}|r|j|}n8|js|jt dy|jd}t |j ||j}|jdj |jdzy)zMprint the header of the topmost or specified patch Returns 0 on success.rirarCrN) r rrrKrrrrr)rrHrr rs r3rprpN s} A yy HHQ./ 0! QVVE]AKK 0BHHUZZ #e +,r6cttjj|\}}tj|}t j d|z}d}d}|D]<}|j |}|st|jd} || |kDs9| }|}>|r"tjj|||fSy)Ns %s.([0-9]+)rar) rrr~listdirrrrurIgroupr) r directoryrnamesnameremaxindexmaxnamerWr{rgs r3 lastsavenamerrf s d+Y JJy !E ZZ- .FHG  LLO  OE58#3   Y0(;; r6c@t|\}}|d}|d|dzzz}|S)Nrs.%dra)rr)rrrgnewpaths r3savenamerux s2 &MT5 |Vuqy))G Nr6rsapply on top of local changesrs-apply the target patch to its recorded parentslist patch name in commit textaallsapply all patchesmerges%merge from another queue (DEPRECATED)smerge queue name (DEPRECATED)moves-reorder patch series and apply only the patchs0hg qpush [-f] [-l] [-a] [--move] [PATCH | INDEX]c |j}d}tj|}t||}|j dr|j dr+|j j |j d}nt|j\}}|s|jtdyt||j|j|}|jtd|jz|j|||j d|j d||j d |j d |j d |j d |j d  }|S)a,push the next patch onto the stack By default, abort if the working directory contains uncommitted changes. With --keep-changes, abort only if the uncommitted files overlap with patched files. With -f/--force, backup and patch over uncommitted changes. Return 0 on success. Nrxrs%no saved queues found, please use -n rasmerging with queue at: %s rrarwryrr^r)rrrr[r\r]r^r)r rr,rrrrrrrrrrrrg) rrHrr;r rrtrurs r3rgrg s6T A F    %D b$ 'D xx 88G hhmmDHHW$56G%aff-JGQ GGA?@ Ar4;; 7; 01FKK?@ &&  hhx XXg  HHV  XXg hhx ,'HH_-  C Jr6sqpopspop all patchessqueue name to pop (DEPRECATED)s)forget any local changes to patched filess!hg qpop [-a] [-f] [PATCH | INDEX]c 6tj|}t||}d}|jdrtt ||j |j |jj|jd}|jtd|j zd}n |j}|j|||jd||jd|jd|jd }|j|S) apop the current patch off the stack Without argument, pops off the top of the patch stack. If given a patch name, keeps popping off patches until the named patch is at the top of the stack. By default, abort if the working directory contains uncommitted changes. With --keep-changes, abort only if the uncommitted files overlap with patched files. With -f/--force, backup and discard changes made to such files. Return 0 on success. Trsusing patch queue: %s Frrwr^r)rrr[r^r)rr,rrrrrrrrrr r{r^)rrHrr; localupdater rs r3r{r{ s@    %D b$ 'DK xx "dkk499dhhmmDHHWr7| j6jA|| j6jC|n$| jE||| jG|gdddddd|jIycc} w#1swY'xYw#1swY+xYw) zrename a patch With one argument, renames the current patch to PATCH1. With two arguments, renames PATCH1 to PATCH2. Returns 0 on success.NrirCrr6r;Trar)%r rrrKrrrrr rrr rlr&r)r*rrrrrPrdirnamemakedirsrrorXr[rZr\r.r set_untracked set_trackedrrr^)rrHrrSr;r absdestrur5r=rdestdirrrKs r3roro sj A  yy HHQ./ 0 !ffTlG ww}}W T277+;+;E+BCD&&,TGGA$ % 56 UA ZZ   Q 0FSXX&&A&Quqy&&ABBALLOMMOAM ;;u D (a$7 $q'ANggoog&G 77== ! GKKu w'  AUajj WWY 11!4T7Dzz##E*00 ((/ &&t, %& UG$5YKKM1'B54YYs+ L< 9M BMM M M  Msqrestoredeletesdelete save entrysupdatesupdate queue working directoryshg qrestore [-d] [-u] REVc |j|}|j}|j|||jd|jd|j y)zsrestore the queue state saved by a revision (DEPRECATED) This command is deprecated, use :hg:`rebase` instead.rr)rrr)rr rrr^)rrHrr;r s r3rr;sM ++c C AIIdC 2DHHXzselect..s!AIIaL$5$56q9r6rbsguards deactivated rrsAnumber of unguarded, unapplied patches has changed from %d to %d s=number of guarded, applied patches has changed from %d to %d rrrasNONEc|dddSNrrar0)rs r3rzselect..s!A$qr(r6)keysguards in series file: s%2d rsno guards in series file sactive guards: sno active guards rFspopping guarded patches T)r[sreapplying unguarded patches N)r rr,r9rrrjrirr7r^rrrrrLrrSrrlrKrSr{rg)rrHrr;r5rI old_unappliedru old_guardedrguardednoguardsgsr=r.countreapplypoppedr s @r3selectrs\ A    %D XXZF9H txx  D) "'AII"7K"7Qx{q"7 K D  IIa/0 1xx(< D)I"'AII"7K"7Qx{q"7GK9~]!33 3=)3y>: ;7|s;// +;'W6 7 ) ..BA !!!Q'q Q ! ::&F7Oflln% * +  GGA12 3 & u5()&!' GGA34 5  GGA)* +E" HHQ,- .hhz"GqyyGQYYr]5G5GG F xx488J/s199~&AA; !89:6EE$DE)EE$ !a% 0 5 56'  !=>?tW% KKM LL| KKMs$= Q Q# Q1Q.Q Qrrsfinish all applied changesetsshg qfinish [-a] [REV]...c6|jds |stjtd|jdrd|z}|j}|j s|j tdytj||}|dj|vr-|djr|jtd|j5|j|||jdddy#1swYyxYw) ahmove applied patches into repository history Finishes the specified revisions (corresponding to applied patches) by moving them out of mq control into regular repository history. Accepts a revision range or the -a/--applied option. If --applied is specified, all applied mq revisions are removed from mq control. Otherwise, the given revisions must be at the base of the stack of applied patches. This can be especially useful if your changes have been applied to an upstream repository, or if you are about to push your changes to upstream. Returns 0 on success. rsno revisions specified)s qbase::qtiprirrNs6warning: uncommitted changes in the working directory )rrrrr rrrrrrprrrr^)rrHrr;r rs r3rrs0 88I xkk!5677 ) $x/ A 99 !+,-   tX .D Dz~~4DJ$4$4$6 LMN  t     s ##DDsqqueueslist all available queuesactivesprint name of active queuecreatescreate new queuerenamesrename active queuesdelete reference to queuepurges"delete queue, and remove patch dirs[OPTION] [QUEUE]c jdddfdfd}fd}fd}fdfd }fd }d } fd } tj|}|r"|jd s|jdr} |jdr|j d| fzy|D]T} |j d| fz| | k(r'|j s|j t dD|j dVy| |stjt dj5||jdrF|vr!tjt d|z|r|||||n|jdrV} || k(r!tjt d|z|vr!tjt d|z|| } ||}tjj|r!tjt d|zjdd}D]h} | | k(rL|j d|fztjj| s=tj| |T|j d| fzj|j!jjd|n|jdr | |n|jdrI|vr| |||}tjj|r@t#j$|n*|vrtjt d||dddy#1swYyxYw)a6manage multiple patch queues Supports switching between different patch queues, as well as creating new patch queues and deleting existing ones. Omitting a queue name or specifying -l/--list will show you the registered queues - by default the "normal" patches queue is registered. The currently active queue will be marked with "(active)". Specifying --active will print only the name of the active queue. To create a new queue, use -c/--create. The queue is automatically made active, except in the case where there are applied patches from the currently active queue in the repository. Then the queue will only be created and switching will fail. To delete an existing queue, use --delete. You cannot delete the currently active queue. Returns 0 on success. rspatches.queuesrctjjj}|jdr|dd}|S)Nr)rrrrk)rr s r3 _getcurrentzqqueue.._getcurrentPs7ggqvv& >>+ &ab'C r6cj jd}|jy#t$rYywxYw)NrTF)rrr)r _allqueuesrHs r3 _noqueueszqqueue.._noqueuesVs: *d+B HHJ  s "& 22c6} jd}|Dcgc]#}|js|j%}}|j||vr|j|t |Scc}w#t$rg}Yt |SwxYw)Nr)rrrrGrrB)currentrrqueuesr _defaultqueuerrHs r3 _getqueueszqqueue.._getqueues_s- %*d+B13Eu{{}ekkmFE HHJf$ g&f~F %#_Ff~ %s'A?A:A:'A?:A?? BBcjjrtjtd|y)Ns@new queue created, but cannot make active as patches are applied)rrrr)rS_setactivenocheckr s r3 _setactivezqqueue.._setactivems2 99++.  $r6cvjd}|dk7r|j||jy)NrrrrKr)rSr _activequeuerHs r3rz!qqueue.._setactivenocheckws/ XXlD ) :  HHTN  r6ctjd}|jd|fz|jy)NrvrRr)rSrrrHs r3 _addqueuezqqueue.._addqueue}s/ XXj$ ' D7"#  r6c|dk(rjjdSjjd|zS)Nrr)rr)rSrHs r3 _queuedirzqqueue.._queuedirs6 : 88==, ,88==t!34 4r6c|D]}|dvsyy)Ns:\/.FTr0)rSrs r3 _validnamezqqueue.._validnamesAH}r6c^|vrtjtd}||k(rtjtdjdd}D]}||k(r |j d|fz|j jj dy)Ns'cannot delete queue that does not exists$cannot delete currently active queuepatches.queues.newrrR)rrrrrKrro)rSrrrrrrrHs r3_deletezqqueue.._deletes x ++a JKL L- 7?++a GHI I XX+T 2E} HHWx' (   -z:r6rarrRNs%ss (active) rs9invalid queue name, may not contain the characters ":\/."rsqueue "%s" already existsrs%can't rename "%s" to its current names'non-queue directory "%s" already existsrrrrs"use --create to create a new queue)r rr,rrKquietrrrrZrrrarrrorshutilrmtree)rrHrSr;rrrrrrrrrolddirnewdirrqdirrrrrrrr s ` @@@@@@@r3qqueuer)sD AM"J#L     5  ;"    %D 488G$(;- 88I  HHWz) * \E HHUeX% &>*+ "  d kk K L   < 88I xkk!$@"AD"HII{-( dO t  XXi !mGwkk?@4Gxkk!$@"AD"HIIw'Ft_Fww~~f%kk@AFJ/6B!G#HHWw./ww~~f- FF3HHWx/0 " HHJ HHOO1: > d # XXi DM XXh x T?Dww~~d# d#8#kk!$I"JKK t c s E#N:0DN::Oc<|jjr|jjddrtj }ntj }||jjdj}||j|j|S)zEcallback used to set mq changeset as secret when no phase data existsr%r+r) r rrrrrdraftrRr])rHrootsmqphaser:s r3mqphasedefaultsrsm ww 77  eY /mmGllGTWW__Q',,- g5::<( Lr6cGfdd|j|jr'|_|jjtyy)NceZdZejdZfdZddZ dfd ZfdZ fdZ xZ S) reposetup..mqrepocXt|j|j|jSr/)rrrrrWs r3r zreposetup..mqrepo.mqs$++tyy9 9r6ct|tj|drt |j dyy)Nr )super invalidateallrhasunfilteredcacher r)r1 __class__mqrepos r3rz'reposetup..mqrepo.invalidatealls6 &$ - /++D$7)408r6cT|jjr|jjru|sr|jj }|jjDcgc]}|j c}t fd|Drtj|yyyycc}w)Nc3&K|]}|v ywr/r0)rr!rs r3rz?reposetup..mqrepo.abortifwdirpatched..s5WqG|Ws) r rrr[rrRrrr)r1errmsgrrrMrs @r3abortifwdirpatchedz,reposetup..mqrepo.abortifwdirpatchedsww477#7#7--//1+/77??;?a166?;5W55++f--6AF#7;s"B%c l|i}|jtd|t ||||||||S)Ns&cannot commit over an applied mq patch)rrrr) r1rrrrurr*extrarrs r3rz reposetup..mqrepo.commitsM}  # #;.mqrepo.checkpushsww477#7#7 .2ggoo>oaffo >;;  ,E ( 45=!&NN, !5 'DDz'')FMM9#kk!,L*MNN' &$ )& 1!?sDct |}|j}|js|S|jDcgc]}|j|j f}} |j jj|dd|jj}|Dcgc]}||ds|}}|s|S|j!|dddf|j!|dddf|j!|jj#|ddddf|d}|D]?}|d|vr+|jjtd|dz5|d||d<A|Scc}w#tj$r;|jjtdt|ddz|cYSwxYwcc}w) z,augment tags from base class with patch tagsrrs)mq status file refers to unknown node %s rCrDsqparentras+tag %s overrides mq patch of the same name )r _findtagsr rrRrSrrrrrnrrrrhasnoderGr) r1resultr rmqtagsincludedmqttagsrrs r3rz#reposetup..mqrepo._findtags-s6424FA99 <=IIFI5uzz5::.IFF !++//r 1 >~~--H%+@VcxA/?cVF@ MM6":a='2 3 MM6!9Q<2 3 MM4>>11&)A,?BJO P!9D8t#GGLLIJ(# &+1XDqN M?G $$  CDF2JqM*+  As$E0/E5#G4G5A GGr)r6NNNFFN) r=r>r?runfilteredpropertycacher rrrrr __classcell__)rrs@r3rrsP  * * : + : 1  . ( 2(' ' r6r)rr1_phasedefaultsrGr)rrHrs @r3 reposetuprsAaaF zz| ""?3r6ctj|dr<|jdds*|jt d|jd|||g|i|S)Nsabortifwdirpatched no_commitFs#cannot import over an applied patchr)r safehasattrrrr)origrrHrrs r3mqimportr\s` 34VZZU>  4 5vzz'7J  D *4 *6 **r6c|jdd}|s ||g|i|S|r8|d}tj|setjt dt jtj}|stjt dtj||}t||dS)Nr rs0only a local queue repository may be initializeds5there is no Mercurial repository here (.hg not found)T) r{rrrrrr findreporgetcwdrr)rrrrr repopathrHs r3mqinitrfs D$ B B(((( 7zz(#++EF ##HOO$56++JK  ==X &D T4  r6c|jdd}|s |||g|i|S|j}|j}|stjt d||j |g|i|S)z>Add --mq option to operate on patch repository instead of mainr Nr?)r{r rXrrrr)rrrHrrr r rs r3 mqcommandr|su D$ B B.t.v.. A  A kk!2344 a )$ )& ))r6c|j}g}t|jt|j|}}|r-|j |j t dd|z|r-|j |j t dd|z|r-|jt ddj|zy|jt dy)Ns %d appliedqseries.applieds %d unappliedqseries.unapplieds mq: %s s, smq: (empty queue) ) r rirrrGrrrKrrl)rrHr r{r us r3 summaryhookrs A A qyy>3q{{401qA !M*,>?!CD !O,.BCaGH ?#ejjm34 ,-.r6smq()c$tj|ddtd|jjDchc]}||j j !}}tj|Dcgc] }||vs| c}Scc}wcc}w)zChangesets managed by MQ.rsmq takes no arguments) rgetargsrr rrRrrbaseset)rHsubsetrrrs r3revsetmqrsyq!Q": ;<+/77??;?atAFF|!?G;   ?1!w,Q? @@<?s$B3 B =B cdddtdfgtjtjdt t jjdttjtjdt}|djfd}|tjtjd}tjD]\}}||k7s |t|d i y) Nr6r%soperate on patch repositorysimportsinitrac|jD]^\}}tj|d}|d}|jr0t j ||t }|dj`yr)rSr parsealiasesr'r wrapcommandrr/)cmdtablecmdrfuncmqopts r3dotablezextsetup..dotablesd"..*JC&&s+A.C8D{{**8S)DE !HOOE " +r6zhgext.mqr)rrrr tablerr summaryhooksr]rrr/sysmodulesr )rrr thismoduleextname extmodulers @r3extsetupr s5$"@ A B CE8>>9h? UK0  " "8>>7F CE !HOOE# HNNZ(J(335  " GIz26 76r6sredsyellowsgreensblue bold underlines black boldsred bold)rfrergrsqseries.guardedsqseries.missingrr/)z__doc__rrrrmercurial.i18nrmercurial.noderrrrmercurial.pycompatr r r mercurialr r rrrrrrrrrrrrrrrrrrrrrmercurial.utilsr r!r"r seriesoptsrcommand testedwith configtable configitemr(KeyErrorr-loadrNnormpathrrPrhr|ryrrrrrrrCATEGORY_CHANGE_ORGANIZATIONrrrCATEGORY_IMPORT_EXPORTrrCATEGORY_REPO_CREATIONr remoteoptsr4rCATEGORY_COMMITTINGrrrrErHrNwalkopts commitoptsr?rr diffopts2CATEGORY_FILE_CONTENTSr4CATEGORY_CHANGE_MANAGEMENTr\r_r.rprrrurgr{rorrrrrrrrrrrrevsetpredicater i18nfunctionsr  colortabler0r6r3r)s 7t   , //Zq)L'MN O  )  H % #  !Y ! !+ .                .JOOH   $ ==--    (V#Lq"q"h,$ U[[ J J Z@   wa 234    6 7 fI   #$55      GT1EFGH&'55 @  HdA:;<= J()55    >  {D!$E"FG wQ45qzB xq!<=>    : ; fI   vtQ>?@ wa 89: GH//#&4 '&4 n 8   ND!$>"?@A//  ; ;  gtQDEF    : ;      : ;      4 5 gJ  ,-.,-// 7:^2;:^2B  NN< #)*,, ,,  z4#A!BC55    o55    .  55  F  F  55    $7  wa CDE xq!KLM vtQ>?@ ~tQ'M%NO wQ=>' K ~tQ'M%NO wQ=>' K  9:,,!$  %$  F  wa CDE vtQ>?@    L M      C D      A B gJ      A B      ? @ gJ  9#HI$JK%LFG,,W,Z[,Z>   w(((7+;+;;'(//   (  wa CDE wa :;<  8933 D DN      7 8  xq!?@A lD!$I"JK #$55<  wa >?@ wa 234AB55H0H0V 55  -  -$$      7 8  xq!ABC    > ?  wa ABC vtQ345 xq!IJK wQ?@!G*M    > ?  lD!$I"JK149:55=@%A@%P  vtQ123 wQ@A1W:N    7 8  xq!MNO lD!$I"JK *+55!$!%$!H #$55  4  4n  y$"6 78 y$"C DE"#55    wa 789 wQ56' C xq!;<= xq/0   >?55 !  ! H  wa 567 y$"C DE fdAJKL j$"> ?@  *+55 n nb  Ja @ABC!"55  %  % P  wq!=>? i"? @A y%#6!78 i"8 9: i"> ?@ hq!FGH 55 m m` g4T+!, * / ,)++-AA 8:!!.%#' gA .JOOGIx- .sd(d43d4