G]{N2;ddlZddlZddlZddlmZddlmZmZmZm Z m Z ddl m Z ddl mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZm Z!m"Z"m#Z#m$Z$m%Z%m&Z'm(Z)m*Z*m+Z+m,Z,m-Z-m.Z.m Z m/Z/m0Z0m1Z1m2Z2m3Z3m4Z4m5Z5m6Z7m8Z9m:Z:m;Zm?Z?m@ZAmBZCmDZDddlEmFZFmGZGmHZHmIZIiZJeJjejje0jeJZLe0jZNdd d ed ed fd d d ededfdddedfdddedfdddedfd dd ededfd dgededfd dded fd d!ded"fd d#ej2ed$ed%fd d&ejed'ed(fd d)ded*fd d+ded,fd d-ded.fd d/ded0fd1d2ded3fd d4d5ed6fd d7d8ed9edfgZPejZQejZRejZSejZTejZUejZVejZWejZXejZYejZZejZ[ejZ\ejZ]ejZ^ejZ_ejZ`eLd:eQeLjd;<d=ZbeLd>eSe_zeQzed?eLjd;d;@dAZdeLdBe^e_zeSzeQzed?eLjd;CdDZeeLdEdFdGd edHedIfd dJdedKfd dLdedMfdNdOdedPfdQdRdedSfdTdUdedVfdWdXdedYfdZd[ded\fd]d^ded_fd`dadedbfd dcgeddedIfg e[zeSzeWzedeeLjd;d;@dfZgeLdgd dhdedifdjdkd edledmfdFdGd ednedIfdodpd edqedfge_zeSzedreLjsdtZieLdud dvdedwfd dxdedyfd dzded{fd d|d ed}edIfdFdGd ed~edIfddd5edfge]zeSzeTzeUzedeLjsddZjddZkeLddFdd5edfddd5edfddd5edfddcd5edfddd5edfd]dd ededfddd5edfgedeLjs ddZmeLddTdd5edfdFdGd ededIfdWdd5edfddd ededfddd5edfd`dd5edfgeWzedeLjsdZoeLddTddedfdddedfdFdGgedfgedeLjsddZpeLddNdd5edfd]dd5edfdFdGgedfgeWzedeLjeNhddZqeLdd ddedfdTddedfdFdGgededIfddgededfd dgedëedIfdNddedūfdodpdedǫedfgeRzedȫeLjsdɄZreLdddd edͫedΫfdFdGd edϫedIfd ddedѫfgeSzeWzedҫeLjd;eNhӫdԄZseLdddded֫fdQdd edثedIfdFdGged٫edIfddgedګedfd ddedܫfd ddedޫfd ddedfgeRzedeLjd;d;ddZueLdddBdedfd ddedfd ddedfdddedfd ddedfdddedfd ddedfdddedfgeSzeTzeUze_zed?eLjd;d;@dZwdZxeLddQddedfd ddedfdddedfd`ddedfd ddedfd ddedfd ddedfdddedfgeWzedeLjd;eNhdZzeLdeQeLjd;<d Z{eLd d d ded fdd dedfd dd ededIfdTddedfgeSzeQzedeLjsdZ|eLdgedeLjd;dȐdZeLddːddedfgedeLjd;dȐdZ}eLddFdGgededIfd dd ed ed!fd d"d ed#ed$fd]d%d ed&edIfgeZze\zeSze_zed'eLjd;d;eNh(d)Z~eLd*d+d,d ed-ed.fddd edͫedΫfd d/ded0fdFdGged1edIfgeZzeWzed2eLjd;eNh3d4ZeLd5dFdGd ed6edIfd7d8ded9fgeSzeWze_zed?eLjeNhd:ZeLd dddedfgeSzeQzedҫeLjd;d;@d;ZeLdedIfd]dd5ed?fd d@d5edAfd d:d5edBfddd5edfd dCdedDfd dzdedEfdTdd5edFfdGdHd5edIfddJd5edKfg eUze]zeQzedLeLjsdMZdNZdOZe9j d<dPd;d;d;ej edQReLdSd7d8dedTfd ddedUfd ddedVfdNdOdedPfdTdJdedWfddXdedYfd`dZded[fdZdaded\fdFdGged]edIfd d^ded_fdQdRdedSfdWdXdedYfg eWzeSzed`eLjd;eNhӫdaZ eLdbdFdGd edceddfdoded5edffdNdd5edgfd]dd5edhfgeXzedieLjeNhdjZeLd2ddkdedlfd]ddedmfdndodedpfddqgedredsfgedteLjd;eNhudƐdvZeLdwdFdGd edxedIfdZdydedzfdd{ded|fddded}fdod~dedfd+ddedfgeRzeWzedeLjd;eNh dɐdZeLddjddededfddd ededfd ddedfddd5edfdTddedfd dzdedfd ddedfd ddedfd ddedfd dkd ededfd ddedfg eTzeUze^zedeLjsdƐdZeLddTddedfdZddedfd dd ededfdFdGgededIfd+dd5edfddgededfgeYzeRze_zedeLjsdʐdZeLdeRedeLjd;d;dːdZeLddFdGd ed6edIfd7d8ded9fdTddedfgeSzedeLjsdZeLddTdJdedWfd ddedfdWdXd ededfdddedfdndogededfdFdGgededIfddgededfd ddedfdddedfdQdRgededfd dgededfddgededfd+d,geded.fddgedëedIfgeYzeSzedīeLjd;d;eNh(dńZeLddFdGd edǫedIfd dd5edȫfgeWzedɫeLj eNhdĐdʄZeLdvdTdded˫fdFdGd ed̫edIfdddedΫfd d:dedϫfge]zedЫeLjd;<dƐdфZ&e9j dvdd;d;edҫe$j$edӫedԫիeLddTddedfdFdGged׫edIfdZddedfd+dd5edfddgedثedfgeYzeRze_zed٫eLjsdڄZeLddFdGd edܫedIfgeXzedݫeLjd;CdƐdބZeLdeWedeLjd;eNhdƐdZeLddjdd5edfdWdd5edfddd5edfdTdd5edfdFdGgededIfgedeLjsdZdZeLddQddedfdTddedfd ddedfdFdGgededIfd+d,geded.fddgededfd dd5edfgeRzedeLjd;<dZeLddNddedfd ddedfdddedfd ddedfd d5dedfdjddedfd7d8dedfd ddedfgejzedeLjsdZeLddTddedfdFdGged׫edIfd+d,geded.fd dded fddgedثedfd d d5ed fd d ged fd dd5edfgeRzedeLjd;<dZeLddgeLj sdZeLddd dedfdTddedfge_zeSzeQzedҫeLjd;d;@dZeLdd d dedfdd dedfd dd ededIfdTddedfgeSzeQzedeLjsdZeLd dNdded!fd`dded"fdd#ded$fdQd%ded&fdZd'ded(fd d)ded*fge]zeSzeWzed?eLjd;Cd+ZeLd,dNdded-fdWdXd ed.edfdFdGd ed/edIfdd0ded1fddded2fgeSzeQzed3eLjsd4ZeLd5eQdTdd5ed6fgzeLj sd7ZeLd8geWzeNheLj9d:ZeLd;ddded?fd d@gedAfdBdCd edDedfdjdEd edFedGfdNdHd edIedJfd dkd edKedmfdZdLd edMedNfd dOd edPedfd dQd edRedfd dSd edTedfd dUdedVfd dWd edVed(fdodXd edYedZfd d[d ed\ed]fd^d_ded`fd dad edbedfd dcdeddfge_zedeeLjd;d;fdgZeLdhddBdedifdQdjdedkfd dldedmfd dXd ednedfdWddedofddd5edfdndpd5edqfd`ddedrfddsd edtedfdZdLd eduedNfdjdvdedwfdddedxfd dydedzfg ejzed{eLjsd|Z6d}ZeLd~dddedfdddedfdNddedfdFddedfdWddedfd]ddedfdQdjdedfdddedfdZd'ded(fdodeedfdddedfd7d8ded9fd dGgededIfd d%d ededIfgeSze_zeWzed?eLjd;d;eNh(dZeLdd ddedfgdeLjd;eNh3dZeLddTddedfd`ddedfdFdGd ededIfd ddedfdddedfddsd ededfgeUzedeLjsdZeLd~eWd eLjeNhdZ;eLddjdvdedfdddedfgeXzedeLjsdZeLddQddedfgedeLjsdZeLddNd:dedfd]ddedfdddedfdndpdedfdZdLd ededNfdodd edfd dXd ededfgedeLjsdZe9j ddd;e7jTe7jVedeLddddedfd]ddedfddvdedfdWdXd ed.edfdFdGd ededIfge]zedeLjd;<dƐdZKeLddgeLj sdZ@eLd/geWzeLjd;eNhud„ZdÄZy(N)_)hexnullidnullrevshortwdirrev)open).archival bookmarksbundle2 bundlecaches changegroupcmdutilcopies debugcommandsdestutil discoveryencodingerrorexchange extensions filemerge formattergraphmodgrephbisecthelphg logcmdutilmerge mergestate narrowspecobsoleteobsutilpatchphasespycompatrcutil registrar requirements revsetlang rewriteutilscmutilservershelvestate streamclonetagsuiutilverifyvfswireprotoserver)dateutilprocutil stringutilurlutilRs repositorys8repository root directory or name of overlay bundle filesREPOscwdschange working directorysDIRysnoninteractivesBdo not prompt, automatically pick the first choice for all promptsqsquietssuppress outputvverbosesenable additional outputscolors9when to colorize (boolean, always, auto, never, or debug)sTYPEconfigs5set/override config option (use 'section.name=value')sCONFIGsdebugsenable debugging outputsdebuggersstart debuggersencodingsset the charset encodingsENCODEs encodingmodesset the charset encoding modesMODEs tracebacks%always print a traceback on exceptionstimestime how long the command takessprofilesprint command execution profileversions#output version information and exithhelpsdisplay help and exitshiddenFsconsider hidden changesetsspagersautos2when to paginate (boolean, always, auto, or never)abortT) helpcategory helpbasicc |jd}tj|}|stjt d|j s;tjt d|jz|j|r(|jt d|jzy|j ||S)zabort an unfinished operation (EXPERIMENTAL) Aborts a multistep operation like graft, histedit, rebase, merge, and unshelve if they are in an unfinished state. use --dry-run/-n to dry run the command. dry_runno operation in progresss.%s in progress but does not support 'hg abort'hints %s in progress, will be aborted N) getrgetunfinishedstater StateErrorr abortfunc InputError_opnamerNstatus)r4repooptsdryrun abortstates 6usr/lib/python3.12/site-packages/mercurial/commands.pyabortr[sXXi F++D1J q!<=>>   CD%%'"    2 3z7I7I J     D ))r>adds[OPTION]... [FILE]...)rHrI inferrepoc |j5|jj|5tj|d|t j |}tj|d}tj|||d|dfi|}|xrdxsdcdddcdddS#1swYnxYwdddy#1swYyxYw)aadd the specified files on the next commit Schedule files to be version controlled and added to the repository. The files will be added to the repository at the next commit. To undo an add before that, see :hg:`forget`. If no names are given, add all files to the repository (except files matching ``.hgignore``). .. container:: verbose Examples: - New (unknown) files are added automatically by :hg:`add`:: $ ls foo.c $ hg status ? foo.c $ hg add adding foo.c $ hg status A foo.c - Specific files to be added can be specified:: $ ls bar.c foo.c $ hg status ? bar.c ? foo.c $ hg add bar.c $ hg status A bar.c ? foo.c Returns 0 if all files are successfully added. NTlegacyrelativevaluer>Frr) wlockdirstatechanging_filesr.matchr( byteskwargs getuipathfnradd)r4rVpatsrWmuipathfnrejecteds rZrgrgsf t}}33D9 MM$t*dH,@,@,F G&&tF;;r4C5IDI~A" :999s#B>A)B) B>)B2 .B>>C addremove)rHr]c tj|}|jdsd|d<|j5|jj |5t j|d||}t j||}t j||}t j||d||cdddcdddS#1swYnxYwdddy#1swYyxYw)aadd all new files, delete all missing files Add all new files and remove all missing files from the repository. Unless names are given, new files are ignored if they match any of the patterns in ``.hgignore``. As with add, these changes take effect at the next commit. Use the -s/--similarity option to detect renamed files. This option takes a percentage between 0 (disabled) and 100 (files must be identical) as its parameter. With a parameter greater than 0, this compares every removed file with every added file and records those similar enough as renames. Detecting renamed files this way can be expensive. After using this option, :hg:`status -C` can be used to check which files were identified as moved or renamed. If not specified, -s/--similarity defaults to 100 and only renames of identical files are detected. .. container:: verbose Examples: - A number of files (bar.c and foo.c) are new, while foobar.c has been removed (without using :hg:`remove`) from the repository:: $ ls bar.c foo.c $ hg status ! foobar.c ? bar.c ? foo.c $ hg addremove adding bar.c adding foo.c removing foobar.c $ hg status A bar.c A foo.c R foobar.c - A file foobar.c was moved to foo.c without using :hg:`rename`. Afterwards, it was edited slightly:: $ ls foo.c $ hg status ! foobar.c ? foo.c $ hg addremove --similarity 90 removing foobar.c adding foo.c recording removal of foobar.c as rename to foo.c (94% similar) $ hg status -C A foo.c foobar.c R foobar.c Returns 0 if all files are successfully added. similaritys100Nr_r>) r(rerOrarbrcr.rdanypatsrf addremove)r4rVrhrWmatcherrelativerjs rZrprpsJ    %D 88M "$] t}}33D9--T D$7??4.&&tJ  wXtD :999s$C A C 8 C  C C  C)sannotate|blamerrevsannotate the specified revisionsREVfollows8follow copies/renames and list the filename (DEPRECATED)s no-followsdon't follow copies and renamesatextstreat all files as textuuserslist the author (long with -v)ffileslist the filenameddateslist the date (short with -q)nnumbers"list the revision number (default)c changesetslist the changesetls line-numbers(show line number at the first appearanceskips$revset to not display (EXPERIMENTAL)s3[-r REV] [-f] [-a] [-u] [-d] [-n] [-c] [-l] FILE...c  &'()tj|stjt dj drdd<j ds8j ds'j dsj dsdd<j d d u}|r@j ds/j dstjt d j d }|rt j|gd tj|&|jd|jd}|jrtj)nd)|jrtj }ntj"}&j%$j dr&fd}n&fd}&)fd} ndj&})} ddd|j(fd dd|fddd| fdddt+j,|fdddtj.fdddtj.fg} dddd d(|j1rd } nd!} |j3'| D cgc]7\} } }}j (j | | s| 'vr | ||| f9}}} } }|d"d"d#f|d"<dj5'(fd$| D}d%}t j6&||&}j d' }t9j:|dd(}j d)}|rtj<|}t j>d*}&jA|D]B}&|}|jC|jE|+j d,s4|jGr$|jIt d-||zp|jKd.d/0}|jM|||1}|s|jOg}g}|D]\}} |Dcgc] }|| } }|j1rY| D!cgc]}!tQjR|!}"}!tU|"}#|jW|"D$cgc]}$| d|#|$z zzd2zc}$n|jWd2gtY| z|jW| t[t[|t[||D]\}}%}|jC|j]|j^3|j`|d#j5|g|%|jbrd4}nd5}|jad6||jd|d7jdjgd8s|jId8|jOE|jOy cc}}} } wcc}wcc}!wcc}$w)9a show changeset information by line for each file List changes in files, showing the revision id responsible for each line. This command is useful for discovering when a change was made and by whom. If you include --file, --user, or --date, the revision number is suppressed unless you also include --number. Without the -a/--text option, annotate will avoid processing files it detects as binary. With -a, annotate will annotate the file anyway, although the results will probably be neither useful nor desirable. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions. See also :hg:`help templates`. :lines: List of lines with annotation data. :path: String. Repository-absolute path of the specified file. And each entry of ``{lines}`` provides the following sub-keywords in addition to ``{date}``, ``{node}``, ``{rev}``, ``{user}``, etc. :line: String. Line content. :lineno: Integer. Line number at that revision. :path: String. Repository-absolute path of the file at that revision. See :hg:`help templates.operators` for the list expansion syntax. Returns 0 on success. s,at least one filename or pattern is requiredruTr{ryrr}rs line_numberNs(at least one of -n/-c is required for -lrtnowarnsannotatec |ddS)N )hs rZshorthexzannotate..shorthexs Sb6Mr>cb|tk(r!djjzSd|zS)N%dr p1revrctxs rZ formatrevzannotate..formatrevs+'> 3668<<>11 3;&r>cb|tk(r!djjzSd|zS)Ns%d+s%d rrs rZrzannotate..formatrevs+'>!CFFHLLN22!C<'r>c|jjk(r0dtjj zSd|zS)Ns%s+%s ) nodeconstantswdirhexrrnode)rrrVrs rZ formathexzannotate..formathexsGD&&...SVVX]]_)= >>> ++r>r c6|jjSN)fctxuserxs rZzannotate..!&&++-r>c@tj|jSr)r.intrevrrs rZrzannotate..s!7r>nodecRttj|jSr)rr.binnoderrs rZrzannotate..s#gooaff&=">r>c6|jjSr)rdaters rZrzannotate..rr>pathc6|jjSr)rpathrs rZrzannotate..rr>lineno:c|jSr)linenors rZrzannotate..sAHHr>)rtrrrcfdS)Nc |Srr)rfmtrOs rZrz,annotate..makefunc..s SQ[r>rrOrs``rZmakefunczannotate..makefuncs ( (r>c|Srrrs rZrzannotate..makefuncsJr>rr>c3vK|]0\}}}}jj||s|vr|2ywrrO).0fnseprOrdatahint opnamemaprWs rZ zannotate.. s?!& BS# 88IMM"b) *bHn !&s69c6tjd||fz)Ns%s: %s)rrSrys rZbadzannotate..badsyAq6122r>)badfns no_follow)section whitespacerr_rrws%s: binary file sliness {rev}: {line}tmpl)followskiprevsdiffopts%s)rs* %ss: %ssline )4r(rerrSrrOr.unhidehashlikerevsr revsinglepagerr debugflagidentityquietr9 shortdatedatestrr__mod__ shortuserr5 cachefuncbytestrisplainrjoinrdr&difffeatureoptsrevrangerfwalk startitemdataisbinaryplainnestedannotateendrcolwidthmaxappendlenzipcontextrwriteskiptextendswith)*r4rVrhrW linenumberrrootfmdatefuncrropmaprrrrOrfuncmapfieldsrrirrrrjabsrfmlinesformatspiecesfnlrsizesmlwprrrrs* ` ` @@@@rZrrVs]Z    %D  = >   xx W  HHW &!!Y.)5J,')$q!LMNN ((6 C ))$yA   tS )CHH[ \\+t ,F ||$$  xx%%## wwy 88L ! ' (  ,MM   $/> 7C $> J $/1IJ $/1A1AB D,h.>.>?  E! I~~ )   H"'!& BS# 88IMM"b) *bHn #s S!!&  !*Q-%GAJ YY!&F 3  c4S1A,' 'F$$ D+$Hxx H&&tX6""4TBHxx{3x  xx T]]_ LL/08C=@ A  ]]8*:] ; Hx  FFH FAs$%u!1uA%zz|789q!**1-q9ZuMu!db1fo 5 =uMNwQ/0 MM! 3=#v,>GAq! LLN JJAFFJ # BHHVSXXa[ -1 -vv HHWc166 *?Ry~~&&u- HHUO QT JJLIZ&9Ms7backoutmerges,merge with old dirstate parent after backoutcommits4commit if no conflicts were encountered (DEPRECATED)s no-commits do not commitparents4parent to choose when backing out merge (DEPRECATED)srevision to backouteedits invoke editor on commit messagess[OPTION]... [-r] REVc |j5|j5t||||fi|cdddcdddS#1swYnxYwdddy#1swYyxYw)axreverse effect of earlier changeset Prepare a new changeset with the effect of REV undone in the current working directory. If no conflicts were encountered, it will be committed immediately. If REV is the parent of the working directory, then this new changeset is committed automatically (unless --no-commit is specified). .. note:: :hg:`backout` cannot be used to fix either an unwanted or incorrect merge. .. container:: verbose Examples: - Reverse the effect of the parent of the working directory. This backout will be committed immediately:: hg backout -r . - Reverse the effect of previous bad revision 23:: hg backout -r 23 - Reverse the effect of previous bad revision 23 and leave changes uncommitted:: hg backout -r 23 --no-commit hg commit -m "Backout revision 23" By default, the pending changeset will have one parent, maintaining a linear history. With --merge, the pending changeset will instead have two parents: the old parent of the working directory and a new child of REV that simply undoes REV. Before version 1.7, the behavior without --merge was equivalent to specifying --merge followed by :hg:`update --clean .` to cancel the merge and leave the child of REV as a head to be merged separately. See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help revert` for a way to restore files to the state of another revision. Returns 0 on success, 1 if nothing to backout or there are unresolved files. N)ralock _dobackout)r4rVrrrWs rZbackoutr s@j tyy{"dD#66#{{{s!AA AA AA"c tj|dddgtj|}|r rt j t d|s}|st j t d|jd}|rtj||d<tjtjtj|}|jjj!\}}j"j%|st j t dj"j!\} } | j&k(rt j t d| j&k7r|jd st j t d j)|d } | | | fvr5t j t d t+| t+fz| } n1|jd rt j t d | } jj-} j/| }t1jt3| }|jd s|k7rj5d5d|jddi}|j7|d5t9j:|| }dddj=||dddt?j@|jBr~jDjGt dyt?jHdjjK| jMtjN|||jdr)t d}|jG|t+zyfd}j"jQ}tjR||g|}|s|jGt dytjT|| ||fd}|jGt d|||fz|jd r|k7rt?jH|d|jGt d||zd|jddi}|j7|d5t?jVdcdddSy#1swY6xYw#1swY)xYw#1swYyxYw) N no_commitcommitr! please specify just one revisions$please specify a revision to backoutr}s-cannot backout change that is not an ancestors'cannot backout a change with no parentsrs cannot backout a merge changesets%s is not a parent of %ss*cannot use --parent on non-merge changesetrruis forcemergetoolr>)parents1use 'hg resolve' to retry unresolved file merges rF show_stats no_commits1changeset %s backed out, don't forget to commit. rcd}tjd d|itj|}|s%dt z}tjd|}|j ||j d|j d||S) NreditformsBacked out changeset %sT)editr-ryr}editorr)rgetcommiteditorr( strkwargsrr#rO)r4rVmessagerdrWr-ers rZ commitfuncz_dobackout..commitfuncQs  # #  !)!3!3D!9 05;>G''THEA{{ TXXg&(95  r>nothing changed cVdjj|t|fzS)Ns%d:%s) changelogrr)rrVs rZnicez_dobackout..nicegs&4>>--d3U4[AAAr>s$changeset %s backs out changeset %s smerging with changeset %s tip),rcheck_incompatible_argumentsr(rerrSrrOr9 parsedatecheckunfinished bailifchangedr rrrbparentsr8 isancestorrlookuprbranch branchheadsr.r transactionconfigoverridemergemodback_out setparentsr _showstatsunresolvedcountr4rUclean setbranchcurrenttransactionreverttipr# commitstatusr!)r4rVrrrWrrop1op2rp2rr(rBbheadsrctx overridesstatsmsgr5rOnewnoder9s `` rZrrsu (({Xw> $ $T3 / > ?  ^^ # #D )FB T[[q!KLMM T[[xx """1%H#IJ J KKY ( RH ""-.%(E$K1HH  88I ""?@ ]] ! ! #F   f %F   T3v; /D 88H #+   j )/'31GHI""9j9 ))#d6lC: OOC % * dE"  GGNNGH  t. (?(?(ABr4& xx EF #d #$   ..   CnnRz2t| dk(rd}n6d}n3|rtjtd|| j||t || |||d} | Dcgc] }| |s | }}t |d kDr6tjtd tt|d d z|rtj|ytj|}| r{tj|| }|d}|d}|r0|r.|jd ||}||jd ||z }||z}|Dcgc]}|jj!|}}n|j#dg}|s|s|rP|r|dxx|z cc<n|r|dxx|z cc<n|r |dxx|z cc<tj$|||dr|dsyd% fd }tj&||i}|rd } r |dd }nJ|j,j/\}}||j0k7rtj*td| r6|stjtd||dj!}tj2|||5|r+|g|d<tj$|||j5|dt7|id}|dk(rd}nV|d k(rd}nN|dk(r!tj8td|z|d kr!tj8td|zd}||j|||}t;j<||d}|j?td||fztj@|tjB||\}}} |d }|||d |r+dddtjD||||| ytj@|tjB||\}}}| r|stjF||||}!|!s|jItd!t;j<||!dz|!j!g|d<tj$|||||!j!Stj*td"|d k(rtjD||||||yt |d k(sJ|d }d#\}"}#|#|kr|"d z|#d z}#}"|#|kr|jjK|} t;j<||| d}|jItd$|||"fz|g|d<tj$|||||Scc}wcc}w#t($rtj*tdwxYw#1swYxYw)&a subdivision search of changesets This command helps to find changesets which introduce problems. To use, mark the earliest changeset you know exhibits the problem as bad, then mark the latest changeset which is free from the problem as good. Bisect will update your working directory to a revision for testing (unless the -U/--noupdate option is specified). Once you have performed tests, mark the working directory as good or bad, and bisect will either update to another candidate changeset or announce that it has found the bad revision. As a shortcut, you can also use the revision argument to mark a revision as good or bad without checking it out first. If you supply a command, it will be used for automatic bisection. The environment variable HG_NODE will contain the ID of the changeset being tested. The exit status of the command will be used to mark revisions as good or bad: status 0 means good, 125 means to skip the revision, 127 (command not found) will abort the bisection, and any other non-zero exit status means the revision is bad. .. container:: verbose Some examples: - start a bisection with known bad revision 34, and good revision 12:: hg bisect --bad 34 hg bisect --good 12 - advance the current bisection by marking current revision as good or bad:: hg bisect --good hg bisect --bad - mark the current revision, or a known revision, to be skipped (e.g. if that revision is not usable because of another issue):: hg bisect --skip hg bisect --skip 23 - skip all revisions that do not touch directories ``foo`` or ``bar``:: hg bisect --skip "!( file('path:foo') & file('path:bar') )" - forget the current bisection:: hg bisect --reset - use 'make && make tests' to automatically find the first broken revision:: hg bisect --reset hg bisect --bad 34 hg bisect --good 12 hg bisect --command "make && make tests" - see all changesets whose states are already known in the current bisection:: hg log -r "bisect(pruned)" - see the changeset currently being bisected (especially useful if running with -U/--noupdate):: hg log -r "bisect(current)" - see all changesets that took part in the current bisection:: hg log -r "bisect(range)" - you can even get a nice graph:: hg log --graph -r "bisect(range)" See :hg:`help revisions.bisect` for more about the `bisect()` predicate. Returns 0 on success. )r]r_r[inits)(use of 'hg bisect ' is deprecated) r]Tr_sincompatible argumentsN)s--bads --commands--extends--goods--resets--skiprs%s and %s are incompatiblers (%ln)::(%ln).rcrytj|tj|tj|||S)zcommon used update sequenceNr))rr=r>rrK)rVrr*noupdates rZ mayupdatezbisect..mayupdate(s8  %d#xxdz::r>scurrents>current bisect revision is unknown - start a new bisect to fixs"current bisect revision is a mergeempty revision setrsHG_NODEs bisect_check)environ blockedtag}sfailed to execute %ss %s killedrZschangeset %s: %s Fr)s!Extending search to changeset %s snothing to extend)rres:Testing changeset %s (%d changesets remaining, ~%d tests) )T)&warnrrrrSboolrtuplesortedr resetstate load_stater rrevsr8rrA save_statechangesetdisplayer LookupErrorrQrbr?r restore_statesystemrAbortrformat_changeset_summaryrU checkstatebisect printresult extendrangerr)$r4rV positional_1 positional_2commandresetgoodrrextendrhrcmd incompatiblesrenabledr1ru goodnodesbadnodes candidatesinodesri displayer changesetsrrSrU transitionrsummarybgood extendctxtestssizes$ ` rZr~r~ws d C;; ?@A < '>D F]CE q!:;<<  ! < 7m M(<-Q=+;q-G< 7|a + ,uVG_Qq5I/J J   4    t $E ""4-'N = ?IxHJ $))OXyI IJ$D156A$$Q'6T"# sd  'Ne #N  &MU "M  'Ne #N4'g5= ;--b$;I  Z(+}},,.HD"T[[ &&q)N'OPP &&q)>'?@@b ?'')D  " "4 5%)Fj!""4/'T3.# S=!(Jq[!(Js]++a(?&@7&JKKaZ++a o&?@@!'Jj!((.4j!::2sIN !12gz5JJK""5)+2>>$+F(z5Qx$7;6> BeYuE u&nnT59E:t ++D%EI$;<66r9iPQ&/^^%5$6j!""4/ y~~'788q!5677QBeYtD5zQQx tj !)TAX4Ej nn  &222tCy)L  :  E*  + "Fj4't$$U=*7> &&5 6 5s+ V8V8+"V=W?D-W-(W*-W7sbookmarks|bookmarkforcesrevision for bookmark actiondeletesdelete a given bookmarkmrenamesrename a given bookmarksOLDiinactivesmark a bookmark inactivelistslist existing bookmarkss#hg bookmarks [OPTIONS]... [NAME]...c Ztj|}|jd}|jd}|jd}tj|ddd}|rtj ||dgn|s|rd}n|rd}nd}tj |dddg|s"|dvrt jtd |d vr|j5|j5|jd 5}|dk(rCtj|jj|}tj |||n!|dk(r|st jtd t#|d kDrt jtd|jj|d} tj$||| |d||n|dk(rtj&||||||nt|dk(rot#|jdk(r|j)tdn<|j*s|j)tdntj,|dddddddddy|dk(r^tj|jj|}|j/d|5} tj0||| |dddyt j2d|z#1swYxYw#1swYxYw#1swYyxYw#1swYyxYw)axcreate a new bookmark or list existing bookmarks Bookmarks are labels on changesets to help track lines of development. Bookmarks are unversioned and can be moved, renamed and deleted. Deleting or moving a bookmark has no effect on the associated changesets. Creating or updating to a bookmark causes it to be marked as 'active'. The active bookmark is indicated with a '*'. When a commit is made, the active bookmark will advance to the new commit. A plain :hg:`update` will also advance an active bookmark, if possible. Updating away from a bookmark will cause it to be deactivated. Bookmarks can be pushed and pulled between repositories (see :hg:`help push` and :hg:`help pull`). If a shared bookmark has diverged, a new 'divergent bookmark' of the form 'name@path' will be created. Using :hg:`merge` will resolve the divergence. Specifying bookmark as '.' to -m/-d/-l options is equivalent to specifying the active bookmark's name. A bookmark named '@' has the special property that :hg:`clone` will check it out by default if it exists. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions such as ``{bookmark}``. See also :hg:`help templates`. :active: Boolean. True if the bookmark is active. Examples: - create an active bookmark for a new line of development:: hg book new-feature - create an inactive bookmark as a place marker:: hg book -i reviewed - create an inactive bookmark on another changeset:: hg book -r .^ tested - rename bookmark turkey to dinner:: hg book -m turkey dinner - move the '@' bookmark from another branch:: hg book -f @ - print only the active bookmark name:: hg book -ql . rrtrrrrr\>r\rsbookmark name required>r\rrrbookmarksnew bookmark name requiredrs"only one new bookmark name allowedrsno bookmarks set sno active bookmark N bookmarkssinvalid action: %s)r(rerOrcheck_at_most_one_argr;rrSrrarrDmaplist _bookmarks expandnamer deleterrename addbookmarksrU_activebookmark deactivaterprintbookmarksProgrammingError) r4rVnamesrWforcerinactiveactiontroldnamers rZbookmarkrsT    %D HHX E ((6 Cxx $H  * *4Iw OF ,,T6F8D #  (( kIw/ V22q!:;<< << ZZ\499;(8(8(E" (()C)CUK  r519$**1-J+KLLZ!^**?@//44T)_E  r7E!HeXN6!&&tRUHM;&t'1,IIa 567--IIa 789((.+)F;\\, 7   !;!;UC \\, -  $ $Rr5 9. -$$%:V%CDD7)F(E;;\\0. -sIL-L ?E*K=)L 1LL!=L L  L LL!L*branchs5set branch name even if it shadows an existing branchCcleans'reset branch name to parent branch names0change branches of the given revs (EXPERIMENTAL)s [-fC] [NAME]c tj|}|jd}|r|j}|jdsO|sM|rt j t d|jd|jjzy|j5|jdr\|dj}|jj||j|jt d|znV|rStj||d|r"t!j"|||||cdddS|jd sl||j%vrZ||dj'Dcgc]}|jc}vr)t j t d t d  |jj||j|jt d |z|j%j)D]\}}}} |dk7s| rdddy|jt ddddycc}w#1swYyxYw)aset or show the current branch name .. note:: Branch names are permanent and global. Use :hg:`bookmark` to create a light-weight bookmark instead. See :hg:`help glossary` for more information about named branches and bookmarks. With no argument, show the current branch name. With one argument, set the working directory branch name (the branch will not exist in the repository until the next commit). Standard practice recommends that primary development take place on the 'default' branch. Unless -f/--force is specified, branch will not let you set a branch name that already exists. Use -C/--clean to reset the working directory branch to that of the parent of the working directory, negating a previous branch change. Use the command :hg:`update` to switch to an existing branch. Use :hg:`commit --close-branch` to mark this branch head as closed. When all heads of a branch are closed, the branch will be considered closed. Returns 0 on success. rtrs*no branch name specified for the revisions%s Nrfs%reset working directory to branch %s rrs(a branch of the same name already existssuse 'hg update' to switch to itrMs&marked working directory as branch %s defaultrs>(branches are permanent and global, did you want a bookmark?) )r(rerOstriprrSrrrbrBrarLrMrUr. checknewlabelr changebranch branchmapr? iterbranches) r4rVlabelrWrurrrtcs rZrBrBsb    %D 88F D   88H e ""?@  4==//112  88H J%%'E MM # #E4+B+B+D E IIaABUJ K   ! !$y 9++BdE4H 88H%%4>>3C*CT$Z5G5G5I J5I5I JJ**EFAB MM # #E4+B+B+D E IIaBCeK L#nn.;;= 1a ?13 .> II3 5 !K s8)B"I;9I;I6%BI;I;I;I;6I;;Jbranchesactives8show only branches that have unmerged heads (DEPRECATED)closedsshow normal and closed branchess$show branch name(s) of the given revs[-c])rHintentsc tj|}|jd}d}|rHtj||}|j j }|Dchc] }||d}}|jd|jd|} | j} t|j} g} |jjD]a\} }}}|| |vrd}|s6t|jj|}t|| z}| j!| |||| fc| j#dd| D]_\} }}}|r|s|rd }d }n |s|sd }t%d }n d }t%d}| |j&j)k(}|rd}| j+| j-dd| ||j/}t1dt3d|zz t5j6| z d}d|zdz}| j9|j: d||| |j=d|j?z| jA|| jC|| ||j:s| jE|| jEdb| jGycc}w)alist repository named branches List the repository's named branches, indicating which ones are inactive. If -c/--closed is specified, also list branches which have been marked closed (see :hg:`commit --close-branch`). Use the command :hg:`update` to switch to an existing branch. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions such as ``{branch}``. See also :hg:`help templates`. :active: Boolean. True if the branch is active. :closed: Boolean. True if the branch is closed. :current: Boolean. True if it is the current branch. Returns 0. rtNrrFcB|d|dj|d|dfS)Nrerrr)rs rZrzbranches..s#1qtxxz1Q41 >r>T)keyreversesbranches.activer>sbranches.closeds (closed)sbranches.inactives (inactive)sbranches.currentrrrrrs %d:%srev nodeslog.changeset changeset.%sr)activeclosedcurrentr)$r(rerOr rrevbranchcache branchinforrhexfuncsetheadsrriteropenrprsortrrbrBrrrrrrr condwriterrphasestrrrrr)r4rVrrrWruselectedbranchesgetbirrrallheadsbranchestagrrOisclosedisactive openheadsrisopenrnoticerrpadsizers rZrrnsR    %D 88F D ""4.##%00156AE!HQK6HH[ k4 (BjjG4::< HH%)^^%5%B%B%D!UC  'C7G,G DNN,55e<=II01Hd3ix<@A&E MM>MM&."S(F (  &EF&E|_F(E~&F--// 'E  E3e4ggib3us{++h.?.?.DDaHWny( L    CHHJ /#,,.@   s  xF GDxx HHV  G'/HFFHm7sK bundleexacts,compute the base from the revision specifieds*run even when the destination is unrelateds3a changeset intended to be added to the destinations*a specific branch you would like to bundlesBRANCHbases;a base changeset assumed to be available at the destinationalls'bundle all changesets in the repositorybzip2sbundle compression type to usesD[-f] [-t BUNDLESPEC] [-a] [-r REV]... [--base REV]... FILE [DEST]...c  tj|}d}d|vr=|d}tj||}|r |st j t d|jddj} tj||d}|jd } | d k(r)t j t d t d  |jdr~|rt j t d|jdr|jt d|jdr|jt dtg} n|jdrh|rt j t d|jdr|jt d|j!d||} | s-tg} n%tj||jd} | t#j$|vr!t j&t d| z| r|rt j t d|j(} | D cgc]} | j+| }} |r|Dcgc]}| j+|c}nd}t-j.|||}|j0}|j2}nt5}t5}t7j8|||D]}t;j<|||}|!|Dcgc]}||j?}}nd}|j@gf}t;jB||||\}}|xr tjD|jF|xs|}t-jH||||jdd}|jK|j0|jK|j2|stMjN||| xr|y|j!d|}|r9t d}t dtQ|z}t j&|| rt-j.||| }nt-j.||!}tS||_| d"k(rd#|jTz}d}n+| d$vrd%}|jT}nt jVd&| zi}|jYd'd(|jZz} | |jYd'd)} | | |d*<|jYd'd+|jZz}!|!|jYd'd,}!|!|!|d-<|j\}"|"d'd.}#|j_d/|#d0|"d'd1}$|j_d2|$d0|jjd3ds|"d'd4}%|j_d3|%d0tajb||d5||||j||6 y#tj$r8} t j tj| t d d} ~ wwxYwcc} wcc}wcc}w)7acreate a bundle file Generate a bundle file containing data to be transferred to another repository. To create a bundle containing all changesets, use -a/--all (or --base null). Otherwise, hg assumes the destination will have all the nodes you specify with --base parameters. Otherwise, hg will assume the repository has all the nodes in destination, or default-push/default if no destination is specified, where destination is the repositories you provide through DEST option. You can change bundle format with the -t/--type option. See :hg:`help bundlespec` for documentation on this format. By default, the most appropriate format is used and compression defaults to bzip2. The bundle file can then be transferred using conventional means and applied to another repository with the unbundle or pull command. This is useful when direct push and pull are not available or when exporting an entire repository is undesirable. Applying bundles preserves all changeset contents including permissions, copy/rename information, and revision history. Returns 0 on success, 1 if no changes found. Nrtsno commits to bundlerrF)stricts8see 'hg help bundlespec' for supported values for --typerMs cg.versionss1s0packed bundles cannot be produced by "hg bundle"s%use 'hg debugcreatestreamclonebundle'rs2--all is incompatible with specifying destinationsrs,ignoring --base because --all was specified rs-ignoring --exact because --all was specified s4--exact is incompatible with specifying destinationss.ignoring --base because --exact was specified sparents(%ld) - %lds-repository does not support bundle version %ss3--base is incompatible with specifying destinationsrT) onlyheadsrportablers%ln and _internal()s!cannot bundle internal changesetss%d internal changesets selected) missingroots ancestorsof)rs01sHG10)s02s03sHG20s)bundle: unexpected changegroup version %s experimentalsbundlecomplevel.sbundlecomplevelslevelsbundlecompthreads.sbundlecompthreadssthreadssevolution.bundle-obsmarkers obsolescence) overwrites$evolution.bundle-obsmarker:mandatorysobsolescence-mandatoryphasess bundle-phasesr) compressioncompopts)2r(rer rrrSrrOlowerrparsebundlespecUnsupportedBundleSpecificationrparamsrorrursupportedoutgoingversionsr{r8rroutgoingmissingexcludedrr<get_push_pathsrpeerrrB addbranchrevsrrAfindcommonoutgoingupdater.nochangesfoundrrrwirecompressionr configintr configbool set_paramr writenewbundle)&r4rVfnamedestsrWru revstrings bundletype bundlespecr4 cgversionbaseclrcommonrrrrrrotherhex_revsr head_revscheckoutbundled_internalrXrNbversion bcompressionr complevel compthreadscfgobsolescence_cfg obs_mand_cfg phases_cfgs& rZbundler s.Z    %D D ~&\ ""44 d""1%<#=> >'8,224J !11 *U !!-0IE A B;<   xx ""GH  88G  GGAFG H 88H  GGAGH Iy (  ""IJ  88G  GGAHI Jyy.d;9D""4'):; ==dCCkk > ?) K   ""HI ^^*./$3"''#,$/.2T*TT*%%dFE:""$$%5**4U;DGGD$-E3784aDGKKM48 R(H"$"2"2dHh# Ix=$$T[[)<  !33hhx( H NN8++ , OOH-- ./<2 r4T)>h?yy!7A4534s;K7LLkk#D)) %% wE %%dAx(HEZ777 n $!11 $$ 89 D  H ,z/E/EEILL2DE &,,.1G1GGKll?4HI * --C?,IJ*:eL(OPL!<5    E 2*:; Y eD      c  / /    Q NO   ^0*9s*:W>&Y YY>Y 3YY catooutputs(print output to file with formatted namesFORMATsprint the given revisionsdecodes apply any matching decode filters[OPTION]... FILE...)rHr]rc >tj|}|jd}|rtj||gd}t j ||}tj||f|z|}|jdd}tj|rd}|rtj|d|} n#|jd|jd|} | 5tj||||| |dfitj|cdddS#1swYyxYw)aoutput the current or given revision of files Print the specified files as they were at the given revision. If no revision is given, the parent of the working directory is used. Output may be to a file, in which case the name of the file is given using a template string. See :hg:`help templates`. In addition to the common template keywords, the following formatting rules are supported: :``%%``: literal "%" character :``%s``: basename of file being printed :``%d``: dirname of file being printed, or '.' if in repository root :``%p``: root-relative path name of file being printed :``%H``: changeset hash (40 hexadecimal digits) :``%R``: changeset revision number :``%h``: short-form changeset hash (12 hexadecimal digits) :``%r``: zero-padded changeset revision number :``%b``: basename of the exporting repository :``\``: literal "\" character .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions. See also :hg:`help templates`. :data: String. File content. :path: String. Repository-absolute path of the file. Returns 0 on success. rtrr#r>r!N)r(rerOr.rr rrdpoprisstdiofilenamer nullformatterrcatr2) r4rVfile1rhrWrrri fntemplaters rZr(r(sl    %D ((6 C ))$yA   tS )C cE8d?D1A)S)Jz*   $ $R 6  \\&$ ' {{ c1b*c 5=5G5G5M  s /DDsclonesEthe clone will include an empty working directory (only a repository) updaterevs%revision, tag, or branch to check outsEdo not clone everything, but include this changeset and its ancestorssQdo not clone everything, but include this branch's changesets and their ancestorspulls"use pull protocol to copy metadata uncompresseds!an alias to --stream (DEPRECATED)streams"clone with minimal data processings[OPTION]... SOURCE [DEST])rHrInorepoc tj|}tj|ddd\}}|j dr~t }t }|j dr$t j|j d}|j dr$t j|j d}tj|||||j d|j dxs|j d |j d |j dxs|j d |j d |j d |||j d xsd }|duS)amake a copy of an existing repository Create a copy of an existing repository in a new directory. If no destination directory name is specified, it defaults to the basename of the source. The location of the source is added to the new repository's ``.hg/hgrc`` file, as the default to be used for future pulls. Only local paths and ``ssh://`` URLs are supported as destinations. For ``ssh://`` destinations, no working directory or ``.hg/hgrc`` will be created on the remote side. If the source repository has a bookmark called '@' set, that revision will be checked out in the new repository by default. To check out a particular version, use -u/--update, or -U/--noupdate to create a clone with no working directory. To pull only a subset of changesets, specify one or more revisions identifiers with -r/--rev or branches with -b/--branch. The resulting clone will contain only the specified changesets and their ancestors. These options (or 'clone src#rev dest') imply --pull, even for local source repositories. In normal clone mode, the remote normalizes repository data into a common exchange format and the receiving end translates this data into its local storage format. --stream activates a different clone mode that essentially copies repository files from the remote with minimal data processing. This significantly reduces the CPU cost of a clone both remotely and locally. However, it often increases the transferred data size by 30-40%. This can result in substantially faster clones where I/O throughput is plentiful, especially for larger repositories. A side-effect of --stream clones is that storage settings and requirements on the remote are applied locally: a modern client may inherit legacy or inefficient storage used by the remote or a legacy Mercurial client may not be able to clone from a modern Mercurial remote. .. note:: Specifying a tag will include the tagged changeset but not the changeset containing the tag. .. container:: verbose For efficiency, hardlinks are used for cloning whenever the source and destination are on the same filesystem (note this applies only to the repository data, not to the working directory). Some filesystems, such as AFS, implement hardlinking incorrectly, but do not report errors. In these cases, use the --pull option to avoid hardlinking. Mercurial will update the working directory to the first applicable revision from this list: a) null if -U or the source repository has no changesets b) if -u . and the source repository is local, the first parent of the source repository's working directory c) the changeset specified with -u (if a branch name, this means the latest head of that branch) d) the changeset specified with -r e) the tipmost head specified with -b f) the tipmost head specified with the url#branch source syntax g) the revision marked with the '@' bookmark, if present h) the tipmost head of the default branch i) tip When cloning from servers that support it, Mercurial may fetch pre-generated data from a server-advertised URL or inline from the same stream. When this is done, hooks operating on incoming changesets and changegroups may fire more than once, once for each pre-generated bundle and as well as for any additional remaining data. In addition, if an error occurs, the repository may be rolled back to a partial clone. This behavior may change in future releases. See :hg:`help -e clonebundles` for more. Examples: - clone a remote repository to a new directory named hg/:: hg clone https://www.mercurial-scm.org/repo/hg/ - create a lightweight local clone:: hg clone project/ project-feature/ - clone from an absolute path on an ssh server (note double-slash):: hg clone ssh://user@server//home/projects/alpha/ - do a streaming clone while checking out a specified version:: hg clone --stream http://server/repo -u 1.5 - create a repository without changesets after a particular revision:: hg clone -r 04e544 experimental/ good/ - clone (and track) a particular named branch:: hg clone https://www.mercurial-scm.org/repo/hg/#stable See :hg:`help urls` for details on specifying URLs. Returns 0 on success. rbr+NNsnarrowincludeexcluder,r.r-rtrs shareoptssdepthN) pullstreamrurrB shareoptsstoreincludepatsstoreexcludepatsdepth) r(rerrrOrr# parsepatternsrclone)r4sourcerrW includepats excludepatsrs rZr;r;s=z    %D !!$ \B *K xx e e 88J $22488J3GHK 88J $22488J3GHK    XXg xx "?dhh&? XXf xx %BTXXk-B)Bxx "((<($$hhx (D A 9r>s commit|ciAs9mark new/missing files as added/removed before committings close-branchsmark a branch head as closedamends)amend the parent of the working directorysecrets#use the secret phase for committingdrafts"use the draft phase for committingsforce-close-branchs:forcibly close branch from a non-head changeset (ADVANCED) interactivesuse interactive modec*tj|ddtj|ddg|j5|j 5t ||g|i|cdddcdddS#1swYnxYwdddy#1swYyxYw)acommit the specified files or all outstanding changes Commit changes to the given files into the repository. Unlike a centralized SCM, this operation is a local operation. See :hg:`push` for a way to actively distribute your changes. If a list of files is omitted, all changes reported by :hg:`status` will be committed. If you are committing the result of a merge, do not provide any filenames or -I/-X filters. If no commit message is specified, Mercurial starts your configured editor where you can enter a message. In case your commit fails, you will find a backup of your message in ``.hg/last-message.txt``. The --close-branch flag can be used to mark the current branch head closed. When all heads of a branch are closed, the branch will be considered closed and no longer listed. The --amend flag can be used to amend the parent of the working directory with a new commit that contains the changes in the parent in addition to those currently reported by :hg:`status`, if there are any. The old commit is stored in a backup bundle in ``.hg/strip-backup`` (see :hg:`help bundle` and :hg:`help unbundle` on how to restore it). Message, user and date are taken from the amended commit unless specified. When a message isn't specified on the command line, the editor will open with the message of the amended commit. It is not possible to amend public changesets (see :hg:`help phases`) or changesets that have children. See :hg:`help dates` for a list of formats valid for -d/--date. Returns 0 on success, 1 if nothing changed. .. container:: verbose Examples: - commit all files ending in .py:: hg commit --include "set:**.py" - commit all non-binary files:: hg commit --exclude "set:binary()" - amend the current commit and set the date to now:: hg commit --amend --date now draftsecretr amendN)rrr;rar _docommit)r4rVrhrWs rZr#r#sgn !!$: ((zG9E tyy{T1D1D1#{{{s$B A4! B 4A= 9B  Bc ^ |jdrJ|jdtj||tddtj g|i|}|dk(rdS|S|jdr|j dddd tj|d |dj}|j|}|jj}i|jd s|jd rd d<|djrtj|d|tj |}|j#|} | j$s| j&s | j(r|j|d}n t+d} t-j.| |s!t-j.t+d|z||djk(rQ|dj1|vr<|jd s+t+d} t-j.t+d| |jdrf|dj3j|k7rB|dj5j|k7rt-j.t+d|jdr|j7ddrt-j.t+d|d} t9j:|| j=gdt?j@|t>jBstj|tjD||| ||} tj |}| | j1k(r|j#t+dyfd}tj |}tj|||||} | sotjF|||}|jHr1|j#t+dtK|jHzy|j#t+dytjL|| |||||jNs6|j7ddr#t#||ddddd|jd yyy)!N interactiveFrrr r&scommitsubreposTr)r# close_branchforce_close_branch1scloserf)rdrs1current revision is already a branch closing heads!branch "%s" has no heads to closesBuse --force-close-branch to close branch from a non-head changesetscan only close branch headsrMrGs+cannot amend with ui.commitsubrepos enabledr@r6c i}|jdrd|d<n|jdrd|d<|j}|j|d5|j|d5tj|dd}tj d d|it j|}|j||jd|jd|| cdddcdddS#1swYnxYw dddy#1swYyxYw) NrA)rs new-commitrBrs commit.normalr-ryr})r0extrar) rObaseuirEr mergeeditformr1r(r2r#) r4rVr3rdrWrVrQr-r0rPs rZr5z_docommit..commitfuncsIxx "8A 45(#8@ 45[[F&&y)<&&y)<&44T $4 H%44!)-5-?-?-EF ;;))%# '=<=<<<<=<LM&&s++""67&@  d4j'') )T !/HH12D""1%C#D4P P XXg T &&(F2JMMO**,6&&q)G'HII xx == 1 2""@A 4jTCGGI;9!!$(A(AB  # #D )}}RsE4>##D) 388:  IIa,- . 2##D)~~b$ D$?++D$=D|| *$,,' ( !012 tVVS$? 88 k3HI  XXk* J8r>sconfig|showconfig|debugconfig untrusteds$show untrusted configuration optionss exp-all-knowns+show all known config option (EXPERIMENTAL)sedit user configlocalsedit repository configsources"show source of configuration valueshareds3edit shared source repository config (EXPERIMENTAL)s non-shareds%edit non shared config (EXPERIMENTAL)globalsedit global configs[-u] [NAME]...)rH optionalreporc tjd}tfd|Drtjg|ddj dr>|st jtd|jjdg}nj drtj}nj d r|jst jtd tj|jvrt jtd t!j|j"jdg}nBj d r|jjd g}ntj$}|D]#}t&j(j+|s#nj drt,j.d}n8j drt,j.d}nt,j.d}|d}t1|d}|j3t5j6||j9|j;} |j=d| |fzt jtddy|j?d|jAd} tjBD]^\} }| dk(r|jEd|z | dk(r|jEd|d|dfzB| dk(rHt jFd| ztIj d} gx} }|r(|Dcgc] }d|vs| } }|Dcgc] }d|vs| }}tK|dk(xr| }tM| } tM|}d}d}|jNxsj d }|jQ| |!}|D]K\}}}|jS||| }tjT|}|jW||}| jYr|xsd"}|j[d#d$}|dz|z}|r || vs||vs}| j]| j_|d d%||r&| ja|&| j3d'd(|n| j3d)d*||tAjb|r| ja|+nEte|tfr5tid,|Dr#| ja| jk|d'&+d-}N| jm|ryycc}wcc}w).a2show combined config settings from all hgrc files With no arguments, print names and values of all config items. With one argument of the form section.name, print just the value of that config item. With multiple arguments, print names and values of all config items with matching section names or section.names. With --edit, start an editor on the user-level config file. With --global, edit the system-wide config file. With --local, edit the repository-level config file. With --source, the source (filename and line number) is printed for each config item. See :hg:`help config` for more information about config files. .. container:: verbose --non-shared flag is used to edit `.hg/hgrc-not-shared` config file. This file is not shared across shares when in share-safe mode. Template: The following keywords are supported. See also :hg:`help templates`. :name: String. Config name. :source: String. Filename and line number where the item is defined. :value: String. Config value. The --shared flag can be used to edit the config file of shared source repository. It only works when you have shared using the experimental share safe feature. Returns 0 on success, 1 if NAME does not exist. )rrfrirh non_sharedc3@K|]}j|ywrr)rorWs rZrzconfig.. s )1488A;srNrfs&can't use --local outside a repositoryshgrcrirhs,repository is not shared; can't use --sharedsNshare safe feature not enabled; unable to edit shared source repository configrlshgrc-not-sharedryrswbs%s "%s"s edit faileds config_edit)onerr errprefixrlrCrsread config from: %s sresources!read config from: resource:%s.%s sitemssunknown rctype: %srerfFs exp_all_knownrg) untrusted all_knownnoners\ns%s: namesvaluers name values%s=%s ) defaultvaluec3FK|]}tj|ywr)r isprintable)rr4s rZrzconfig..u s4 .:I ! !! $ls!T)7r(reanyrrrOrrSrr7rr) systemrcpathsharedr+SHARESAFE_REQUIREMENTvfsmod sharedpath userrcpathr rexistsuimod samplehgrcsr rr5 tonativeeolclose geteditorrzrr rccomponentsdebugrrprrr walkconfig configsourcer configdefaultrreplacerrrrx isinstancelistall formatlistr)r4rVvaluesrWeditoptspathsr samplehgrcfpr0rrrq selsections selentriesv uniqueselmatchedrr show_sourceentriesrruvaluer<rv entrynames ` rZconfigrs\    %DGH ) ))%%d:Xab\: 88H &&?@XX]]7+,E XXi '')E XXi ;;=&&EF119J9JJ&&J ZZ055g>?E XXm $XX]]#567E%%'EAww~~a xx ""..y9 (#"..x8 "..w7 aAaB HHT%%j1 2 HHJ FA; &""'%  HHY i &B##%1 < HH.2 3 +  HH:adAaD\I J (] (()>)BC C&TXXl+,I!!K* "(:&QDMq& :!'5A419a 5J1$8[Ik"KZJG%&I,,5$((9"5Kmmi9mEG 'u$ :  '''6 ::<&wFMM%0EdNT) 7k1Y*5L   [)Wf=  GGG # HHXw . HH]J 5 A   . GGG .  d +4 .:4 1  GG|(!KG L1!(2FFH M;5s/ U9U U Uscontinuec |jd}tj|}|stjt d|j s;tjt d|jz|j|r(|jt d|jzy|j ||S)zresumes an interrupted operation (EXPERIMENTAL) Finishes a multistep operation like graft, histedit, rebase, merge, and unshelve if they are in an interrupted state. use --dry-run/-n to dry run the command. rKrLs1%s in progress but does not support 'hg continue'rMs %s in progress, will be resumed N) rOrrPrrQr continuefuncrT continuemsgrU)r4rVrWrX contstates rZ continuecmdr sXXi F**40I q!<=>>  ! !FG$$&&&(    !89Y=N=NOP  ! !"d ++r>scopy|cpsforgets#unmark a destination file as copiedafters'record a copy that has already occurredsat-revs4(un)mark copies in the given revision (EXPERIMENTAL)s+forcibly copy over an existing managed files/[OPTION]... (SOURCE... DEST | --forget DEST...)ctj|}d}|jd}d}|r. 4==77=r>at_revNc*tjSrr5nullcontextmanagerrs rZrzcopy..context ..00r> r(rerOr rrrarcopyr4rVrhrWrrrs rZrr sX    %D=G ((9 C C ""4- 779  1"ggiDO wt}||BdD1%}}}s$: CB. C.B7 3CC s debugcommandss [COMMAND])rHr/cttjD]T\}}|jdd}dj |dDcgc]}|d c}}|j d||fzVycc}w)z'list all available commands and options|r, rs%s: %s N)rrtableitemssplitrr)r4rargsvalsrrWs rZrr slEKKM* Tiioa zza1A1Q412 T{*++1s A6 s debugcompletesoptionssshow the command optionss[-o] CMDc |jdrg}tg}|r2tj|td\}}|j |d|D]D}|D]=}d|dvr |dr|j d|dz|j d|dz?F|j d d j|zy tj|t\} } |jr/| jD cgc]} d j| d} } |j d d jt| zy cc} w) z=returns the completion list associated with the given commandoptionsFrs (DEPRECATED)rrs-%ss--%srrNr) rO globaloptsrfindcmdrrrr findpossibleverboserrr) r4rrWrotablesaliasesentryrrncmdlistunused_allcmdsrs rZ debugcompleter s  xx , $__S%?NGU NN58 $A"ad*Q4NN6AaD=1w1~.  5::g../%223>G^ zz,3NN,<=,s7Ediffsrevision (DEPRECATED)fromsrevision to diff fromsREV1tosrevision to diff tosREV2changeschange made by revisions<[OPTION]... ([-c REV] | [--from REV1] [--to REV2]) [FILE]...)rHrIr]rc Dtj|ddtj|}|j d}|j d}|j d}|j d}|j d}|j d} tj |dddgtj |dddg|rEt j||gd }tj||d } tj| } n|s|rKt j||g|gzd }tj||d } tj||d } n0t j||d }tj||\} } | r| } | } n| } | } tj||}t j| ||}|j|}|j!d tj"|||| | |||j d |j d  y )a diff repository (or selected files) Show differences between revisions for the specified files. Differences between files are shown using the unified diff format. .. note:: :hg:`diff` may generate unexpected results for merges, as it will default to comparing against the working directory's first parent changeset if no revisions are specified. To diff against the conflict regions, you can use `--config diff.merge=yes`. By default, the working directory files are compared to its first parent. To see the differences from another revision, use --from. To see the difference to another revision, use --to. For example, :hg:`diff --from .^` will show the differences from the working copy's grandparent to the working copy, :hg:`diff --to .` will show the diff from the working copy to its parent (i.e. the reverse of the default), and :hg:`diff --from 1.0 --to 1.2` will show the diff between those two revisions. Alternatively you can specify -c/--change with a revision to see the changes in that changeset relative to its first parent (i.e. :hg:`diff -c 42` is equivalent to :hg:`diff --from 42^ --to 42`) Without the -a/--text option, diff will avoid generating diffs of files it detects as binary. With -a, diff will generate a diff anyway, probably with undesirable results. Use the -g/--git option to generate diffs in the git extended diff format. For more information, read :hg:`help diffs`. .. container:: verbose Examples: - compare a file in the current working directory to its parent:: hg diff foo.c - compare two historical versions of a directory, with rename info:: hg diff --git --from 1.0 --to 1.2 lib/ - get change stats relative to the last change on some date:: hg diff --stat --from "date('may 2')" - diff all newly-added files that contain a keyword:: hg diff "set:added() and grep(GNU)" - compare a revision and its parents:: hg diff -c 9353 # compare against first parent hg diff --from 9353^ --to 9353 # same using revset syntax hg diff --from 9353^2 --to 9353 # compare against the second parent Returns 0 on success. rchangertrrrstatsreverserNrr root)rd listsubreposr)rrr(rerOr;r.rr r diff_parentrevpairr& diffalloptsrd narrowmatchrdiffordiffstat)r4rVrhrWrurfrom_revto_revrdrctx2ctx1ctxleftctxrightrris rZdiffr s` !!$x8    %D 88F D XXi Fxx H XXe_F 88G Dhhz"G ((w8KL ((uvy6IJ ))$)D##D&$7%%d+ V)) 8*x' ##D(D9##D&$7))$i@''d3 d  T*H dD$'A AHHW   XXk* XXg  r>exportBrs/export changes only reachable by given bookmarksBOOKMARKs switch-parentsdiff against the second parentsrevisions to exports*[OPTION]... [-o OUTFILESPEC] [-r] [REV]...)rHrIrc tj|}|jd}|t|jdgz }t j |dd|rF||j vr!tjtd|ztj||}n2|sdg}tj||d}tj||}|stjtdt|dkDr|j!tdn|j!td |jd }t j"|rd }|rt%j&|d |}n#|j)d |j%d |}|5t j*|||||jd t-j.||dddy#1swYyxYw)a dump the header and diffs for one or more changesets Print the changeset header and diffs for one or more revisions. If no revision is given, the parent of the working directory is used. The information shown in the changeset header is: author, date, branch name (if non-default), changeset hash, parent(s) and commit comment. .. note:: :hg:`export` may generate unexpected diff output for merge changesets, as it will compare the merge changeset against its first parent only. Output may be to a file, in which case the name of the file is given using a template string. See :hg:`help templates`. In addition to the common template keywords, the following formatting rules are supported: :``%%``: literal "%" character :``%H``: changeset hash (40 hexadecimal digits) :``%N``: number of patches being generated :``%R``: changeset revision number :``%b``: basename of the exporting repository :``%h``: short-form changeset hash (12 hexadecimal digits) :``%m``: first line of the commit message (only alphanumeric characters) :``%n``: zero-padded sequence number, starting at 1 :``%r``: zero-padded changeset revision number :``\``: literal "\" character Without the -a/--text option, export will avoid generating diffs of files it detects as binary. With -a, export will generate a diff anyway, probably with undesirable results. With -B/--bookmark changesets reachable by the given bookmark are selected. Use the -g/--git option to generate diffs in the git extended diff format. See :hg:`help diffs` for more information. With the --switch-parent option, the diff will be against the second parent. It can be useful to review a merge. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions. See also :hg:`help templates`. :diff: String. Diff content. :parents: List of strings. Parent nodes of the changeset. Examples: - use export and import to transplant a bugfix to the current branch:: hg export -r 9353 | hg import - - export all the changesets between two revisions to a file with rename information:: hg export --git -r 123:150 > changes.txt - split outgoing changes into a series of patches with descriptive names:: hg export -r "outgoing()" -o "%n-%m.patch" Returns 0 on success. rrtsbookmark '%s' not foundrfrs&export requires at least one changesetrsexporting patches: sexporting patch: r#r>rs switch_parent)r* switch_parentrWN)r(rerOrqrrrrrSrr. bookmarkrevsrr rrnoter&rr'rexportr&r)r4rVrrWrrur*rs rZrr sJ    %Dxx $H%,--J !!$ < 4?? *""1%?#@8#KL L##D(3J))$ IF""44 q!JKLL 4y1} )*+ '())$Jz*   $ $RD 9  \\)T *    !((#34""2t,   s ?G((G1rs%search the repository as it is in REV0print0s*end filenames with NUL, for use with xargsc "tj|}|jd}|rtj||gd}t j ||d}d}|jdrd}d|z}tj|||}|jdtj|jd } |jd|5} tj|||| | ||jd cdddS#1swYyxYw) aVlist tracked files Print files under Mercurial control in the working directory or specified revision for given files (excluding removed files). Files can be specified as filenames or filesets. If no files are given to match, this command prints the names of all files under Mercurial control. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions. See also :hg:`help templates`. :flags: String. Character denoting file's symlink and executable bits. :path: String. Repository-absolute path of the file. :size: Integer. Size of the file in bytes. Examples: - list all files under the current directory:: hg files . - shows sizes and flags for current revision:: hg files -vr . - list all files named README:: hg files -I "**/README" - list all binary files:: hg files "set:binary()" - find files containing a regular expression:: hg files "set:grep('bob')" - search tracked file contents with xargs and grep:: hg files -0 | xargs -0 grep foo See :hg:`help patterns` and :hg:`help filesets` for more information on specifying file patterns. Returns 0 if a match is found, 1 otherwise. rtrNrrrrTr_r )r(rerOr.rr rrdrrfrVrrfiles) r4rVrhrWrrrrrirjrs rZrr s\    %D ((6 C ))$yA   tS$ /C C xx  #+C c4&AHHX""388:4HH h %}} Q"c488K+@  & % %s *DDc tj|}|stjt d|j 5|j j|5tj|d||}|jd|jd}}tj|d}tj|||d|d|| d }ddddddxrd xsd S#1swYxYw#1swYxYw) aforget the specified files on the next commit Mark the specified files so they will no longer be tracked after the next commit. This only removes files from the current branch, not from the entire project history, and it does not delete them from the working directory. To delete the file from the working directory, see :hg:`remove`. To undo a forget before the next commit, see :hg:`add`. .. container:: verbose Examples: - forget newly-added binary files:: hg forget "set:added() and binary()" - forget files that would be excluded by .hgignore:: hg forget "set:hgignore()" Returns 0 on success. no files specifiedNdry_runrCTr_r>F)rrj explicitonlyrXrJrr)r(rerrSrrarbrcr.rdrOrfrforget) r4rVrhrWrirXrJrjrks rZrr sR    %D q!6788 t}}33D9 MM$t*dD 1"hhz2DHH^4L &&tF>>   #      : > Q:9s%C<"A4C0C<0C9 5C<<Dgraftsrevisions to grafts3base revision when doing the graft merge (ADVANCED)sresume interrupted graftsstopsstop interrupted graftsabort interrupted graftlogs append graft info to log messages9don't commit, just apply the changes in working directorys force graftDs currentdates&record the current date as commit dates currentusers$record the current user as committers[OPTION]... [-r REV]... REV...cn|j5t||g|i|cdddS#1swYyxYw)a copy changes from other branches onto the current branch This command uses Mercurial's merge logic to copy individual changes from other branches without merging branches in the history graph. This is sometimes known as 'backporting' or 'cherry-picking'. By default, graft will copy user, date, and description from the source changesets. Changesets that are ancestors of the current revision, that have already been grafted, or that are merges will be skipped. If --log is specified, log messages will have a comment appended of the form:: (grafted from CHANGESETHASH) If --force is specified, revisions will be grafted even if they are already ancestors of, or have been grafted to, the destination. This is useful when the revisions have since been backed out. If a graft merge results in conflicts, the graft process is interrupted so that the current merge can be manually resolved. Once all conflicts are addressed, the graft process can be continued with the -c/--continue option. The -c/--continue option reapplies all the earlier options. .. container:: verbose The --base option exposes more of how graft internally uses merge with a custom base revision. --base can be used to specify another ancestor than the first and only parent. The command:: hg graft -r 345 --base 234 is thus pretty much the same as:: hg diff --from 234 --to 345 | hg import but using merge to resolve conflicts and track moved files. The result of a merge can thus be backported as a single commit by specifying one of the merge parents as base, and thus effectively grafting the changes from the other side. It is also possible to collapse multiple changesets and clean up history by specifying another ancestor as base, much like rebase --collapse --keep. The commit message can be tweaked after the fact using commit --amend . For using non-ancestors as the base to backout changes, see the backout command and the hidden --parent option. .. container:: verbose Examples: - copy a single change to the stable branch and edit its description:: hg update stable hg graft --edit 9393 - graft a range of changesets with one exception, updating dates:: hg graft -D "2085::2093 and not 2091" - continue a graft after resolving conflicts:: hg graft -c - show the source of a grafted changeset:: hg log --debug -r . - show revisions sorted by date:: hg log -r "sort(all(), date)" - backport the result of a merge as a single commit:: hg graft -r 123 --base 123^ - land a feature branch as one changeset:: hg up -cr default hg graft -r featureX --base "ancestor('featureX', 'default')" See :hg:`help revisions` for more about specifying revisions. Returns 0 on successful completion, 1 if there are unresolved files. N)ra_dograft)r4rVrurWs rZgraftr s,R D04040 s+4c |r+|jdr|jtdt|}|j |jdi}g|d<t j ||t jd>ddi|}t j|dddd }|jd rt j|d gd tj|d }|jdr&t j|dgd t|||S|jdr0t j|dgd t j|||S|jdr d}|rtjtd|j!rt j"||}|jdr|d|d<|jdr|d|d<|jdrd|d<|jdr|jd|d <|jdr|jd|d<|d}|D cgc]} || j%}} nt j&|tdn`|stjtdt j(|t j*|t-j.||}t1} d} |jdrt-j2||dd} | E|j5d|D]0} |jtd| z| j7| 2|D cgc] } | | vs|  }} |sy| ,t9|dk7rtjtd|sj|jd sX| U|j5d!|}|D]$} |jtd"| || fz&|D cgc] } | |vs|  }} |syi}|j1d#|D]X}|j%||j;<|j=jd$}|sF|j%||<Z|j?d%|j5d&|d'j%|D]X} || }|j=jd$}||vr ||j%} | |vr6|jtd(| || | |fz|jC| z|||vs| /|jtd)|||||| ||dd*fzn/|jtd+|||||| || |dd*fz|jC|||j;|vs ||j;} | |vs$|jtd,| || | |fz|jC| [|sy|jd rd|d<|jdr|d|d<tE|j1d#|D]\}}d-|j%||jGjId.dd/fz}|jK|jM|jO|jMz}|r|d0d1jQ|zz }|jStd2|z|jd3r|j=jd$}i}|r||d$<|j;|d4<n|j;|d$<|jU}|jdr |d}||d<|jW}|jdr |d}||d<|jG}|jdr|d5|j;zz }d|d<|sd6|jd7d8i}| |jYn| }|j[|d5t]j^|||gd9}dddj`d/kDrt||dD cgc]} || j;}} ||d<d}|jc|||jtd:|jtd;yd }|jd r|je|||||<} | /|jtd=|j%|fz|jd|d}tg|tsJ|ji| |jd3s|jky/cc} wcc} wcc} w#tj@$rd} YwxYw#1swYrxYwcc} w)?NrsLwarning: inconsistent use of --rev might give unexpected revision ordering! snewnodesr-rr[stopcontinueFr")r. currentuser currentdatelog graftstate)r.rrrrrrTs&can't specify --continue and revisionsr}rryrrrr+rrsnodessno revisions specifieds%ld and merge()s'skipping ungraftable merge revision %d rrs&only one revision allowed with --base rs %ld & (::.)s!skipping ancestor revision %d:%s s%ldrgsscanning for duplicate grafts sonly(%d,ancestor(%ld))rfs3skipping revision %d:%s (already grafted to %d:%s) sKskipping already grafted revision %d:%s (%d:%s also has unknown origin %s) rsFskipping already grafted revision %d:%s (%d:%s also has origin %d:%s) sAskipping already grafted revision %d:%s (was grafted from %d:%s) s %d:%s "%s"rr (%s)rs grafting %s rKsintermediate-sources (grafted from %s)r%toolr>)rfrsparent of grafts,abort: unresolved conflicts, can't continue s-(use 'hg resolve' and 'hg graft --continue') )rrrrPr0s2note: graft of %d:%s created no changes to commit r)6rOrorrrrresolve_commit_optionsr1rr;statemodcmdstate _stopgraft abortgraftrrSrreadgraftstaterwrongtooltocontinuer=r>r rrrrurgrrrPrRepoLookupErrorremove enumerate descriptionrnodetagsr nodebookmarksrrUrrrrErFrrJsaver#rrr)r4rVrurW statedatar0cont graftstaterrskippedbasectxrr ancestorsidsrrposdescrr<rPrrr3rVrrW stateversionnns rZrrM s`    (   :DKK IIk ""2t,  $ $ ?h ?$ ?F !!$D D xx ,,   9 ""47J xx,,    "dJ// ' ,,    !!"dJ77 *  ""1%N#OP P    ..tZ@I}}W%(1V }}W%(1V }}V$"U }}\*$-MM,$?[!}}W%(}}W5V h'E167DJNN$D7  ' 'ak :""1%>#?@ @%d#""4.eGG xx&&tT&\4@99/6C GGAABSH I KK 7 0t!q/AtD 0 s4yA~q!JKLL DHHW%7?IInd3 C GGA;<T#Y?OO P 64a1I#54688FD)C WWYC N  *AA * 34996T 8H$OCs)C  *ACxQ A9GG<d1gsC0 1KKNVt^y!H #1vtCF|S#q"vF G!C #1vtCF|S#q!CR&I JKKA'c! N9GG:d1gsC0 1KKN[P\ xx "& , xx!&\ 'dhhvt45S GGI  OO  # #E1 -a 0    chhj)D,>,>sxxz,JJ  Htyy// /D !$%,- 88I  + %E) ,/GGIE( )"wwyE) xxz 88F ?@@ :D $IIa234IIa34txxz#2FG r>rs6use 'hg graft --continue' or 'hg graft --stop' to stop)r  clearablestopflag continueflagrRcmdhintgrepsend fields with NULsan alias to --diff (DEPRECATED)sEsearch revision differences for when the pattern was added or removedsCfollow changeset history, or file history across copies and renamess ignore-casesignore case when matchingsfiles-with-matchess-print only filenames and revisions that matchsprint matching line numberss*search files changed within revision ranges all-filess>include all files in the changeset while grepping (DEPRECATED)s&[--diff] [OPTION]... PATTERN [FILE]...c dtjdddgjdxsjdjd}jdsdd<jdxr&jd xrjd jd}rdgd<tj}jd r|tj z} t jj||d \jd rdxtj|||} | jt!j"|f d} fdd} t%j&|ddd||| } t%j(|| \} }j+dj-dt/j0}| j3| |D]B\}}}}| |||||}| xs|} |sr |r#| j5||j7D|j9| S#tj$r:}jtd tj|zYd}~y d}~wwxYw)asearch for a pattern in specified files Search the working directory or revision history for a regular expression in the specified files for the entire repository. By default, grep searches the repository files in the working directory and prints the files where it finds a match. To specify historical revisions instead of the working directory, use the --rev flag. To search instead historical revision differences that contains a change in match status ("-" for a match that becomes a non-match, or "+" for a non-match that becomes a match), use the --diff flag. PATTERN can be any Python (roughly Perl-compatible) regular expression. If no FILEs are specified and the --rev flag isn't supplied, all files in the working directory are searched. When using the --rev flag and specifying FILEs, use the --follow argument to also follow the specified FILEs across renames and copies. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions. See also :hg:`help templates`. :change: String. Character denoting insertion ``+`` or removal ``-``. Available if ``--diff`` is specified. :lineno: Integer. Line number of the match. :path: String. Repository-absolute path of the file. :texts: List of text chunks. And each entry of ``{texts}`` provides the following sub-keywords. :matched: Boolean. True if the chunk matches the specified pattern. :text: String. Chunk content. See :hg:`help templates.operators` for the list expansion syntax. Returns 0 if a match is found, 1 otherwise. all_filesrrrNTrswdir() ignore_cases grep: invalid match pattern: %s r)rrprint0r)rrrc  tj}|jr j}ntj }j rd}nd}d}tjfd} ddi} rtj||} n|D cgc]} d| f} } | D]\} } |j|j|j|jtj |j!d d d | dfdd | j"j%ddfg}r|j'dd| d| dk(rdndf|j)dd|j+j%ddfdd|j-j/|j%ddfg|D]M\}}}}}|r|j!d | j%||}|d|zz}|j1||||| Oj%ds`|j!d j%ds"| r|j!t3dn|j5dd | |j!d}j%ds|S|Scc} w)!Ns%Y-%m-%ds%a %b %d %H:%M:%S %Y %1%2Fc} tj|jjS#tj $rj cYSwxYwr)r;binaryreadfilenoderWdirUnsupportedr)flogrrgetfiles rZr"z%grep..display..binarys\2;D *!((3<<3C)DEE(( *2w'')) *s2>&A'&A's linenumberrr>r)rrs grep.filenamerrtr line_numberrrT+sgrep.inserted s grep.deleted ryrr}rsgrep.sepsgrep.%sfiles_with_matchesrs Binary file matchesstextss{text}r)r.rrrr(rrr5rgrepmoddifflinestatesrrrrrrlinenumrOrrr formatdaterrrr)rrrpstatesstatesr formatuserdatefmtfoundr" fieldnamemapiterrrcolsrurrcond extra_labelfieldrrdisplaymatcheseolr'rW plaingreprr4rjs `` rZdisplayzgrep..display snnS! ::<J!))J 88!G2G  *  *&y1 ))'6:D&,-fS!HfD-IFA LLN JJ3J  GGGOOC$89G C HHXb\)9H :]C8!IIHH]+  D !!T>*-  KK "388:.(   chhj':(  $7;2c4{HHS H4$((t4#zD'89 T5#t5 A 7; 8801K0xx'FHHHQ678"299XI9#FJ HHSMExx,- }| .s J=c*d}|jD]\}}||krB|j|jdd|j|||j d|j|jdd|j||d|j d|}|t |jkrB|j|jdd|j|d|j d|j y) NrrwrF)rs grep.matchrT)findposrrlinerrr)rrrrbr4regexps rZr:zgrep..displaymatchesRs IIf%DAq1u %!5& LLN HHWeQVVAa[ H F GGDG !A& s166{? LLN HHWeQVVABZ 0 GGEG " r>Fincludeexclude)rhrWrevspec include_pats exclude_patsrforce_changelog_traversalfilter_revisions_by_patsr)rr;rOreMIr5compilerrorr; forcebytestrr+ grepsearcher_getfiler.rfr walkopts makewalkerrrr(re searchfilesskipfilerr)r4rVpatternrhrWrrreflagsinstsearcherr=r3woptsrumakefilematcherrrrr/r0rrr:r;r'r<rArrjs` ` @@@@@@@@rZrrn sN (({UFOL 88E? .dhhv.D XXh F xx $T [ Pdhhuo"5Pdhhx>P:P%I kU ddG xx 244'2HC xxc## D&IDHG""4(HWWr" E     U )_)_"+%. E'11$>D/HHW gx33D9 :B$,$8$8$O C& BC& 1  T)   b#'') , %P FFH9g 88  2 3%%d+ ,  s8 I""J/50J**J/headss1show only heads which are descendants of STARTREVsSTARTREVtoposshow topological heads onlys)show active branchheads only (DEPRECATED)s#show normal and closed branch headss[-ct] [-r STARTREV] [REV]...c tj|}d}|jd}|r=tj||gd}t j ||dj}|jdr"|j|Dcgc]}|| }}nNg}|jD]'}||j|||jdz })|Dcgc]}|| }}|rVt j||D chc]} || j} } |Dcgc]}|j| vs|}}|jdr5|r3|j|} |Dcgc]}|j| vs|}}|r|Dchc]}|j} } | z rbdjd| | z D} td }|jdr|td |dzz }|j|d z| z|sy |j!d t#|d}t j$|||}|D]}|j'||j)ycc}wcc}wcc} wcc}wcc}wcc}w)ashow branch heads With no arguments, show all open branch heads in the repository. Branch heads are changesets that have no descendants on the same branch. They are where development generally takes place and are the usual targets for update and merge operations. If one or more REVs are given, only open branch heads on the branches associated with the specified changesets are shown. This means that you can use :hg:`heads .` to see the heads on the currently checked-out branch. If -c/--closed is specified, also show branch heads marked closed (see :hg:`commit --close-branch`). If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. If -t/--topo is specified, named branch mechanics will be ignored and only topological heads (changesets with no children) will be shown. Returns 0 if matching heads are found, 1 if not. Nrtrr[rrrc3 K|]}|ywrr)rbs rZrzheads..s!B-A!-As s)no open branch heads found on branches %ss (started at %s)rrrZc$|j Srrrs rZrzheads..s !%%' r>)r)r(rerOr.rr rrrrrCrrBrrrorrrrwshowr)r4rV branchrevsrWstartrrrrBrrdagheads haveheadsheadlessrXrrs rZrr}sjb    %D E ((6 C ))$yA$$T35::< xx"&**U"34"3Qa"34nn&F T%%feTXXi5HI IE'"'(%Qa%(&0&9&9$ &K &KDGNN &K  ";I>)JJ Js extensionsshow only help for extensionssshow only help for commandskskeywordsshow topics matching keywordssystems"show help for specific platform(s)sPLATFORMs[-eck] [-s PLATFORM] [TOPIC])rHr/rc |jdxsg}t|dk(rtjj dr|j dntjdk(r|j dnctjdk(r|j dn>|j d|j tjj |jr|j d tjt}tj|||fd |i|}|jd |j|y ) zshow help for a given topic or a help overview With no arguments, print a list of commands with short help messages. Given a topic, extension, or command name, print help for that topic. Returns 0 if successful. rzrswinswindowssOpenVMSsvmssplan9sunixrBkeeprFN)rOrr( sysplatform startswithrrrsysmodules__name__r formattedhelprr)r4rurWrhcommands formatteds rZhelp_rqs< 88H  #D 4yA~    * *6 2 KK #  ! !Z / KK   ! !X - KK ! KK KK,,224 5 zz J{{8$H""2xIDIDIIHHWHHYr>s identify|idsidentify the specified revisionsnumsshow local revision numbersidsshow global revision ids show branchtagss show tagsrsshow bookmarkss[-nibtB] [-r REV] [SOURCE]c tj| } |s |stjt d|xs|xs |xs|xs| } g} g} d |rkt j d||} tj|xs|| | j}| jgf}tj||d\} }|jd| }|j|sE|s|s|rtjt d|s| r| d}|sd}j||j}| s|r|g} |j!|t"j$fd}|j'rV|r| j)|nH| rE|j*s8d j-|}|r| j/|n |j!t1 |sd |j3vr|j!|j5|d n|rt7j8||gd}t;j<||d}|j?j|d}|jA}g}|D]!}|j)|jC#d}|jEdddrd}|j!||Dcgc]!}|j|jG#}}| s|rddj-||fzg} |j!ddj-||fz|rE|Dcgc]}d|j?z}}| j/ddj-||fz|j!|j5|Dcgc]!}|j|jG#c}d n||j|jG}| s|r|g} |j!||r2| j/tjH|j?|jC}| r|j*s|j}|dk7r| j/d|zd j-|}|r| j/|d j-|jK}|rg| j/|nU|r| j/|j|r| j)||r| j)|jK|j!|j1 |j!|j|j!|j5|dd |j!|j5|jKd |jM|!|jOd"d#j-| z|jQrjSyycc}wcc}wcc}w#rjSwwxYw)$a#identify the working directory or specified revision Print a summary identifying the repository state at REV using one or two parent hash identifiers, followed by a "+" if the working directory has uncommitted changes, the branch name (if not default), a list of tags, and a list of bookmarks. When REV is not given, print a summary of the current state of the repository including the working directory. Specify -r. to get information of the working directory parent without scanning uncommitted changes. Specifying a path to a repository root or Mercurial bundle will cause lookup to operate on that repository/bundle. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions. See also :hg:`help templates`. :dirty: String. Character ``+`` denoting if the working directory has uncommitted changes. :id: String. One or two nodes, optionally followed by ``+``. :parents: List of strings. Parent nodes of the changeset. Examples: - generate a build identifier for the working directory:: hg id --id > build-id.dat - find the revision corresponding to a tag:: hg id -n -r 1.3 - check the most recent revision of a remote repository:: hg id -r tip https://www.mercurial-scm.org/repo/hg/ See :hg:`log` for generating more information about specific revisions, including full hash identifiers. Returns 0 if successful. 5there is no Mercurial repository here (.hg not found)Nsidentifys3can't query remote revision number, branch, or tagsrr:)idcg}djdvrAt}jdjDcgc] \}}||k(r|}}}t|Scc}}w)Nr namespaces)listkeysrrrr)bms hexremoterevbmbmrr remoterevs rZgetbmszidentify..getbmsss4==#??#&y>L(,}}\'B'H'H'J'JGB,.'J c{" sA#/)rrrrt)r rr>TF)rr!rBr))dirty%s%srr)r?rs(%s))rBtagr)rur)r3rrr)*r(rerrSrr<get_unique_pull_path_objrrlocalrBrrrrArrr5rrrrrrrrrr.rr rrr?r3rrrr rrrr)r4rVr<rnumrurBr3r rWdefaultoutputrurrrrhexrevr~r{rr?taglistrr hexoutput numoutputr^rrr}s @@rZidentifyr sGV    %D  F G  ;";;$;)?w!AFFH-w?g* JJsxxz2 b'[F9%MM("2"23779"=>((*rxxJJL ?MM'A+.IIg&MM!$YYs}}/MM"%MM#**,/MM'*MM#--/2 GGG # GG3::A X3X)!AX3"&X. IX3$X33Ys import|patchsstrips]directory strip option for patch. This has the same meaning as the corresponding patch optionsNUMsbase path (DEPRECATED)sPATHs;skip check for outstanding uncommitted changes (DEPRECATED)s/don't commit, just update the working directorybypasss2apply patch without touching the working directoryspartialscommit even if some hunks fails"abort if patch would apply lossilysapply patch to subdirectorys import-branchs8use any branch information in patch (implied by --exact)s[OPTION]... PATCH...c tj|dddgtj|dddgtj|}|st j t d|f|z}|jd}|rtj||d<|jd }|jd  } t|jd xsd }|d ks|dkDrt j t d|r |st j t d|d} g} d } j5|r=tj|s|jdstj|jdsj} fd} n t j"} t j"} | 5| 5dj%}|D]}|dk(r)|j't d|j(}d}nUt*j,j/| |}|j't d|zt1j2||d}d}t5j6|D]}t5j8||5}tj:||||| t0j<\}}}dddrd}|j?|dz|s|rdj%}ng}s|jAt d|jAt dd } n|rct j t d!|z| r jCd"j/| dddddd| cdddS#t$rt j t d wxYw#1swY xYw#1swYTxYw#1swYXxYw#1swYyxYw)#atimport an ordered set of patches Import a list of patches and commit them individually (unless --no-commit is specified). To read a patch from standard input (stdin), use "-" as the patch name. If a URL is specified, the patch will be downloaded from there. Import first applies changes to the working directory (unless --bypass is specified), import will abort if there are outstanding changes. Use --bypass to apply and commit patches directly to the repository, without affecting the working directory. Without --exact, patches will be applied on top of the working directory parent revision. You can import a patch straight from a mail message. Even patches as attachments work (to use the body part, it must have type text/plain or text/x-patch). From and Subject headers of email message are used as default committer and commit message. All text/plain body parts before first diff are added to the commit message. If the imported patch was generated by :hg:`export`, user and description from patch override values from message headers and body. Values given on command line with -m/--message and -u/--user override these. If --exact is specified, import will set the working directory to the parent of each patch before applying it, and will abort if the resulting changeset has a different ID than the one recorded in the patch. This will guard against various ways that portable patch formats and mail systems might fail to transfer Mercurial data or metadata. See :hg:`bundle` for lossless transmission. Use --partial to ensure a changeset will be created from the patch even if some hunks fail to apply. Hunks that fail to apply will be written to a .rej file. Conflicts can then be resolved by hand before :hg:`commit --amend` is run to update the created changeset. This flag exists to let people import patches that partially apply without losing the associated metadata (author, date, description, ...). .. note:: When no hunks apply cleanly, :hg:`import --partial` will create an empty changeset, importing only the patch metadata. With -s/--similarity, hg will attempt to discover renames and copies in the patch in the same way as :hg:`addremove`. It is possible to use external patch programs to perform the patch by setting the ``ui.patch`` configuration option. For the default internal tool, the fuzz can also be configured via ``patch.fuzz``. See :hg:`help config` for more information about configuration files and how to use these options. See :hg:`help dates` for a list of formats valid for -d/--date. .. container:: verbose Examples: - import a traditional patch from a website and detect renames:: hg import -s 80 http://example.com/bugfix.patch - import a changeset from an hgweb server:: hg import https://www.mercurial-scm.org/repo/hg/rev/5ca8c111e9aa - import all the patches in an Unix-style mbox:: hg import incoming-patches.mbox - import patches from stdin:: hg import - - attempt to exactly restore an exported changeset (not always possible):: hg import --exact proposed-fix.patch - use an external tool to apply a patch which is too fuzzy for the default internal tool. hg import --config ui.patch="patch --merge" fuzzy.patch - change the default fuzzing from 2 to a less strict 7 hg import --config ui.fuzz=7 fuzz.patch Returns 0 on success, 1 on partial success (see --partial). r"bypassrFexactr.rs!need at least one patch to importr}rrrnrssimilarity must be a numberds$similarity must be between 0 and 100s%cannot use --similarity with --bypassrrr+c&jdS)Nsimport)rDrsrZrzimport_..s)))4r>Nr sapplying patch from stdin sstdins applying %s F) sendacceptTrspatch applied partially s1(fix the .rej files and run `hg commit --amend`) rs%s: no diffs founds * * * )"rr;r(rerrSrrOr9r<float ValueErrorrar=r>rr5rr?rUfinr rrropenpathr&rextract tryimportonerKr write_errsavecommitmessage)r4rVpatch1patchesrWrrrsimrmsgsrarrr?patchurl patchfilehaspatchhunk patchdatarXrrejs ` rZimport_rsj (( kHh/ ((w8JK    %D q!EFGGi'!G 88G D  **40W HHX E)$ $FBDHH]+0q1 Qw#)q!HIJJ 6q!IJKK =D D C    # #D )DHHX.%%d+xx %99D4B**D((B VRT4j((*G#t#IIa >?@ "I'H!ww||D(;HIIa 01H<= " BU KI !KK 2Dr40I)0)=)=i$bhh*T31#'e ,"&t*"4"4"6#':, Q'C%DE !:  +3. **1-B+Ch+NOOG$J&&|'8'8'>?QVRk  Bq!?@AABJ10TVV sp>N)?B O9 O-C O!.O AO! ;O! AO!O- O9)(OOO!!O* &O--O6 2O99Ps incoming|ins*run even if remote repository is unrelateds newest-firstsshow newest record firstsfile to store the bundles intosFILEs'a remote changeset intended to be addedscompare bookmarkss(a specific branch you would like to pulls<[-p] [-n] [-M] [-f] [-r REV]... [--bundle FILENAME] [SOURCE]c btjjdr;tjgfd}t j |d|dytjddgjd rtj|g}|D]}t j|} d |jd vr-jtd  |jyj!d j#td tj$|j&zt)j*||j,|jcSt j*|S#|jwxYw)ashow new changesets found in source Show new changesets found in the specified path/URL or the default pull location. These are the changesets that would have been pulled by :hg:`pull` at the time you issued this command. See pull for valid source format details. .. container:: verbose With -B/--bookmarks, the result of bookmark comparison between local and remote repositories is displayed. With -v/--verbose, status is also displayed for each bookmark like below:: BM1 01234567890a added BM2 1234567890ab advanced BM3 234567890abc diverged BM4 34567890abcd changed The action taken locally when pulling depends on the status of each bookmark: :``added``: pull will create it :``advanced``: pull will update it :``diverged``: pull will create a divergent bookmark :``changed``: result depends on remote changesets From the point of view of pulling behavior, bookmark existing only in the remote repository are treated as ``added``, even if it is in fact locally deleted. .. container:: verbose For remote repository, using --bundle avoids downloading the changesets twice if the incoming is followed by a pull. Examples: - show incoming changes with patches and full description:: hg incoming -vp - show incoming changes excluding merges, store a bundle:: hg in -vpM --bundle incoming.hg hg pull incoming.hg - briefly list changes inside a bundle:: hg in changes.hg -T "{desc|firstline}\n" Returns 0 if there are incoming changes, 1 otherwise. graphctj||}tj||tjyr)r graphrevs displaygraphr asciiedges)rchlistrrevdagrWrVr4s rZr=zincoming..display,s6))%>F  # #D&)X-@-@ r>cy)Nrrrr>rZrzincoming..2sar>Tbufferedrr rrrw!remote doesn't support bookmarks sincomingcomparing with %s )mode)r(rerOr checkunsupportedgraphflagsr _incomingrr;r<get_pull_pathsrrxrorrrrU hidepasswordlocr incomingbookmarks_mode)r4rVr<rWr=srcsrrs`` ` rZrrsan    %D xx--b$7  WiT64$O (({YKH xx %%dB9DGGD$-E u~~m'DDGGACDE % ,-0D0DTXX0NN!))e$*=*= " ;;r4 .. s-FA-FF.rds![-e CMD] [--remotecmd CMD] [DEST]c tj|}tj||}t j |||d}|j y)awcreate a new repository in the given directory Initialize a new repository in the given directory. If the given directory does not exist, it will be created. If no directory is given, the current directory is used. It is possible to specify an ``ssh://`` URL as the destination. See :hg:`help urls` for more information. Returns 0 on success. T)createN)r(rer<get_clone_path_objrrr)r4rrWrrs rZinitrMsC*    %D  % %b$ /D 772tT$ /DJJLr>locatefullpaths-print complete paths from the filesystem roots[OPTION]... [PATTERN]...cxtj|}|jdrd}nd}tj||jdd}d}t j |||dd }|jd |j%t|jj|}n|j|}t j|t| } |D]O} |jd r"|j|j| |n|j| | |d }Q|S)a>locate files matching specific patterns (DEPRECATED) Print files under Mercurial control in the working directory whose names match the given patterns. By default, this command searches all directories in the working directory. To search just the current directory and its subdirectories, use "--include .". If no patterns are given to match, this command prints the names of all files under Mercurial control in the working directory. If you want to feed the output of this command into the "xargs" command, use the -0 option to both this command and "xargs". This will avoid the problem of "xargs" treating single filenames that contain whitespace as multiple filenames. See :hg:`help files` for a more versatile command. Returns 0 if a match is found, 1 otherwise. rrrrtNrsrelglobcy)NFrrs rZrzlocate..sr>)rrrr_rr)r(rerOr rr.rdrrrrrbmatchesrfrprwjoin) r4rVrhrWrrrarifilesgenrjrs rZlocaterhs b    %D xx    tTXXf%5t ""4T$ZHH 88K HHTZZ_c * HHXc]C (  Jr>s log|historys follow-firsts=only follow the first parent of merge changesets (DEPRECATED)s!show revisions matching date specsDATEcopiessshow copied filess+do case-insensitive search for a given textsTEXTs"revisions to select or follow fromLs line-ranges2follow line range of specified file (EXPERIMENTAL)s FILE,RANGEsremoveds*include revisions where files were removeds only-mergess8show only merges (DEPRECATED) (use -r "merge()" instead)srevisions committed by usersUSERs only-branchs?show only changesets within the given named branch (DEPRECATED)s-show changesets within the given named branchs)show changesets within the given bookmarkPsprunes/do not display revision or any of its ancestorss[OPTION]... [FILE]c.tj|}|jd}|r/|jdstjt d|r |rtjt dt j||jdd}tj|||}tj||\}}|rtj|||\}}d}|jdr.d} |r|jd z} t j|| }|jd tj||||d } |jdrtj } ntj"} | |||| |y)ashow revision history of entire repository or files Print the revision history of the specified files or the entire project. If no revision range is specified, the default is ``tip:0`` unless --follow is set. File history is shown without following rename or copy history of files. Use -f/--follow with a filename to follow history across renames and copies. --follow without a filename will only show ancestors of the starting revisions. The starting revisions can be specified by -r/--rev, which default to the working directory parent. By default this command prints revision number and changeset id, tags, non-trivial parents, user, date and time, and a summary for each commit. When the -v/--verbose switch is used, the list of changed files and full commit message are shown. With --graph the revisions are shown as an ASCII art DAG with the most recent changeset at the top. 'o' is a changeset, '@' is a working directory parent, '%' is a changeset involved in an unresolved merge conflict, '_' closes a branch, 'x' is obsolete, '*' is unstable, and '+' represents a fork where the changeset from the lines below is a parent of the 'o' merge on the same line. Paths in the DAG are represented with '|', '/' and so forth. ':' in place of a '|' indicates one or more revisions in a path are omitted. .. container:: verbose Use -L/--line-range FILE,M:N options to follow the history of lines from M to N in FILE. With -p/--patch only diff hunks affecting specified line range will be shown. This option requires --follow; it can be specified multiple times. Currently, this option is not compatible with --graph. This option is experimental. .. note:: :hg:`log --patch` may generate unexpected diff output for merge changesets, as it will only compare the merge changeset against its first parent. Also, only files different from BOTH parents will appear in files:. .. note:: For performance reasons, :hg:`log FILE` may omit duplicate changes made on branches and will not show removals or mode changes. To see all such changes, use the --removed switch. .. container:: verbose .. note:: The history resulting from -L/--line-range options depends on diff options; for instance if white-spaces are ignored, respective changes with only white-spaces in specified line range will not be listed. .. container:: verbose Some examples: - changesets with full descriptions and file lists:: hg log -v - changesets ancestral to the working directory:: hg log -f - last 10 commits on the current branch:: hg log -l 10 -b . - changesets showing all modifications of a file, including removals:: hg log --removed file.c - all changesets that touch a directory, with diffs, excluding merges:: hg log -Mp lib/ - all revision numbers that match a keyword:: hg log -k bug --template "{rev}\n" - the full hash identifier of the working directory parent:: hg log -r . --template "{node}\n" - list available log templates:: hg log -T list - check if a given changeset is included in a tagged release:: hg log -r "a21ccf and ancestor(1.9)" - find all changesets by some user in a date range:: hg log -k alice -d "may 2008 to jul 2008" - summary of all changesets after the last tag:: hg log -r "last(tagged())::" --template "{desc|firstline}\n" - changesets touching lines 13 to 23 for file.c:: hg log -L file.c,13:23 - changesets touching lines 13 to 23 for file.c and lines 2 to 6 of main.c with patch:: hg log -L file.c,13:23 -L main.c,2:6 -p See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help revisions` for more about specifying and ordering revisions. See :hg:`help templates` for more about pre-packaged styles and specifying custom templates. The default template used by the log command can be customized via the ``command-templates.log`` configuration setting. Returns 0 on success. s line_rangerus--line-range requires --follows:FILE arguments are not compatible with --line-range optionrtrNrr)endrevrTrr)r(rerOrrSrr.rr parseoptsgetrevsgetlinerangerevsr getcopiesfnrrwdisplaygraphrevs displayrevs) r4rVrhrW linerange walk_optsrudiffer getcopiesrr displayfns rZrrsdF    %D'I),q!BCDDT K L    % %dDHHV,manifestsrevision to displayslist files from all revisionss[-r REV]c ,tj|}|jd|}|jdr|s|rt j t dt}|D]#}||}|t|jz}%|jdt|D]%}|j|jdd|'|jy|r |rt j t d|s|}dd d d d } d dd dd } |rtj||gd}t!j"||}|j%} |jd|D]}|j|j'|||j)} |j+|j,ddt/| ||j+|j0dd| | | | |jdd||jy)a output the current or given revision of the project manifest Print a list of version controlled files for the given revision. If no revision is given, the first parent of the working directory is used, or the null revision if no revision is checked out. With -v, print file permissions, symlink and executable bits. With --debug, print file revision hashes. If option --all is specified, the list of all files from all revisions is printed. This includes deleted and renamed files. Returns 0 on success. rrs#can't specify a revision with --allrrNr$@*r>r|)rxr>rs644s755rrshashrs mode types%s %1s )r(rerrOrrSrrrrrrrrrr.rr rmanifestrflagsrrrr) r4rVrrrWrresrrcharrmffls rZrrs4    %D k4 (B xx $""1%K#LM MeCs)C 3syy{# #C A LLN HHWgq )  tq!DEFF dD 9DV6 BD ))$ B   tT *C BHH[   s  V\\^ R\\7FC1J? RZZz48T"XN '1% FFHr>s8force a merge including outstanding changes (DEPRECATED)srevision to mergepreviews1review revisions to merge (no merge is performed)sabort the ongoing merges[-P] [[-r] REV]c tj|}|jd}|rF|jj |j k(rt j|tdt j|dddg|rt j|}|rJ|jdk7r;tjtd|jz|j|rtjtdt!j"|j$|S|jdr |rtjtd|s|jd}|rt'j(||}nH|j+d d rtjtd |t-j.|}|j1tjtd |jdr|dj1}|j1}|j2j5|g|g} t'j6|||} | D]}| j9||| j;yd|jddi} |j=| d5|jd} gd} t!j>|| | cd d d S#1swYy xYw)amerge another revision into working directory The current working directory is updated with all changes made in the requested revision since the last common predecessor revision. Files that changed between either parent are marked as changed for the next commit and a commit must be performed before any further updates to the repository are allowed. The next commit will have two parents. ``--tool`` can be used to specify the merge tool used for file merges. It overrides the HGMERGE environment variable and your configuration files. See :hg:`help merge-tools` for options. If no revision is specified, the working directory's parent is a head revision, and the current branch contains exactly one other head, the other head is merged with by default. Otherwise, an explicit revision with which to merge must be provided. See :hg:`help resolve` for information on handling file conflicts. To undo an uncommitted merge, use :hg:`merge --abort` which will check out a clean copy of the original merge parent, losing all changes. Returns 0 on success, 1 if there are unresolved files. rGrrtrs&cannot abort merge with %s in progressrMs"cannot specify a node with --abortr$rSsmerge.require-revs8configuration requires specifying revision to merge withNs+merging with the working copy has no effectrf)rrrr%r'r>r)s working copys merge revscommon ancestor)rlabels) r(rerOrbrSrrrrr;rPrTrrQrNrSr abortmerger4r rrr destmergerr8 findmissingrwr`rrEr!)r4rVrrWr[r1rrrSrrrVrrs rZr!r!syh    %D HHX E !!#t{{2##D!H+6 ((x&*9MN **40 U]]h."";< NZZ\  ""1%J#KL L}}TWWd++ xxDq!DEFF xx ""4. ==&: ;""  8%%d+, xxz < =   xx  $Z__  XXZ**2$rd*C11"dDA D NN4: &('3)?@I  9h /"Dxx58 0 / /s :-K11K:soutstanding uncommitted merges:To continue: hg commit To abort: hg merge --aborts%use 'hg commit' or 'hg merge --abort')r r allowcommitcmdmsgrR statushintrs outgoing|outs6a changeset intended to be included in the destinations(a specific branch you would like to pushs)[-M] [-p] [-n] [-f] [-r REV]... [DEST]...cvtj|}|jdrtj|||D]}t j |||} d|jdvr-|jtd |jy|jtdtj|jz|jdtj ||||jcSt j ||||S#|jwxYw)a'show changesets not found in the destination Show changesets not found in the specified destination repository or the default push location. These are the changesets that would be pushed if a push was requested. See pull for details of valid destination formats. .. container:: verbose With -B/--bookmarks, the result of bookmark comparison between local and remote repositories is displayed. With -v/--verbose, status is also displayed for each bookmark like below:: BM1 01234567890a added BM2 deleted BM3 234567890abc advanced BM4 34567890abcd diverged BM5 4567890abcde changed The action taken when pushing depends on the status of each bookmark: :``added``: push with ``-B`` will create it :``deleted``: push with ``-B`` will delete it :``advanced``: push will update it :``diverged``: push with ``-B`` will update it :``changed``: push with ``-B`` will update it From the point of view of pushing behavior, bookmarks existing only in the remote repository are treated as ``deleted``, even if it is in fact added remotely. Returns 0 if there are outgoing changes, 1 otherwise. rrwrrrsoutgoing)r(rerOr<rrrrxrorrrUrrrr r)r4rVr rWrrs rZrrsH    %D xx **4U;DGGD$-E u~~m'DDGGACDE  ,-0D0DTXX0NN% ))"dE: < ;;r4 -- s-D&A!D&&D8sparentss&show parents of the specified revisions[-r REV] [FILE]c tj|}|jd}|rtj||gd}t j ||d}|rtj||f|}|jst|jdk7rtjtd|jd}g}|jD]&}|s |j|j!|(|s!tjtd|zg} |D]4} |j%|| } | j| j'6n+|jDcgc]}|j'} }t j(|||} | D]&} | |j*k7s| j-|| (| j/y#tj"$rYwxYwcc}w) ashow the parents of the working directory or revision (DEPRECATED) Print the working directory's parent revisions. If a revision is given via -r/--rev, the parent of that revision will be printed. If a file argument is given, the revision in which the file was last changed (before the working directory revision or the argument to --rev if given) is printed. This command is equivalent to:: hg log -r "p1()+p2()" or hg log -r "p1(REV)+p2(REV)" or hg log -r "max(::p1() and file(FILE))+max(::p2() and file(FILE))" or hg log -r "max(::p1(REV) and file(FILE))+max(::p2(REV) and file(FILE))" See :hg:`summary` and :hg:`help revsets` for related information. Returns 0 on success. rtrNrs%can only specify an explicit filenamers'%s' not found in manifest)fileid)r(rerOr.rr rrdrorrrrSrr?rr$rxfilectxrrwrr`r)r4rVfile_rWrrri filenodescprrrrrs rZr?r?sJ    %D ((6 C ))$yA   tS$ /C MM#x . 99;#aggi.A-""1%M#NO O !  ++-B   U!34  ""1%B#Ce#KL L B<<b<1D HHTYY[ !"% /2RWWY /--b$=I    NN47 #OO$$   0s) G(<H(G?>G?pathss[NAME]c Vtj|}tj||}|j d|j d|}|j rtj}nt}|jrd}nd}| xr |j }|D]\} } |j|j| d|| |j|j dd|| jt| jjD]R\} } | dvsJ|r|j!d| | fztj"| } | | } |j|| d| T|j%|r)|s'|js|j't)dy y ) ashow aliases for remote repositories Show definition of symbolic path name NAME. If no name is given, show definition of all available names. Option -q/--quiet suppresses all output when searching for NAME and shows only the path names when listing all definitions. Path names are defined in the [paths] section of your configuration file and in ``/etc/mercurial/hgrc``. If run inside a repository, ``.hg/hgrc`` is used, too. The path names ``default`` and ``default-push`` have a special meaning. When performing a push or pull operation, they are used as fallbacks if no location is specified on the command-line. When ``default-push`` is set, it will be used for push and ``default`` will be used for pull; otherwise ``default`` is used as the fallback for both. When cloning a repository, the clone source is written as ``default`` in ``.hg/hgrc``. .. note:: ``default`` and ``default-push`` apply to all inbound (e.g. :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and :hg:`bundle`) operations. See :hg:`help urls` for more information. .. container:: verbose Template: The following keywords are supported. See also :hg:`help templates`. :name: String. Symbolic name of the path alias. :pushurl: String. URL for push operations. :url: String. URL or directory path for the other operations. Returns 0 on success. rrs%s = nameurl)rrs%s:%s = s not found! rr)r(rer< list_pathsrrrrbytesrrrrawlocrr suboptionsrrpath_suboptions_displayrror)r4rVsearchrW pathitemsrrnamefmt showsuboptsrursuboptrr=s rZrrskd    %D""2v.IHHX h %B zz|++   xx*-RXXK d  Z'48 \67L4MN#DOO$9$9$;phasespublicsset changeset phase to publicsset changeset phase to draftsset changeset phase to secretsallow to move boundary backwardstarget revisions[-p|-d|-s] [-f] [-r] [REV...]c 0tj|}d}ttjD]-\}}||s |t j td|}/t|}|j|d|rtj||}n.|djDcgc]}|j}}d}|@|D]9} || } |jd| j| jfz;|S|j!5|j#d5} |st j td|D cgc]} || j%} } |j'} | j(j*}| D cgc] } || |  c} tj,|| || |drtj.|| || dddddd j(j*}| D cgc] } || |  c} t1fd | D}| j2} Dcgc]}|j||ks|}}|r(|j5td t7|zd }|r6td |z}|r|j9||S|j;||S|j5td |Scc}wcc} wcc} w#1swYxYw#1swYxYwcc} wcc}w)aset or show the current phase name With no argument, show the phase name of the current revision(s). With one of -p/--public, -d/--draft or -s/--secret, change the phase value of the specified revisions. Unless -f/--force is specified, :hg:`phase` won't move changesets from a lower phase to a higher phase. Phases are ordered as follows:: public < draft < secret Returns 0 on success, 1 if some phases could not be changed. (For more information about the phases concept, see :hg:`help phases`.) Nsonly one phase can be specifiedrtrs%i: %s rrjrc34K|]}||k7ywrr)rrnewdataolddatas rZrzphase..s=1gajGAJ.ss9cannot move %i changesets to a higher phase, use --force rs phase changed for %i changesets sno phases changed )r(rerr' cmdphasenamesrrSrrrr rr?rrrrrDr unfiltered _phasecachephaseadvanceboundaryretractboundarysumr8rorrUr)r4rVrurW targetphaseidxrurrarrrrunfigetphasechangesrrrkrXrrs @@rZr r ws:    %DKv334 T :&&&q)K'LMMK 5 :DKKV  ""4."&d!3!3!56!5A!56 CAq'C HH[CGGIs||~#>> ?N JGYY[$**84&&q)>'?@@-12TT!W\\^TE2??$D''--H267$Qxa($7G  " "4[% @H~&&tReD5[##)).23d8D!$d3=== ^^$Iu!q (:[(HAuI  GG,h-   C 89GCC # J  J GGA,- . JY73 854[[4JsZ0K%L/%K4K*.,K4K/*8K4"L LL!L* K44K> 9LL cR|dk(ry|r tj||||S|y|dkDrtt|j} | |k(r|jt dy| dkDr|jt dy|jt d y|jd d s|jt d y#tj$rI}t dt j |z}|j}tj||d}~wwxYw) aRun after a changegroup has been added via pull/unbundle This takes arguments below: :modheads: change of heads by pull/unbundle :optupdate: updating working directory is needed or not :checkout: update destination revision (or None to default destination) :brev: a name, which might be a bookmark to be activated after updating return True if update raise any conflict, False otherwise. rFsnot updating: %srMNrs3(run 'hg heads' to see heads, 'hg merge' to merge) s5(run 'hg heads .' to see heads, 'hg merge' to merge) s(run 'hg heads' to see heads) rSupdate.requiredests((run 'hg update' to get a working copy) ) r updatetotallyr UpdateAbortrr;rMrNrrCrUr) r4rVmodheads optupdaterbrevrVrXrNcurrentbranchheadss rZ postincomingrs#1} 4##Bh= = 1  !1!1!34  ) IIIJ   ! # IIKL   IIa:; < ]];(= > !@AB %   4'(:+B+B4+HHC99D##Cd3 3 4sC D&AD!!D&updates8update to new branch head if new descendants were pulleds,run even when remote repository is unrelatedconfirms$confirm pull before applying changessbookmark to pulls remote-hiddens6include changesets hidden on the remote (EXPERIMENTAL)s<[-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]...c^ tj|}|jddr>|jdr-t d}t d}t j ||tj|||D]}|jt dtj|jz|jtj||||d }d } |j|jd gf} tj ||| |jd |d \} } i} d } |jd s| rig} g}| xsg} | r1|j#ds t d}t j$||j'5}|j)dddi}| D]%}|j+|j)dd|i' d d d j-}t/j0|}|| d<|jd gD]V}|j2j5|}||vr!t j t d|z| j+||Xt7| D]1\}}||j-}| j+||| k(s0|} 3t9j:}|jdr|j=}|5| j?|jditAjB|||| |jd|jd d| |jdjD}d }| ri|jGjHjK| } |jd r |d d}n&|jd r |d d}n |j}|j|_& tO||||jd| |} |`& d d d |jU|snryy#1swYQxYw#t jP$r9}t d|jRdz}|f|jRdd z|_)d }~wwxYw#|`&wxYw#1swYxYw#|jUwxYw)apull changes from the specified source Pull changes from a remote repository to a local one. This finds all changes from the repository at the specified path or URL and adds them to a local repository (the current one unless -R is specified). By default, this does not update the copy of the project in the working directory. When cloning from servers that support it, Mercurial may fetch pre-generated data. When this is done, hooks operating on incoming changesets and changegroups may fire more than once, once for each pre-generated bundle and as well as for any additional remaining data. See :hg:`help -e clonebundles` for more. Use :hg:`incoming` if you want to see what would have been added by a pull at the time you issued this command. If you then decide to add those changes to the repository, you should use :hg:`pull -r X` where ``X`` is the last changeset listed by :hg:`incoming`. If SOURCE is omitted, the 'default' path will be used. See :hg:`help urls` for more information. If multiple sources are specified, they will be pulled sequentially as if the command was run multiple time. If --update is specify and the command will stop at the first failed --update. Specifying bookmark as ``.`` is equivalent to specifying the active bookmark's name. .. container:: verbose One can use the `--remote-hidden` flag to pull changesets hidden on the remote. This flag is "best effort", and will only work if the server supports the feature and is configured to allow the user to access hidden changesets. This option is experimental and backwards compatibility is not garanteed. Returns 0 on success, 1 if an update had unresolved files. rSrrs,update destination required by configurations&use hg pull followed by hg update DESTrMspulling from %s s remote_hidden) remotehiddenNrrtrslookupsOother repository doesn't support revision lookup, so a rev cannot be specified.slistkeyss namespacerskeysremotebookmarkssremote bookmark %s not found!opargsrrr)rrrr opargsconfirmrscannot update to target: %sr)+r(rerrOrrrSr<rrUrrflushrrrBrcapabler{commandexecutor callcommandrresultr unhexlifybookmarksrrrr5rrarrr4cgresultrr8r _subtoppathrFilteredRepoLookupErrorrr)r4rVsourcesrWrXrNrrupdate_conflictrrur pullopargsrfnodeserrr4fremotebookmarksrremotebookmarksr^rrrrarrexcs rZr4r4s\t    %D }}["78TXX>?@:;s..&&tR9 !()G,@,@,JJK  dDt">"O1@ -.+r2A2215A/#..>?!CLL!34 3(oFAs!!9++-DLL&h#' . ++-Exx " !!$((9b"9:#==((8,"hh{B7% HHZ0 (#0::>>xHH xx'#F|A),#Iq1#{{ $(88  )&2D(DHHY,?4'O(Y^ KKM  W:X_-,@44:;chhqkIC #v 4CH (Y^ KKMsu*B2R?P+CR4;R/C5R%P8RR+P5 0R8R 4Q??RRR  RR RR,s purge|cleans abort-on-errsabort if an error occursspurge ignored files tooignoredspurge only ignored filesdirsspurge empty directoriess purge filesprints(print filenames instead of deleting thems?end filenames with NUL, for use with xargs (implies -p/--print)s%ask before permanently deleting filesshg purge [OPTION]... [DIR]...c tj|}tj|dd|j d }d}|j drd}d}|j ddrd}d}n|j dd}| }|j d }|j d } |j d } |  t j d d} |s| sd}d} tj|d ||} tj|| ||| ||j d| |  } | D]} |r|jd| |fzy #t$rd} Y~wxYw)aZremoves files not tracked by Mercurial Delete files not known to Mercurial. This is useful to test local and uncommitted changes in an otherwise-clean source tree. This means that purge will delete the following by default: - Unknown files: files marked with "?" by :hg:`status` - Empty directories: in fact Mercurial ignores directories unless they contain files under source control management But it will leave untouched: - Modified and unmodified tracked files - Ignored files (unless -i or --all is specified) - New files added to the repository (with :hg:`add`) The --files and --dirs options can be used to direct purge to delete only files, only directories, or both. If neither option is given, both will be deleted. If directories are given on the command line, only files in these directories are considered. Be careful with purge, as you could irreversibly delete some files you forgot to add to the repository. If you only want to print the list of files that this program would delete, use the --print option. rr4r6rrrFTrr5rNspurges abort_on_err)rXignoredremoveemptydirs removefiles abortonerrornoopr"r) r(rerrrOrfindKeyErrorr.rdrFpurger)r4rVdirsrWactr;r8rXr: removedirsr"rdrrs rZr?r?s\l    %D !!$ ;hhx C C xx  xx((:u-+((8$K'"Jhhz"G  OOH %G z  MM$t*dD 1E NN  "XXo.W E HHWc{* ++ G s8E E Epushs force pushsbookmark to pushs all-bookmarkss!push all bookmarks (EXPERIMENTAL)s new-branchsallow pushing a new branchpushvarss/variables that can be sent to server (ADVANCED)publishs+push the changeset as public (EXPERIMENTAL)s5[-f] [-r REV]... [-e CMD] [--remotecmd CMD] [DEST]...c  tj|}|jdr1tj|dddgt |j |d<|jdr|jdd|dd|dD]n}|j j|}||j vr"|jdgj|N|jdgjdpd}d }tj|||D]A}|j}|j|jd xsgf} |jt!d tj"|zt%j&||| |jd\} } t%j(|||} | r_t+j,|| D cgc]} || j/} } | st1j2t!d t!d |j4rwt7j8d|j4}t;j,||g} | Dcgc]}||j/} }| sYt1j2t!d|j=ddr)t1j2t!dt!d||_ |d}|j@}tC|D]<}|jE|jG|}|d k(s)|`| jIy |`tK|jdi}|jdgjM|jdgtOjF|| |jd| |jd|jdd|jd|}|jPd k(rd}n|jPd}|jR"|jRdk(rd}n|s|jRrd}|r | jIn | jID|d k(r|sd}|Scc} wcc}w#|`wxYw#| jIwxYw) a push changes to the specified destination Push changesets from the local repository to the specified destination. This operation is symmetrical to pull: it is identical to a pull in the destination repository from the current one. By default, push will not allow creation of new heads at the destination, since multiple heads would make it unclear which head to use. In this situation, it is recommended to pull and merge before pushing. Use --new-branch if you want to allow push to create a new named branch that is not present at the destination. This allows you to only create a new branch without forcing other changes. .. note:: Extra care should be taken with the -f/--force option, which will push all new heads on all branches, an action which will almost always cause confusion for collaborators. If -r/--rev is used, the specified revision and all its ancestors will be pushed to the remote repository. If -B/--bookmark is used, the specified bookmarked revision, its ancestors, and the bookmark will be pushed to the remote repository. Specifying ``.`` is equivalent to specifying the active bookmark's name. Use the --all-bookmarks option for pushing all current bookmarks. Please see :hg:`help urls` for important details about ``ssh://`` URLs. If DESTINATION is omitted, a default path will be used. When passed multiple destinations, push will process them one after the other, but stop should an error occur. .. container:: verbose The --pushvars option sends strings to the server that become environment variables prepended with ``HG_USERVAR_``. For example, ``--pushvars ENABLE_FEATURE=true``, provides the server side hooks with ``HG_USERVAR_ENABLE_FEATURE=true`` as part of their environment. pushvars can provide for user-overridable hooks as well as set debug levels. One example is having a hook that blocks commits containing conflict markers, but enables the user to override the hook if the file is using conflict markers for testing purposes or the file format has strings that look like conflict markers. By default, servers will ignore `--pushvars`. To enable it add the following to your configuration file:: [push] pushvars.server = true Returns 0 if push was successful, 1 if nothing to push. s all_bookmarksrrtrspushingrCnullFrrspushing to %s s,specified revisions evaluate to an empty sets use different revision argumentsrMs heads(%r)s6default push revset for path evaluates to an empty setrSspush.require-revssno revisions specified to pushsdid you mean "hg push -r ."?rfrr rDrs new_branchrrE)ru newbranchr publishr!Tre)*r(rerOrr;rrr[r setdefaultrr<rrrBrUrrrrrr rrrrSpushrevr, formatspecr.rr*substaterrsubpushrdictrrr)bkresult)r4rVr rWr^ some_pushedr'rrrrurrrexprrrsubsrb sub_resultr!pushops rZrOrO4s$H    %D xx !,,   & ! !1[ xx  \:tK/@'Jk"A**1-ADOO#+2215+227;#K F&&tR7xxKK)!4!:; !&''*>*>t*DDE)) $$((6"2 hdD)E 0:0C0CD$0OP0O1Q 0OP**IJBC",,\4<<H''tf5489DSS (D9**U {,@A&&78:; $D  %JzzA!"qt!4J!Q $B KKMM& $B'F   k2 . 5 5dhh{B6O P]]"((=1((;3, F!#," *??a'FFOOF KKM  KKM]8^{; MMQ:.$B KKMsX4Q2Q!(A4Q2Q&6A$Q2AQ+ Q+!Q25Q+7C8Q2! Q2+Q//Q22Rsrecover)r>verifyFs(run `hg verify` after successful recoverc |j}|r7|drtj|Std}|j |yy)a6roll back an interrupted transaction Recover from an interrupted commit or pull. This command tries to fix the repository status after an interrupted operation. It should only be necessary when Mercurial suggests it. Returns 0 if successful, 1 if nothing to recover or verify fails. r6sH(verify step skipped, run `hg verify` to check your repository content) rr)recoverrr6rro)r4rVrWrarXs rZrYrYsI$ ,,.C >99T? ")C GGCL r>s remove|rmsrecord delete for missing filess)forget added files, delete modified filesc Vtj|}|jd|jd}}|jd}|s |stjt d|j 5|jj|5tj|d||}|jd}tj|d} tj|||d | |||| cdddcdddS#1swYnxYwdddy#1swYyxYw) a'remove the specified files on the next commit Schedule the indicated files for removal from the current branch. This command schedules the files to be removed at the next commit. To undo a remove before that, see :hg:`revert`. To undo added files, see :hg:`forget`. .. container:: verbose -A/--after can be used to remove only files that have already been deleted, -f/--force can be used to force deletion, and -Af can be used to remove files from the next revision without deleting them from the working directory. The following table details the behavior of remove for different file states (columns) and option combinations (rows). The file states are Added [A], Clean [C], Modified [M] and Missing [!] (as reported by :hg:`status`). The actions are Warn, Remove (from branch) and Delete (from disk): ========= == == == == opt/state A C M ! ========= == == == == none W RD W R -f R RD RD R -A W W W R -Af R R R R ========= == == == == .. note:: :hg:`remove` never deletes files in Added [A] state from the working directory, not even if ``--force`` is specified. Returns 0 on success, 1 if any warnings encountered. rrrrNr Tr_r>)rX)r(rerOrrSrrarbrcr.rdrfrr) r4rVrhrWafterrrXrir rjs rZrr$sj    %D88H%txx'95E XXj !F q!6788 t}}33D9 MM$t*dD 188K(&&tF~~ ahuhv :999s%;DA D 7 D D DD(srename|move|mvs$unmark a destination file as renameds)record a rename that has already occurreds5(un)mark renames in the given revision (EXPERIMENTAL)s+forcibly move over an existing managed files[OPTION]... SOURCE... DESTc tj|}d}|jd}d}|r.rr>rNc*tjSrrrs rZrzrename..contextrr>T)rrrs rZrrhsZ    %D=G ((9 C C ""4- 779  1"ggiDO wt}||BdD>%}}}s$: CB0 C0B9 5CCresolvesselect all unresolved filess!list state of files needing mergesmarksmark files as resolvedsunmarksmark files as unresolveds no-statusshide status prefixsre-mergesre-merge filesc ($tj|}|jdd}dj}|Dcgc]}|j |c}\}}} } } } t t td| || | g} | dkDrtjtd| dk(r=|jddr+td }tjtd | |r |rtjtd |s(|s&| s$|s"| s tjtd d |r|r8|jtdrtjtd|r:|s8|jtdrtjtd| r:|s8|jtdrtjtdtj|$| r3|jd|j!d|}t"j$j'|}|d}tj(|||}t"j*dt"j,dt"j.dt"j0di}|D]}}||s |||\}}|j3|j5||j7| dd|||j9||j;d$|z||j=y|j?5t"j$j'|}|jAsE|jBjE|jFk7stjHtd|d}tj(|||}d}d}g}|r|jKdd}|d vrd}|D]}||s d!}||t"j.t"j0fvr|r!|jM|t"j0n\| r!|jM|t"j.n9||t"j.k(r#|jOtd"$|z|r{rW|jPjS|}tUjV|r'||t"j,k7r|jY||jM|t"j,1| r"|jM|t"j*U|j[|} t]j^||d#z d$|j d%d&i}|jc|d5|je||}dddrd}|jg t]jh|d#ztjj||||rg|jOtd'd&jm$fd(|Dzd)k(r-|s+|s)tjHtd*td+ |jg|jBjE|jFk7}|jBjo|5t#jp||js|dddd|s|rd}tu|D cgc]} | jwd,dk\s| c} s|D cgc]} d-| z }} tj(|||}|D]e}||s d.}!d&jm|Dcgc]}|j |s|!|c}}"td/|"d0jm|fz}n|jOtd1|r|jO|dddjy}#|#s/|j{td2t}j~|Scc}w#t`$rYwxYw#1swYxYw#|jgwxYw#t`$rYtwxYw#1swYxYwcc} wcc} wcc}w#1swYxYw)3aredo merges or set/view the merge status of files Merges with unresolved conflicts are often the result of non-interactive merging using the ``internal:merge`` configuration setting, or a command-line merge tool like ``diff3``. The resolve command is used to manage the files involved in a merge, after :hg:`merge` has been run, and before :hg:`commit` is run (i.e. the working directory must have two parents). See :hg:`help merge-tools` for information on configuring merge tools. The resolve command can be used in the following ways: - :hg:`resolve [--re-merge] [--tool TOOL] FILE...`: attempt to re-merge the specified files, discarding any previous merge attempts. Re-merging is not performed for files already marked as resolved. Use ``--all/-a`` to select all unresolved files. ``--tool`` can be used to specify the merge tool used for the given files. It overrides the HGMERGE environment variable and your configuration files. Previous file contents are saved with a ``.orig`` suffix. - :hg:`resolve -m [FILE]`: mark a file as having been resolved (e.g. after having manually fixed-up the files). The default is to mark all unresolved files. - :hg:`resolve -u [FILE]...`: mark a file as unresolved. The default is to mark all resolved files. - :hg:`resolve -l`: list files which had or still have conflicts. In the printed list, ``U`` = unresolved and ``R`` = resolved. You can use ``set:unresolved()`` or ``set:resolved()`` to filter the list. See :hg:`help filesets` for details. .. note:: Mercurial will not let you commit files with unresolved merge conflicts. You must use :hg:`resolve -m ...` before you can commit after a conflicting merge. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions. See also :hg:`help templates`. :mergestatus: String. Character denoting merge conflicts, ``U`` or ``R``. :path: String. Repository-absolute path of the file. Returns 0 on success, 1 if any files fail a resolve attempt. rSsresolve.confirms'all mark unmark list no_status re_mergeNrstoo many actions specifiedrsresolve.explicit-re-merges*use --mark, --unmark, --list or --re-mergesno action specifiedrMs can't specify --all and patterns!no files or directories specifieds*use --all to re-merge all unresolved filess1re-merge all unresolved files (yn)?$$ &Yes $$ &Nos user quits9mark all unresolved files as resolved (yn)?$$ &Yes $$ &Nos9mark all resolved files as unresolved (yn)?$$ &Yes $$ &Nor_)resolve.unresolvedra)sresolve.resolvedr=)rbrrs mergestatusrrrrs/resolve command not applicable when not mergingFsresolve.mark-check)swarnrGTs,%s: path conflict must be resolved manually s.resolver%r'r>s:warning: the following files still have conflict markers: c3:K|]}d|zdzyw)s rNr)rrrjs rZrzresolve..s$9KAEHQK'%/9KsrGsconflict markers detectedsuse --all to mark anywayrspath:%sc|dk(ryd|ddzS)Nsre_merges --re-merge s-%s rrr)rns rZflagzresolve..flags +#1&1Q//r>s(try: hg resolve %s%s) rs1arguments do not match paths that need resolving s(no more unresolved files) )@r(rerrrOrrfilterrrSr promptchoice CanceledErrorr.rfrr mergestatemodr"r#rdMERGE_RECORD_UNRESOLVEDMERGE_RECORD_RESOLVEDMERGE_RECORD_UNRESOLVED_PATHMERGE_RECORD_RESOLVED_PATHrrrrrrrarrbrSrrQrmarkrowvfstryreadrhasconflictmarkersrrr5copyfileFileNotFoundErrorrEresolver#r backuppathrchanging_parents recordupdatesactionsryr=rJrUrcheckafterresolved)%r4rVrhrWr"flaglistrnrrnunmarkr`nostatusremerge actioncountrNrmswctxrimergestateinforrrradidworkrq markcheckfdataarVr branchmergerrer unresolvedfrjs% @rZrtrtsJ    %DmmK);?@@  bmm1>?q!78tDD q!DEFF 4446 2 3>   FG))!L/:: & ))!L/:: $& ))!L/::""4(H   \\*d +  % % * *4 0Dz MM$d +  1 14  / /1L  6 69  4 47  AQ4'1.JE3 LLN JJ4J LLX~vs%L P GGGO HHWx{*%H 8    % % * *4 0 t}}//1T[[@""DE Dz MM$d +  +/DEI 33! AQ4G!u::88GGA}GGHGGA}IIJUmHHHGGJK"1+& II--a0E!44U;qE]%H%HH*11!4=>>?=@@AJJqMMM!Q_5 !7'39O PI**9jAJJq$/BIIKKKK););Ba)Hkv  GG"((9K  H$S&&2367 mm&&(DKK7 ]] + +D 1  ' 'bjjlK N24D4=4a166$<1+<4=>0451 Q5MM$d3AQ4 0  HHx%Ox!488A;d1gx%OPE89 $=D GGAKL M K N$$&K  !345""4( J}2QV) BA IIK)B2 1 >5&P{ s`%Hb`*5&a`:. a:b .a9B>b7'a,b5a9 a9  b a>*9b#b : b Ab* `73b6`77b:a ?aab a)%b(a))b,a6 1bbsreverts*revert all changes when no arguments givenstipmost revision matching dates revert to the specified revisions no-backups"do not save backup copies of filess interactively select the changess[OPTION]... [-r REV] [NAME]...ctj|}|jdr5tj|ddgtj |||d|d<|j j\}}|jds8||jk7r)tjtdtd|jd}|rtj||gd}tj||}|s|jds |jds|jd s|jd std }||jk7r"td } tj|| t!|j#} |j%} | |k7r<| rtd |j'z} n6td|j'z} n| r td} n td} tj|| tj(|||g|itj*|S)arestore files to their checkout state .. note:: To check out earlier revisions, you should use :hg:`update REV`. To cancel an uncommitted merge (and lose your changes), use :hg:`merge --abort`. With no revision specified, revert the specified files or directories to the contents they had in the parent of the working directory. This restores the contents of files to an unmodified state and unschedules adds, removes, copies, and renames. If the working directory has two parents, you must explicitly specify a revision. Using the -r/--rev or -d/--date options, revert the given files or directories to their states as of a specific revision. Because revert does not change the working directory parents, this will cause these files to appear modified. This can be helpful to "back out" some or all of an earlier change. See :hg:`backout` for a related method. Modified files are saved with a .orig suffix before reverting. To disable these backups, use --no-backup. It is possible to store the backup files in a custom directory relative to the root of the repository by setting the ``ui.origbackuppath`` configuration option. See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help backout` for a way to reverse the effect of an earlier changeset. Returns 0 on success. r}rts,uncommitted merge with no revision specifieds'use 'hg update' or see 'hg help revert'rMrr2r3rrCras[uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the mergesRuncommitted changes, use --all to discard all changes, or 'hg update %d' to updates:use --all to revert all files, or 'hg update %d' to updates5uncommitted changes, use --all to discard all changessuse --all to revert all files)r(rerOrr;finddaterbr?rrrSrr.rr rryrUrrrNr2) r4rVrhrWr(rSrrrXrNrrs rZrNrNsf    %D xx,,T7VHE''D$w-@V &&(JFB 88F dkk 1 = >=>  ((6 C ))$yA   tS )C 88J  88J  88F  88N #45  ;D""3T2 2DKKM"xxz 6>Aggi  8ggi  MND56Ds.. >>"dC K$ K(2D2DT2J KKr>rollbacksignore safety measuresc |jdds tjtdd|j |j d|j dS) aroll back the last transaction (DANGEROUS) (DEPRECATED) Please use :hg:`commit --amend` instead of rollback to correct mistakes in the last commit. This command should be used with care. There is only one level of rollback, and there is no way to undo a rollback. It will also restore the dirstate at the time of the last transaction, losing any dirstate changes since that time. This command does not alter the working directory. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. .. container:: verbose For example, the following commands are transactional, and their effects can be rolled back: - commit - import - pull - push (with this repository as the destination) - unbundle To avoid permanent data loss, rollback will refuse to rollback a commit transaction if it isn't checked out. Use --force to override this protection. The rollback command can be entirely disabled by setting the ``ui.rollback`` configuration setting to false. If you're here because you want to use rollback and it's disabled, you can re-enable the command by setting ``ui.rollback`` to true. This command is not intended for use on public repositories. Once changes are visible for pull by other users, rolling a transaction back locally is ineffective (someone else may already have pulled the changes). Furthermore, a race is possible with readers of the repository; for example an in-progress pull from the repository may fail if a rollback is performed. Returns 0 on success, 1 if no rollback data is available. r&rs)rollback is disabled because it is unsafes)see `hg help -v rollback` for informationrMrKr)rXr)rrr{rrollbackrO)r4rVrWs rZrr=sWd == ,kk : ;=   == 3488G;L= MMr>r)rrHc $tj|}|jd|5}|j|j dd|j |j |j|jdddy#1swYyxYw)aprint the root (top) of the current working directory Print the root directory of the current repository. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions. See also :hg:`help templates`. :hgpath: String. Path to the .hg directory. :storepath: String. Path to the directory holding versioned data. Returns 0 on success. rsreporootr)hgpath storepathN) r(rerrrrrrspath)r4rVrWrs rZrrwse.    %D gt $  gtyy1 tyyDJJ7 % $ $s ABBsserves accesslogs#name of access log file to write tosdaemonsrun server in backgroundsdaemon-postexecsused internally by daemon modeEserrorlogs"name of error log file to write tosports!port to listen on (default: 8000)sPORTsaddresss.address to listen on (default: all interfaces)sADDRs0prefix path to serve from (default: server root)rs6name to show in web pages (default: working directory)sNAMEsweb-confs3name of the hgweb config file (see 'hg help hgweb')s webdir-confs*name of the hgweb config file (DEPRECATED)spid-files#name of file to write process ID tostdiosfor remote clients (ADVANCED)s cmdservers templatessweb templates to usesTEMPLATEsstylestemplate style to usesSTYLE6sipv6suse IPv6 instead of IPv4s certificatesSSL certificate files print-urlsstart and print only the URLs [OPTION]...)rHrIrjc tj|ddgtj|}|dr*|jrt j td|dr|t jtdd}|ja|jd d }tj}|rtj|||rd }ntd |z}|j|t!j"||| }|j%yt'j(|||}t'j*||j,|j.S)astart stand-alone webserver Start a local HTTP repository browser and pull server. You can use this for ad-hoc sharing and browsing of repositories. It is recommended to use a real web server to serve a repository for longer periods of time. Please note that the server does not implement access control. This means that, by default, anybody can read from the server and nobody can write to it by default. Set the ``web.allow-push`` option to ``*`` to allow everybody to push to the server. You should use a real web server if you need to authenticate users. By default, the server logs accesses to stdout and errors to stderr. Use the -A/--accesslog and -E/--errorlog options to log to files. To have the server choose a free port number to listen on, specify a port number of 0; in this case, the server will print the port number it uses. Returns 0 on success. stdio cmdservers print_urls%cannot use --print-url with --verboserNrtFrsserver.allow-hidden-accessTsEignoring request to access hidden changeset by unauthorized user: %s ) accesshidden)initfnrunfn)rr;r(rerrrSr RepoError filtername configlistr:getuserr.ismemberror8 sshserver serve_foreverr/ createservice runservicerrun) r4rVrWrallowrrXrbservices rZservers?d ((w F    %D Lbjjq!IJKK H~ <//JK  ?? "MM!>E##%D))"dE:# 3   % %b$\ J ""2tT2G   T',,gkk JJr>sshelves7mark new/missing files as added/removed before shelvingunknowns!store unknown files in the shelvecleanupsdelete all shelved changess%shelve with the specified commit dates"delete the named shelved change(s)keeps1shelve, but keep changes in the working directoryslist current shelvesmessagesuse text as shelve messages)use the given name for the shelved commitpatchs]output patches for changes (provide the names of the shelved changes as positional arguments)sinteractive moderskoutput diffstat-style summary of changes (provide the names of the shelved changes as positional arguments)shg shelve [OPTION]... [FILE]...c tjddhfddhfddhfddhfddhfddhfddhfd dhfd dhfd d dhfd d dhfg fd }|dr6|rtjt dt j ||S|drt j|||S|drt j|||S|d s|d rt j|||St j|||S)asave and set aside changes from the working directory Shelving takes files that "hg status" reports as not clean, saves the modifications to a bundle (a shelved change), and reverts the files so that their state in the working directory becomes clean. To restore these changes to the working directory, using "hg unshelve"; this will work even if you switch to a different commit. When no files are specified, "hg shelve" saves all not-clean files. If specific files or directories are named, only changes to those files are shelved. In bare shelve (when no files are specified, without interactive, include and exclude option), shelving remembers information if the working directory was on newly created branch, in other words working directory was on different branch than its first parent. In this situation unshelving restores branch information to the working directory. Each shelved change has a name that makes it easier to find later. The name of a shelved change defaults to being based on the active bookmark, or if there is no active bookmark, the current named branch. To specify a different name, use ``--name``. To see a list of existing shelved changes, use the ``--list`` option. For each shelved change, this will print its name, age, and description; use ``--patch`` or ``--stat`` for more details. To delete specific shelved changes, use ``--delete``. To delete all shelved changes, use ``--cleanup``. rlscreaterrrrrrrrrrcj|r8D]2\}}|s ||vstjtd||fzyy)Ns2options '--%s' and '--%s' may not be used togetherT)rOrrSr)optr allowable allowablesrWs rZcheckoptzshelve..checkoptsb 88C= * 97s)3**-( #!+ r>s+cannot specify names when using '--cleanup') r(rerrSr shelvemod cleanupcmd deletecmdlistcmd patchcmds createcmd)r4rVrhrWrrs ` @rZr0r0+sMx    %D  {# i[! j\" YK 9+ 9+ 7) i[! 9+ Hg&' 7G$% J   ""@A ##B-- ) ""2tT22 '   T466 ( x0""2tT488""2tT488r>snothings status|stsshow status of all filessmodifiedsshow only modified filessaddedsshow only added filessshow only removed filessdeletedsshow only missing filessshow only files without changess%show only unknown (not tracked) filessshow only ignored filesterses$show the terse output (EXPERIMENTAL)s6show source of copied files (DEFAULT: ui.statuscopies)sshow difference from revisions$list the changed files of a revisionc  tj|ddtj|}|j dg}|j dd}|j dt }|t ur|rd}n|j dd}|r"|r td }tj||r@tj||gd }tj||d }|j} n0tj||d }tj||\} }d } |j!dd r|j#dd } tj$|t'|| } |j drd} nd} dj)} | Dcgc]}|j |s|}}|j dr||j*xr | d ddgzxs| z }|s|j*r| d d}n| d d}tj,|||}|rb|j/| j1|j1|d|vxsd|vdd|j d}tj2||}nH|j/| j1|j1|d|vd|vd|v|j d}t5| tj6d| Dcgc]}t9||j;dc}}i}|j#dd}|j d |j d }|xs|j dxr|j d! }|rt=j>| ||}d }|j@s|j#dd"r6|jCs&|j dstjD|}|jGd#|jId#|}d$| z}|j d! }|D]\}}}||vs d%|z}|D]}|jK|jM|&|jOd'|(|jQ|d#d)||*|jC|| |z|*||vr7|jO||+|jCd,| z| ||zd-*|s|jS|||r|jU||jWy cc}wcc}w).a show changed files in the working directory Show status of files in the repository. If names are given, only files that match are shown. Files that are clean or ignored or the source of a copy/move operation, are not listed unless -c/--clean, -i/--ignored, -C/--copies or -A/--all are given. Unless options described with "show only ..." are given, the options -mardu are used. Option -q/--quiet hides untracked (unknown and ignored) files unless explicitly requested with -u/--unknown or -i/--ignored. .. note:: :hg:`status` may appear to disagree with diff if permissions have changed or a merge has occurred. The standard diff format does not report permission changes and diff only reports changes relative to one merge parent. If one revision is given, it is used as the base revision. If two revisions are given, the differences between them are shown. The --change option can also be used as a shortcut to list the changed files of a revision from its first parent. The codes used to show the status of files are:: M = modified A = added R = removed C = clean ! = missing (deleted by non-hg command, but still tracked) ? = not tracked I = ignored = origin of the previous file (with --copies) .. container:: verbose The -t/--terse option abbreviates the output by showing only the directory name if all the files in it share the same status. The option takes an argument indicating the statuses to abbreviate: 'm' for 'modified', 'a' for 'added', 'r' for 'removed', 'd' for 'deleted', 'u' for 'unknown', 'i' for 'ignored' and 'c' for clean. It abbreviates only those statuses which are passed. Note that clean and ignored files are not displayed with '--terse ic' unless the -c/--clean and -i/--ignored options are also used. The -v/--verbose option shows information when the repository is in an unfinished merge, shelve, rebase state etc. You can have this behavior turned on by default by enabling the ``commands.status.verbose`` option. You can skip displaying some of these states by setting ``commands.status.skipstates`` to one or more of: 'bisect', 'graft', 'histedit', 'merge', 'rebase', or 'unshelve'. Template: The following keywords are supported in addition to the common template keywords and functions. See also :hg:`help templates`. :path: String. Repository-absolute path of the file. :source: String. Repository-absolute path of the file originated from. Available if ``--copies`` is specified. :status: String. Character denoting file's status. Examples: - show changes in the working directory relative to a changeset:: hg status --rev 9353 - show changes in the working directory relative to the current directory (see :hg:`help patterns` for more information):: hg status re: - show all changes including copies in an existing changeset:: hg status --copies --change 9353 - get a NUL separated list of added files, suitable for xargs:: hg status -an0 - show more information about the repository status, abbreviating added, removed, modified, deleted, and untracked paths:: hg status -v -t mardu Returns 0 on success. rrrtrr>rrSs status.tersescannot use --terse with --revrNsstatus.relative)r`forcerelativevaluerrrs4modified added removed deleted unknown ignored cleanrrr4rTr )rKrXrrsMAR!?ICutf8r&s statuscopiesrs no_statussstatus.verbosesstatusrsstatus.rr{)itemtyperrr)r<s %s status.copied),rrr(rerO _NOTTERSErrrrSr.rr rrr hasconfigrrfrprrrdrUrtersedirr iterbytestrgetattrdecoder pathcopiesrrreadmorestatusrrrrrr formatfile formatfooterr)r4rVrhrWrurterserXrrrrjrr0kr`rirdrb changestatesr show_copies morestatusrrshowcharr1rrrrs rZrUrUsT !!$x8    %D 88FB D XXi %F HHXy )E  EIIk?;E 01s## ))$)D##D&$7wwy))$i@''d3 d ||K!34]];8JK""  J-H  xx  D J J LF -v!!AvD - xx 6fRajH:5@&@  88"1:D"1:D dD$'A {{ IIK IIK $  /$%-+. e,{{ IIK IIK $    $  HH[ ! Z(289&Qqxx' (&9L D--7K xx &hhy) 2$((6"2DHH=9K  tQ/J r}}[2CD #++D1 HHY i &B #+C88L))H*tU D=&E  t $q1 Xy&$e Lx{*%89GG47G+HH 3(47*;;.))!R0+$#FFHi .L :s S;$S;"T s summary|sumremotescheck for push and pulls [--remote]c 0123tjjdd}|j}|dj }g} t j j}t|j}|D]} j!td| j#| fzt%j&| j!dj| j)d| j+r|j-| j+| j#d k(r@t/sj!td nj!td | j1rj!td | j3r?fd | j5D} j!ddj| zdzj!d| j7sj9d| j7j;dj=zdzd|j?} jA| }td| z}| dk7rj!|dnj9|d|rjB}j!tdd|^||vr6j!d|zt*jD|jG|n$j!d|zt*jD|D]}j!d|zdj!ddj9d}jHjK}gg}}|jMD]{\}} | |jNvr-|jNjG| |jQ|n|jQ|||jRvsa|jRjG|}|jTD cgc]$} |jW| jYs#| &}} j[tdd|j\fj[tdd|jRfj[td d!|jNfj[td"d#|fj[td$d#|fj[td%d&|j^fj[td'd(|j`fj[td)d*|fj[td+d|fg }g}|D]%\}} | s |jQ|t/| z'dj|}d,}jbjed-r|td.z }jbjed/r|td0z }nt/|d1kDr|td2z }n| |dj?k7r|td3z }n|djgr$|jA| d4vr|td5z }nM|j\s/|jRs#|jNs|s|s|s|td6z }d}n||vr|td7z }|rtid8|D}ntjjl}|tkjnkDr|d9tjjp|zz }|r,j9td:|j=zn+j!td:|j=zt/jrju|Dcgc]}|j c}|}|dk(rj9td;nJ||vrj!td<|zn(j!td=|t/|fzg}t/jwd>}|r|jQtd?|zt/jwd@}|r|jQtdA|z|s|r,j9tdBdj|zt1jxt0jzredCD]`} t/jw| dDz}!tdEtdFtdGdC}"|!dkDsGj9|"| |!zdzbt}j~jdHrdI\}#}$n3dJ\}#}$t}jdD]\}%}&|%rd}#|&s d}$|#s|$syfdK}'|#r|'\3120}(n dx3x1x2x0}(0123fdL})|$r |)\}*}+},}-ndx}*x}+x},}-jdHr"2J|-Jg}|(r|jQtdM|-j}&|&r&|jQtdNt/|&z|,xs2}.dO|.jdPvrft+j|.}/|/ddkDr |jQtdQ|/dz|/d1dkDr |jQtdR|/d1z|r-j!tdSdj|znj9tdTt}j3120f|*|+|,|-ffy#tj$rE} dj| j} jtd| zg}Yd} ~ Gd} ~ wwxYwcc} wcc}w)UaTsummarize working directory state This generates a brief summary of the working directory state, including parents, branch, commit status, phase and available updates. With the --remote option, this will check the default paths for incoming and outgoing changes. This can be time-consuming. Returns 0 on success. summaryNrrs6warning: merge state has unsupported record types: %s sparent: %d:%s rslog.tagrs (empty repository)s (no revision checked out)s (obsolete)c3HK|]}j|d|zyw)s trouble.%sNr)r instabilityr4s rZrzsummary..s)#4Kmk&AB#4s"s (r)rs log.summarys branch: %s rs log.branchs bookmarks:s log.bookmarks *s [%s]T)rXs %d modifiedsstatus.modifieds%d addeds status.addeds %d removedsstatus.removeds %d renamedrs %d copieds %d deletedsstatus.deleteds %d unknownsstatus.unknowns %d unresolvedrbs %d subreposFrs (graft in progress)s updatestates (interrupted update)rs (merge)s (new branch)rNs (head closed)s (clean)s (new branch head)c3<K|]}|jywr)r )rrs rZrzsummary..Ts6g1779gsrs commit: %s supdate: (current) s#update: %d new changesets (update) s3update: %d new changesets, %d branch heads (merge) sdraft()s%d draftssecret()s %d secrets phases: %s )sorphanscontentdivergentsphasedivergents()sorphan: %d changesetss content-divergent: %d changesetssphase-divergent: %d changesetsr)TTFFctjd d}|j} tj i|}|jgf}tj ||d\}}|r|Dcgc]}|j|}} jdtj|jz jj5tj ||}ddd|j|||dfS#t j $r&jdr|j|dddfcYSwxYwcc}w#1swY^xYw)Nrrrr)rr)r<rrBrrrrrOrrrArrr4silentrfindcommonincoming) rsbranchrrrurr commonincrWrVr4s rZ getincomingzsummary..getincomings(// B K++ 7GGD"d+E KK$))$xFh 156#ELL%D6 ''*>*>txx*HHI WW^^ !44T5MIxx%IaL@@ 7xx "88WdD$6 6 77  s#D,EE6D?>D?Ecd}djvrd}ndjvrd}d}|1tjd |}|j}|j}nd}d}t j |gfd\}}|k7rD t j i||n|}jdtj|zn ||ddfS}|k7s  |k7rd}n }|r|Dcgc]} j|}} jj5t!j" |||} ddd||| fS#tj$r jdr||ddfcYSwxYwcc}w#1swYExYw)Ns default-pushrrrr)rr)rr<get_unique_push_pathrrBrrrrrrOrrrAr4rrr)drrdbranchrurdotherrrrrrWrVrsotherr<r4s rZ getoutgoingzsummary..getoutgoings  bhh &A 288 #A =// D"aHD88DkkGDG))$wmTJh T> 1r43C4N HH+g.B.B4.HH I ^$, ,F T>g1g6HFF 045DKK$D5 WW^^  33fHWfh..)?? 188I&WdD00 16  s$E%E2E7+E/.E/7Fs1 or more incomings %d outgoingrrws%d incoming bookmarkss%d outgoing bookmarkss remote: %s sremote: (synced) )Er(rerr?rrir"r#r unresolvedrUnsupportedMergeRecordsr recordtypesrorrrr changesetlabelsr3r rrr$ isunstable instabilitiesrrU splitlinesrrBrCractivebookmarklabelrrbrrrVrrUrMrNrrrTrWrXr7rr\rr'publicnewcommitphase phasenamesr8rrur^r_r summaryhooksrOsummaryremotehooksrrxr)4r4rVrWrr?pnodemarksrrr4rbrrrBrTrirrUrcopiedrenamedrrTrrr cleanworkdir pendingphasernewrErFtrouble numtrouble troublemsg needsincoming needsoutgoingrrnrrrrrrrrcountsrrrr<s4``` @@@@rZrrsg (    %DHHZ t*CkkmG AJOO E E +  % % * *4 0"--/*    AEEGQ< /,,Q/   1668$J7 ;;= LL ' 557b=t912389: ::< HHQ~& ' <<>#$??#4M HHUUZZ 66= >  ==? IIq}}113A6<<>>F$  5>ZZ\F   f %F /V#A  -( != ) %% =!9  y/L/LM V$F*)2O2OPA HHTAX_H 5 o. [[[ &F A"GF 1   NN ! !! $ NN1  MM!    LL   "|| :|!swwqz'7'7'9A|D : !N#%7 8&//J !K./ 2FLLA !M"$5 6G !M"$4 5w? !L/#3 4f= !M"$5 6G !M"$5 6G !$%'< =zJ !N#%7 8$? F A1 HHQQZ   1 AL xx}% Q& '' xx~& Q' (( W  Q{^ 71:$$& & Q    "u0@0@t1A1( Q !! << >>    Q{^ f  Q$ %%6g66 }} f++B// X)),7 77 !O$qwwy01 ?#aggi/0  ""G#DGDDIIKG#DfM C ax !*+, f  :;cAB  E FCK  ! A  *% &E  ;%'( ;' (F  <6)*  !O$uzz!}45$ 9 9:JGTYYw78J56%&'J%K#$%F#GJ A~ *W- :UBCK T" xx '1$ }'3$ }..r4tDDAq $  $ E ] A*7B}4H;????6?I)/)/V*5-'gvx-111w1( xx !!!###   HHQ,- .    HHQ~&Q/ 0 & 5>>-8 8&&tU3Fay1}34vay@Aay1}34vay@A HHQ'5::a=9 : IIa-. /    Wfi 0 7FH - M  ( ( IIamm $  H IA M  X ;~$Es*n$o 6o o% o:oors force tagsmake the tag localsrevision to tagremoves remove a tagsuse text as commit messages8[-f] [-l] [-m TEXT] [-d DATE] [-u USER] [-r REV] NAME...c H tj|ddgtj|}|j 5|j 5d}|f|zDcgc]}|j }}t|tt|k7rtjtd|D]9}tj||d|rtjtd|jdr|d}|jd}|jd r#|jd rd } nd } |D]}|j|d k(rLt!j"||} | |d |j$k(r!tjtd |z|j|s!tjtd|z|j|| k7s| d k(r!tjtd|ztjtd|zd}|s`ddj'|z}nK|jds:|D]5}||j)vstjtd|z|jd s|j*j-\} } | |j$k7rtj.td|j1} |jds$| r"| | vrtjtdt3j4||j7}|tjtd|jd s'|t$k(rtjtd|sddj'|t9|fz}|jd}|rt;j<|}|jd rd}nd}tj>d"d|itj@|}t!jB|||||jd |jd ||!ddddddycc}w#1swYxYw#1swYyxYw)#a add one or more tags for the current or given revision Name a particular revision using . Tags are used to name particular revisions of the repository and are very useful to compare different revisions, to go back to significant earlier versions or to mark branch points as releases, etc. Changing an existing tag is normally disallowed; use -f/--force to override. If no revision is given, the parent of the working directory is used. To facilitate version control, distribution, and merging of tags, they are stored as a file named ".hgtags" which is managed similarly to other project files and can be hand-edited if necessary. This also means that tagging creates a new commit. The file ".hg/localtags" is used for local tags (not shared among repositories). Tag commits are usually made at the head of a branch. If the parent of the working directory is not a branch head, :hg:`tag` aborts; use -f/--force to force the tag commit to be based on a non-head changeset. See :hg:`help dates` for a list of formats valid for -d/--date. Since tag names have priority over branch names during revision lookup, using an existing branch name as a tag name is discouraged. Returns 0 on success. rrrfstag names must be uniquers/tag names cannot consist entirely of whitespacertrrrfrirstag '%s' is already removedstag '%s' does not existstag '%s' is not a global tagstag '%s' is not a local tagrGsRemoved tag %srrs)tag '%s' already exists (use -f to force)suncommitted merges;working directory is not at a branch head (use -f to force)Nscannot tag working directoryscannot tag null revisionsAdded tag %s for changeset %sr}s tag.removestag.addr-ryr/r)"rr;r(rerarrrrrrSrr.rrOtagtypetagsmodfindglobaltagsrrr3rbr?rQrCr rrrr9r<r1r2r)r4rVname1rrWrev_rrr3 expectedtypealltagsrrSrTrrr-r0s rZrr s ^ ((x%A    %D tyy{%*Hu$45$4q$45 u:SZ (""1%@#AB BA  ! !$6 2&&HI 88F Gqz!} 3#..<=A||A**1-G+H1+LMM<<?l2#y0#..=>B$..<=A$D+ejj.??(# #**FG!K xx!]]**,FBT[[ &&q)='>??%%'F88H%&Rv5E&&- ##D$/446 <""1%D#EF F)$""1%@#AB B6 5!d :G xx  %%d+D 88I $H!H((  !)!3!3D!9       HHX  HHW   o#5#{sKR R R1AR DR *B R 4HR 6RR  R RR!c tj|}|jd|jd|}|j}t |j D]\}}||}d}|j|} | r| dk(rd} nd| z}|j|j||jdd|| d d tj|z zd z} |j|j d | |jj!||| |j|j"xr| dd| | |j%d|j'y)alist repository tags This lists both regular and local tags. When the -v/--verbose switch is used, a third column "local" is printed for local tags. When the -q/--quiet switch is used, only the tag name is printed. .. container:: verbose Template: The following keywords are supported in addition to the common template keywords and functions such as ``{tag}``. See also :hg:`help templates`. :type: String. ``local`` for local tags. Returns 0 on success. rrs tags.normalrir>stags.rrrrrs %5d:%srrs %srN)r(rerrrreversedtagslistrrrrrrrrr8rrrr) r4rVrWrrrrhnrrrs rZr3r3sG6    %DHHW gt $BjjG)1 QZ,,q/'Y.Gw&E    /b8,,Q//0:= L   NN  q !    JJ "7GVWE   1*2FFHr>r:s show patchsgitsuse git extended diff formats [-p] [-g]c tj|}tj|||}|j |d|j y)a6show the tip revision (DEPRECATED) The tip revision (usually just called the tip) is the changeset most recently added to the repository (and therefore the most recently changed head). If you have just made a commit, that commit will be the tip. If you have just pulled changes from another repository, the tip of that repository becomes the current tip. The "tip" tag is special and cannot be renamed or assigned to a different changeset. This command is deprecated, please use :hg:`heads` instead. Returns 0 on success. r:N)r(rer rwr`r)r4rVrWrs rZrOrOsB4    %D--b$=I NN4<  OOr>unbundles6update to new branch head if changesets were unbundleds [-u] FILE...c :|f|z}|j5|D]}tj||}tj|||}t |t jr)tjtdtdd|z} d} t |tjsdtj|z} |j| 5} tj ||| d|} dddtj& }  dddt)|| |j+d ddry y #1swYJxYw#tj"$r3} tj$td || fztd d} ~ wwxYw#1swYxYw)zapply one or more bundle files Apply one or more bundle files generated by :hg:`bundle`. Returns 0 on success, 1 if an update has unresolved files. s3packed bundles cannot be applied with "hg unbundle"s$use "hg debugapplystreamclonebundle"rMsbundle:rs unbundle %s)r<urlNs%s: unknown bundle feature, %ssEsee https://mercurial-scm.org/wiki/BundleFeature for more informationrrr)rrrr readbundlerr2streamcloneapplierrrSrr unbundle20r<rrD applybundleBundleUnknownFeatureErrorr{combinechangegroupresultsrrO)r4rVfname1fnamesrWr rgenrtxnnameropr3rs rZunbundlers(Y F E B&A%%b!U3C#{==>&&)BC u$C %!#w'9'9:-0D0DS0IIG%%g." ,,c2ksB/88s shelvedstatesunshelve already in progress)r rrRrrsupdate|up|checkout|cos'discard uncommitted changes (no backup)schecksrequire clean working directorysmerge uncommitted changessrevisions[-C|-c|-m] [-d DATE] [[-r] REV]c tj|ddd|jd}|jd}|jd}|jd}|jd}|r |rtjt d|j ddr/|s-|s+|s)tjt d t d  ||d k(r|}|r |tjt dd } |s||sd} n|s||sd} |j5tj||rtj|||}|} |rtj||gd}tj||d } | j}| j} d|jdd i} |j!| d5t#j$|||| || }d d d | rk| j'd d}|j)t d|z| j+r+t-j.||| }|j)d|zcd d d S#1swYxYw#1swYy xYw)aupdate working directory (or switch revisions) Update the repository's working directory to the specified changeset. If no changeset is specified, update to the tip of the current named branch and move the active bookmark (see :hg:`help bookmarks`). Update sets the working directory's parent revision to the specified changeset (see :hg:`help parents`). If the changeset is not a descendant or ancestor of the working directory's parent and there are uncommitted changes, the update is aborted. With the -c/--check option, the working directory is checked for uncommitted changes; if none are found, the working directory is updated to the specified changeset. .. container:: verbose The -C/--clean, -c/--check, and -m/--merge options control what happens if the working directory contains uncommitted changes. At most of one of them can be specified. 1. If no option is specified, and if the requested changeset is an ancestor or descendant of the working directory's parent, the uncommitted changes are merged into the requested changeset and the merged result is left uncommitted. If the requested changeset is not an ancestor or descendant (that is, it is on another branch), the update is aborted and the uncommitted changes are preserved. 2. With the -m/--merge option, the update is allowed even if the requested changeset is not an ancestor or descendant of the working directory's parent. 3. With the -c/--check option, the update is aborted and the uncommitted changes are preserved. 4. With the -C/--clean option, uncommitted changes are discarded and the working directory is updated to the requested changeset. To cancel an uncommitted merge (and lose your changes), use :hg:`merge --abort`. Use null as the changeset to remove the working directory (like :hg:`clone -U`). If you want to revert just one file to an older revision, use :hg:`revert [-r REV] NAME`. See :hg:`help dates` for a list of formats valid for -d/--date. Returns 0 on success, 1 if there are unresolved files. rKcheckr!rrr$rSrsyou must specify a destinationsfor example: hg update ".::"rMNr>s'you can't specify a revision and a daterGrsr)rr%rr)rK updatecheckrsupdated to hidden changeset %s s(%s) )rrrOrrSrrraclearunfinishedrr.rr rrhiddenrErrrror$r%_getfilteredreason)r4rVrrWrrrKr"r!r#rrr%rVractxstr obsfatemsgs rZrrs=J !!$'B ((5/C 88F D HHW E HHW E HHW E tq!DEFF }}["78C""3467   {cSj q!KLMMK !% %#E % ""2tT2C --dSE9ED""4d;ggi+TXXfc-BC   y) 4""D#t5kC5 WWYs^F GGA9:VC D||~$77fcJ  J./1 5 4 s&B)I0I$$A6I0$I- )I00I9rW)r>fullFs"perform more checks (EXPERIMENTAL)c tj|}d}|drtj}t j ||S)averify the integrity of the repository Verify the integrity of the current repository. This will perform an extensive check of the repository's integrity, validating the hashes and checksums of each entry in the changelog, manifest, and tracked files, as well as the integrity of their crosslinks and indices. Please see https://mercurial-scm.org/wiki/RepositoryCorruption for more information about recovery from corruption of the repository. Returns 0 on success, 1 if errors are encountered. Nr))r(re verifymod VERIFY_FULLrr6)r4rVrWlevels rZr6r6 s<*    %D E G}%% 99T5 !!r>c tj|}|jr|jd|j d|}|j |j dtdtjtd}|js|j||jr|jtdg}g}g}ttjD]b\}}|j||jtj|xsd|jtj |d|j#dd } |rd t%d |Dz} td td g} t'|||D]\} } }| j | j)|jd| | |jr| jd| |z| j+|| j)|jxr| dd| |js| jd| j-|j-y)aoutput version and copyright information .. container:: verbose Template: The following keywords are supported. See also :hg:`help templates`. :extensions: List of extensions. :ver: String. Version number. And each entry of ``{extensions}`` provides the following sub-keywords in addition to ``{ver}``. :bundled: Boolean. True if included in the release. :name: String. Extension name. rDsvers'Mercurial Distributed SCM (version %s) s(see https://mercurial-scm.org for more information) Copyright (C) 2005-2023 Olivia Mackall and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. s Enabled extensions: Ns extensionss{name} rs %%-%ds c32K|]}t|ywr)r)rrs rZrzversion_.._s%  OG 88  zz /01 E DKz4467 f T J,,V4<=:66v>?8 ={ 3B #%c|Dcgc] }|tvs |}}|r.|jtd|dj|fztj |ycc}w)z.Load command functions from specified cmdtables&extension '%s' overrides commands: %s rN)rrorrr)r4rucmdtablerrVs rZ loadcmdtabler<ns] (9C5LI9  8 9TYYy)* +  LL :s AAr1) NNNNNNNNNrr)r>)NNNNNNN)r)rf)r rIrki18nrrrrrrr r(r r r r rrrrrdebugcommandsmodrrrrrrrrrrr+rrrr r!rFr"rir#r$r%r&r'r)r*r+r,r-r.r/r0rr1rr2r3rr4rr5r6r+r7r}r8utilsr9r:r;r<rrr_tableINTENT_READONLY encodingmoder dryrunopts remoteoptsrP commitopts commitopts2 commitopts3 formatteropts templateoptslogoptsr diffwsopts diffopts2 mergetooloptssimilarityopts subrepooptsdebugrevlogoptsCATEGORY_CHANGE_MANAGEMENTr[CATEGORY_WORKING_DIRECTORYrgrpCATEGORY_FILE_CONTENTSrCATEGORY_IMPORT_EXPORTrr rCATEGORY_CHANGE_NAVIGATIONr~CATEGORY_CHANGE_ORGANIZATIONrrBrr r(CATEGORY_REPO_CREATIONr;CATEGORY_COMMITTINGr#rH CATEGORY_HELPrrrrrrrrrrr addunfinished hgabortgraftrrqrrCATEGORY_REMOTE_REPO_MANAGEMENTrrrrCATEGORY_MAINTENANCErrrr?rr rr4r?rOrYrrrtrNrrrrrUrrrOrr hgabortunshelvehgcontinueunshelver9r<rr>rZras. ////////////`   % % , ,- )  E "++   EF '  &#q45qyA   Q  8T1/01 :tQ:;<   FG '    DE )  (D!678+tQ012  %& )   *+ '  ,a HIJ'4=>?*dA@AB*dADEF 7D!456)UA;<=  ?@ ' s@ D            !! !! %% ## //          %% ''!! ))   33  *  *8   {Z'33 /#/#d [ 8+j833 EEEEP  vsA@A1V9M    I J  lD!$F"GH wa :;< wa ABC wa 456 wa @AB y$"G HI |T1%:#;<    9 :      5 6 fI  +:;<=>?@<=//K&NLO&NL^  lD!$I"JK    6 7 iL   vsA78!F)D wQ@A1W:N   //#&M'&M`     = >      E F  lD!$4"56    E F fI   vsA45qyA wq!DEF-01234567833? B57C B57pl ^  x"7 89 wq!789 vua 567 wq!:;< y%#=!>?    5 6 fI   {E1%?#@A$%33%.     B%)(B%J  x( , vsA=>& J y%#=!>? y#q!;      ; <      D E fI      ; < iL      L M fI   vtQIJK    / 0 gJ  G*VW+XMN//_0bEc0bEP      9 : iL   vsA9:AfIF iq!DEF   //  %(4 )(4 n      1       6 7 fI      &  fI     3  iL  gtQDEF otQ'K%LM iq!FGHO(RS)T"#// _0bMc0bM`     J K  otQ'F%GH ha LMN y$"H IJ ha EFG wa CDE  !  K L  ~tQ'>%?@%()*+,-./0,,;>;2?>;2|I X $ |T1%L#MN    < =  wa 345 xq!:;< iq!FGH    D E  mT1%M#NO y$"7 897:;<&&  G$JU K$JU p 33  ,  ,4  iq!GHI xq!KLM    E F fI      < =  "#$%&89//-0"210"2J lO&&  ,,  Ja ;<=>kN&&  442  vr156& B gsA677D eS!23QwZ@ y#q!;%?@  33 / /d  vr123QvY?    D E fI   {E1%@#AB gua 9:; hq!;<= wq!DEF fdAABC    J K  x. 12    7 8      5 6  7!DE"FG#HI$J'(33Q)T`1U)T`1FG T    "" G H  y$"8 9: fdA@AB        wa :;<    >    ~tQ'C%DE  !  > ?  ~tQ'E%FG    ; < fI      Q    wa ABC wa @AB]/`a0bc1d/0//  o8rSs8rSl      B C kN   wq!?@A    : ;  y%#I!JK"#$%&33  -0C10CL  |T1%E#FG z4#A!BC z4#B!CD    3 4 kN  %&&&   #&'&>  vsA@A1V9M vtQ<=> udA89: y$. 12 wa o. |T1%6#78  #$33  (     F#"FR    =  fI  wQ891W:F iq!GHI wq!DEF    L M      @ A      C D  j$"C DE ha EFG ia >?6K    I J  G)TU*VW+XY,Z//a1due1dup     ; <  a(C&DE ia ABAgJO    8 9 fI   |UA&:$;<    9 : iL  #2345678EF88? BX/C BX/v  *+//  &      6 7 fI      ; <      > ?  *+,!"33361761h     V       N O      2 3 gJ   y$"6 78    < = gJ      3 4 fI      C D m       ; <      I J  wA<=qzJ    R  iL     > ? iL      : ; kN      @ A fI  aWpqXrsYt33  AaDd4EaDd4N  vsA45qyA feQ?@A  kN--   6  6 r      I J  vsA23QvY?    B C  ha :;< !"33+.T9/.T9n  - .mmF 6 7      ; <      G H fI   a(C&DE |UA&:$;<    9 : iL  !01234562388=@4.A@4.n     7 8 fI   33 5! 5p  iL88   MM`  y%#C!DE x"A BC y%#C!DE x"D EF vr1/0!F)< &'55 N Nb#L      I J      = >      5 6      8 9 fI   {B"5 6+G    9 : iL      G H  E(RS)TEF88]/`aa/`aH  a(C&DE fdA89: z4#>!?@ gtQ9:; ha/0 xq!LMN    )    j$"J KL!$%&&'33-0K,10K,\  xq/0    G H fI   {B"5 6+G a(L&MN    9 : iL   mUA&C$DE    @ A      < =  3@A B>?88K&NfO&NfR L--   2  xq!CDE xq!MNO     33 3  3 l  iq!HIJ xq!MNO    F G fI      < =  "#$%&#$33-0"?10"?J  vtQ=>? wa DEF wa 9:; y$"= >? |T1%:#;< k4#4!56   33"U#"Up  vtQLMN wQ@A1W:N vsAABAfIN |T1%J#KL ~tQ'J%KL '(33 ^L ^LB 45!,E*FGHH-- 2N  2Nj    33  8  80      4 5 gJ   y$"= >?  "a(I&JK    3 4 gJ      2 3 gJ      ? @ gJ      A B iL      G H gJ      D E gJ      ; < gJ      4 5 gJ   ha @AB    . / gJ   |S!$;"? z4#=!>? xq!CDE z4#K!LM z4#=!>? |T1%:#;< xA&M$NO    G H      ; <  fb!<=qyI    5 6 fI  1@A BC!DE"F33  S*VW W*VW t  9dA89:;33   CCL   xq/ xq!678 vsA011V9= iq12 wa CDE z3"? @!G*M AB55B B J  55   2 2 j  xq/0 vtQ>?@  lO33  ,     G H  o// , ,^  xq!JKL    : ;  ~tQ'M%NO wa ?@A    7 8 gJ   wQ456    < = gJ  %4/033;>-A?>-A` ''-- , -   xq!KLM xq!CDE xq!=>? wQ@A1W:N vsAkNAfI6 ()33 k k\  AB-- "  "0 &&    < < ~r>