U pe!qe!e#e#e4e32f-ff-ff.fg(gT?gg5!h3Whhh$hhh i+i*Bimiiiiiiij !j /j=j'Pjxj-j4j+j-!k:Ok4kkk8el;l0l( m/4m,dm:m-m'm+"nNno2*o4]o)o.o$o/p@p#Vpzp-p.p9p>+q)jqq+q!qrr30r,drr.r%r$s#'sFKss*sss9 tCtttu v_vvOw]wNIxAx"x'xZ%yMy3yXz7[zLz:zD{?`{5{@{J|rb|G|,}JJ}4}L}*~LB~.~6~;~Y1c:2*:])&€?E)CoH1F.6u/܂Dk\n D|O0XBL6ZTzDφnd$"= xhlihKCԒ^-=ʔb  !337.+.Z!*ƞ/]!([(y "~$:Dޤ"#SFPo>\Y](ЩZmuZRHmpCp0\ 0>BZ$ιON^O $@e2MZii.[Xvcj3^^_\;'y!/*K,ObkW&~%  }.1 )N{YR>pl(E|ENH ?SF_ <buYc53(i21$%&BFi6)'39!m4SW<:wT !^|IkM25t+[A]VbY~lj  r  }  h fL  V wm^t-e a<mA;ss$s  3( $\!";#$v$cd%%&'(B)*a+`F,z,j"-v-o.xt.z.qh/P/+0f0Y1 2Y23 3)@3j335q6:627,789Rp::u;q<=@>>y?+?E)@o@@bACCrEVG)I3J'SKP{KLTM_MINXOoOjpPCPCQPcR7RR8SLT9(UObUU/VVVX[Y{Y4Y7Y'Z9.Z@hZJZ!Z>[>U[C[C[E\=b\;\5\B]4U]6]?]^^,:^9g^^-^L^E0_7v_C_H_f;`T`\`KTada7b-=b6kb-b+bXcUdTep]ee_qf?fgeg9ijj1kfk:lzmmno+owpr{#ss#tpuwwwyizO{N|}4~ Wts (78~1$9j'i†,xBc:hJA9~T>ӓ:ݔRcU .eeG-Aoqvj]iǟ&Ov|J[9y`Zs^Υ-ͧ3tx!ͪ$c̬;0la}poVW96ʹ`e"X]P}йNN0=AkJ3VsB#5\&WP{ }Roh@hA.IpBmhk8_ ]mmn9x+*8LXbu--  $7D>|\jrSv1.8+Cd.L_{ow 0g20M=J9', 7:K91FFYu"1%TzBCJ ;k3=M80LiLC@_O==Loefa1JK|>GVO7#>A~Z*6Qh *  !    t ' x)$h0B% v&U!/Q806%N oW1H2SZO e4 @!z!A"#_ #8##$$$0$B%*K%v%x%/ &a=&&&)p)>L*[*3*-+I+X,p[,U,""-E-V.,./m7/ /?/d/T0E12h2g334hz5L5e06D6?67/*7BZ758 8 8*8*9A9 J9T9c9w99 999 99691:O:5`:W:S:*B;Mm;-;;C<:<0=5=,">O? i?0?*??@6 @A@IP@W@8@<+AUhAUAWBUlBVBoCC"C*C*C% D1D&JDqEyEE EEEEEEEE EE E E! F+FAF VF `F!kFIF,FG G+G!AGcG!yG"GG G7G HH 4H ?HJH jH vH H HHHHHHHH0H0I3I1OI0IIIIIJ4J-MJ*{JJ"J)J$K+,K&XK%K-K(K+K (L3LIL_LvLLMLOLF=M MM)M(M)M*N*FN'qNN&N+N%O ,O&MOtOO O!O OOP,#P:PPPPPPPQQ1%QWQnQQ3QQQ#R$R;RRRcRRR6RR SS6S*LSwSSS'SS"S%TATSTfT|T2T&T*T"U+?U+kUUUUoU]VxVVVVVVVW' W5W OWZWaWeW{W WWWW$WWW+WI(X,rXX+XX)Y-Y+GYsY yY&YY'Y>Y/Z>IZ(Z(Z+Z6[A=["[[5[[3\(D\7m\)\\\"\]*-] X]f]0B^<s^^^.^& _F4_F{_4_d_R\`4`M`E2a$xa+a)a>a2b}bvcAc'ccJeZeeg06hgh#ijqk.yl7mXmk9nn*0o [o>|o4o4o&%p$Lp$qpEp#p#q#$q1Hq%zq+q qq%q rr5rGrqtrtnu{uuuTvvQwAyy}zB{)V{8{{1{||L|D}\=~~p*ydcuBمat"\8-0"MSQ:Co5qoCF;UKn=>NU775ShoRRs<Ɨ0W4=Xʘ#™i"aԜ)6.` >yuek۠G3?sjw= =6ޤFk\?ȥTA]gTI\Xq%ʩcSF~3iű,I=o^6 0BD*9o\Hڻ;#P1 +.7">a+0_#=!aJ<eDh2F7'-?UM#r!!CLPl(];#++ L-'1)([*[8>^Bq/g!y5bs   )@U17?W BCChI<A8$Gl%++Wn# ;2$ 0;rw~ \~Hf0f<> # He* x.B( !.>O^s O53BapyJB EF "  B  /  , 98 r  u $  (c E}P]7v1M90O7b  ng/ "I4~[ m !Gj"u"L(#u#F $R$$|%&>&S&-*)X)*k/**|*m+4++'+P,T, -L->E.}./|/GL1J1n1@N2A22W45_46 7+7p7=8 9$9::%::;Ac<<)=>T@=@uAANA^AR>BCCDD4DE{FFFFF#-G-QGiG1H3IOIsJ%tJJWKfK&wKL9=M8wN*OOvO1oQQ)nRRR RRRR R+ S*7S&bSSSC@T]T+UVsVl6XX/Y}Y >ZIZ^ZyZZpZZ; [KG[K[[[`\K~\1\r\o]!^^[P`5aa*ubbbwckEddUejeeee&~fg-ggth=i=ViiiNj;Wjj j!jjjjjk= lvHllEnnoZKp_pr$sPs;t uwwkxBByyxu{_{N}1}.~[~AjȀ3'݁!#؄\  vЉ'G&owYы)G2 <CvӑfJz+,(XW^T( #4"Xm{(Qœ}џDOw~ S!ߡNn*#N>-qlޥ^t~1J*u& CAO45Ʊt²]7\=Q5Q4n TAu *'.R<rD rRżLCly /n%E M+Hd'0!nrY$/>P'!x/ST$k XGNR~h4w9&':@_!|  82;N( <:V _m3# 9= LVh#o 6 !?Y(t.Gdw I9 .@8o-)*%IDo7=B*m4j!evtP ZPzK%2F`EdsH=gw:NX,DYys5]NR<57r%A*u7LK(gt;uR1UOjX)S' {  e. , B 1 6 E w2}D(Gm-U9ceZh))S?g4z/I0):ZB#ZW_k?U aB~&9C#MLIIl3Nv>} @  m!'"h#G##?Z$U$N$u?%/%%% &+&&>(=(H-)&v)c)E*YG*4*7*2+:A+z|+x,p-@.N.O-/b}/K/,01F101'24689w:;F<<=j>#@kAB&C(EFIG H+(HTH@IISJKQKK,LkMANZO;aOHOO}POQ?UQ*QQEQ &R+GSsS7SJS TU"UCUUVxyW6W.)XOXX3XqX[NYYMaZyZv)[I[[[\O]:g]]3#`~W`S`C*a$nabN/dJ~d`d*ef2hhfjWk/ok)k$kQkL@lrlmm nm|nH oUoIo;HpGp5p(q3+q6_q'qq*q(q(%r*Nryr,r-rrr4sFs _s is tssssss.s6t%Qt.wt5t3t:uKu#wuu#u1uH v+Vvvvvv6v"w!9w*[w2w0w0w.x2Jx}x xxxxxx yy.9yhy.y,yyy z""zEz\z6wzzz"z*{9{%Q{w{#{{ {{+{|;|U|u|| |%|| } }?}[}u}#}4}2}#~-C~ q~~~*~ ~~#~#%,>(k=129= LYw##'݀%&+9R;#ȁ- F>S.؂ 4$"Y| <΃< Hb s ,((>U!pl.e.G`^"Ydۊ:@;{4A@1DבXIuAfE'9pXɔ(Ҕ-B5^"!%ٕ1$Ns3"Ж#;3%o &#ݗ/ C?d$ɘ$:'_ +&ԙ'!#'E&m&!&ݚ, -M#{!($%'J/r+#Μ! 5#Q)u/$*>#^".۞B MB`9$ݟ(#Bf&'ܠ!&@ \:}=2.)-X)+'ܢ6";%^f.&$A*f%#*ۤ"*);T;$̥3%(Aj((0Ԧ$@Xq$0ŧ"K'eU #&7#O5sé+#;_)sʪ!: Vw), %?[u% Ƭ۬"71<i06׭98H4,<& 3G {5#ί 6H[IuٰD>'Px$ͱ-4?6t+/ײ #2 Vav81 >Scu3)Ŵ& "3V)uܵ0"H+k.ƶ."6A x%ط  $ 0C Cd">˹5 @ P,q!Ӻ ++I5u(+Ի "(Kew!.Ѿ 2,@&m!ֿ!*$Lq -36#Sw  %]^}'8&-C#_ #+'=/Z'")B"a)>/H,h*'(@P)h"4  :F&X/")a20#)< [g|"*?EA!+4M`*>^'y/,-')U/( &'N`w&2C&[.&#Cg&|1!'-6d i#,DVu(14!8V'!%!D,f  < ((8a1} -C8B{& . D E+O){-E (2BUo$)  , HV,i  A!Y*{ -*Al8 5!3=-q'$#/Sr2.+!G i!### Gh/8?>R 0 ! 0&?=f5!1 BOo1C:X&` 4-,"&O;v)'3:8*s: !8,U/!"$Di+('5O j,w2!!5,R(: $ 7=V'    @a)*(Ss!)* )5_z0('/W!w!395)>_9) >&_'$#  "0Oa+v! )>!Xz-*9C}+? ',5 b!2;?X864$=bys!+x5)"( ?`!w#'6Rp!$-Re"-"2'U#}$>/F^Yr% (3M?m$9 M9W7("Kb9{& 1 ;1E w%,- <HaFu7#+>j9-" 0 +A 'm    ! , 6, c )t  ,   ( - HJ T ! + #6 "Z #}  " * 3 66 >m $ !  '>5Y@  &:!L$n "<(@\0n 49W!pA$=Wn%M:Mc)k+ 9Ocy+"6%Q3w"#>7&v+/'1Yk & [*)C+< #]="-6G!Y9{<4#Xi{jW Vb_V~WO-_}2t 8!9!["*v"1" """=""<#A_####0#= $^$}$$.$3$)%/B%%r%% %%%!%*&5<&*r&'&$&s&6^''O'#'"("5((X(-(<(((#)9)S)5s)))5)*8*"Q*"t*)*4*)* +4+C+'K+(s+++I++,WA,!,, ,,,--/-&]-------."3.V.*l.*.%..!/$)/N/#e///"/"/#/$0$=0 b0000)0$0 1 51V1#f1)11 11?1*32!^2&202 2 23:!3\3{3-33(3 4+4!G4i4-4(4445$52=5#p5)5-5!5!6506&f6,666 6C6&A7h77277778)08%Z8/8 8"8 89#9%59%[9899"9 9:):&8:_:&p:4:*:&:;>;];(s; ;; ;;;& <3<Q<g<<<<< <<<=a =#==#=='=#>A,>!n>#>3>'>)?:?W?&w?$?(?&?@7/@+g@-@@ @1@MA;hA!A AA'A B,B"JBOmB!B!BC%CCC LCXC'jC0C$C$C& D24D gDtD.D-DD&E-E HEUElE~EEEEE)E+FGVG%nG8G4G8H!;H+]HH#HH'H%I&IBIWI%iI8IIII=J)TJ(~JJJJ#J*K1;K mK KK1KK"K$L5LTLoL#L*L/L) M$3MeXM*M M& N1NENWNiN}NNNN$N NNO,O?OUO qOBO$O*OP(&P;OP%P!PPP*Q,fe+ee$ee"f4f Of/[ff!f+ff g,gGg,Wgggg8g_ h%ihhXhi+iJi Yizi+i>ijj/j%5j5[jj/j>j)k,AkNnkk6k$l9lMl il0ll*ll"m!>m`mqmmwm.n"Gnjn(n>nn o $o81o/jo1o0o+o))pSpkpp/ppp qq,qLq8aqqqq)q)r$=r@br?rrrs%+s5Qssss-s)t,,tYt4yt%t6t uC*uTnu&v#vw$w?w\w{ww w0wwx(x)BxlxxIxxy"yByayy,y:yz2%z!Xz zzzzzz*z! {'B{5j{R{{ |6|,V|[|&|},}B} W}Kx}'}}~~.~6~O~c~}~~)~~~5H^pE0vЀ! 2 S`%w-ˁ/@/$p0Ƃ ":!]L07 LmA36..e#3'=[ ŏ$  <EQ.=Ƈ+50.f@+ֈB'E3m81ډP ]}#2 :*"e&#Ӌ8$V{;Ɍ& /%)U"#ٍ&,)Hr  ێ?;0R343@ ,a&4ǐ" p,5ˑB "c"8?!"1D*v&(ȓ;--a[A??![(}46ە" 5Bagvwޖ2V2HR'XrheۙNA@RњC$Gh'*؛'(++T32̜&(&3O/ם'1 ӟi7ѡMMeMek)kFFHD+Mʩh$Ԫ!*8cëޫ<;1V"@5]"U+֭-:04k8F;0(/,E:r-'۰+/K2c4)˲.$$/Iy#-ͳ.9*>d)ʹ+!;U3i,ʵ.%$;#`F˶*߶ )9B|, +:Bf^6QѼz_pڽ6K.H`Areqkqs~drD,qbbK@PJ\qbNi#]6u"B|Z\n>`0 f>qCq'y~;I_c)y50G(0 >+*V|  c[ i=lb  D5J*<u3EL,yE1w3Q& (x    " ~# : D "" SE   v5 t=P? zD;j B_7 ("t"[O$%Ec&o'%)?)B])o*e+=v,-/`1Z73788:)=D>@.AECUEgG~HIJKtL{L MM}NxNOOuP[6RCS8S4T"DTgTVP(VNyVVUXX)Y$[n[%n]}`c%cJd2f1gijln/qrqnt)nvGxz]l|'}S ]-_lW hu+HҒxkMdN~9iΜ8  r؟RKKSA>BAáKtQiƢB0us;Y% t[Z7J{KLQ[9r<׹кpOs~w+CCS>L/m=W@v`_="`^ hk.e_[r)fjtgTjT}%a3$>cR9T     C$fhSoC(plM!{,7!6#9&)+]-7*0db023G456l79Z:>:t+=Y==?oAoA|oBBD.EGI=iJtJgKWKlKILLMM|Mg_NNWOpOfXPKPo Qh{QsQsXRwR8DS=}S=STS NToTUhUiV^nVWV%WBW7XLXYVY-Zf1Z6ZSZ#].]^_`af}b`bEd])ghBxi jkBlm,np~q;sUswxy_{~9LJÌZf GВ[btד4J֕=!_@!60}kgӤl 0uNĭPU޲4V<',yz"86[mFnU7$\"S "Hd21BJu:C:~JiZL JW ga*M`  w  ' 5) _ " R+ ~      \ p    PC  d C   s} p }b   g  # T$ % % & }' u( }s) ,) k+ :, K- / 0 2 4 0e5 6 K< > ? A -KC -yC D E F 7F >G SG G jH I I 1J .J 8J mK .K K ;L P P R {S =S wS 9T 0AV 2rV 0V MV =$W 9bW W 'W ,W X :%X 9`X X 1X X Y HZ cZ "] %_ _ _ Ca ja ;fb Wd ;d 6f =If f ` h lh Ei cOj qj %k 6k Gm P_m m 5n b0o Xo o zp 7q r r ahs s dTt t pv Uv DKw lw w x x Xx 6"y Yy z Q{ b{ !w{ { >| [| j~ ' 1 K 43 h ! )9 .c g  % 7 T 3 I J ,Љ p n  : %Փ N J K 9D ~   2 W ZF   כ  o j  ~  _ 8_ X   - >D B *ƣ  x I aҤ 4 Q  >ժ [ 3p - ҫ ^ 'D l y , , "   B vY _и 0 ϻ o0  {  \  P   U Om    " . G f | %  / S DQ  O p r T o O ,  5 cI D     c U U <   = ` J4 < H z   S f Ez 7 4 - G 9Y b T 0K | & = 8 F6 E} $   &   . $ > V 9p 6  6 eO  ) k rN B & @+ ?l ( * V CW  : 1 N' 3v . - 5 0= 3n  # # % #% I f  h /u C 5 P Lp [ M ,g B O >' 9f 9  , Q# )u  A  O a , 8, >e 1 > ! $7 h\ 5 " ' oF  X F g  & ' o a\ 3  H 4Z S . . /A Cq 5 A Y- + & * # W) K L J Xe X = 4U C ) $ - 4 4T    . R DG $   <  !! C 8Y  [  7 6K S N -% GS C D 1$ \V   N * NF  9 qW 6 L VM A d AK % u Q) s{ [ 7K @ ! $ Z  3f i  f 0y u  '3 W[ O  T u g    M * O OJ s   , r SD  }  k M BO d  ^ Z! V# bM% % o& ' ]"( .( d( j) Q) S) 5%* 9[* l* P+ JS+ (+ L+ P, 7e, , , 4, , - (- +:- f0 (1 H2 2 73 4 ub5 G6 0 9 Q: 4Z; < E< b< (L= Uu= $= [= rL? ? {A 4B -C C E )G I J L FM N O /P 2P P sR *S S [T T V W |W X dX =Y cH\ \ Q@] o] _ _ ` wa Qb s5c c Ud oe qe e pf pg mg g i i j kk k l uXm Ym (n n :o o *p r 9r (t Uu Yv Fw XLw w y i{ D| | } j~ M ր A ̓ u _V C w 9 < D iH  H ^   [ { h` ɜ d -m + 6  )! K i W\ > Vޫ M5  7X , A > ~> D   m V d u : . "   = s U f L5 j  L  L : <  | K   @ ` h     }0 J i D# rh A  _, N M #) kM YK L  -  B  a 2 ; L [ ]q Z ? (F o G ,  j pz r ^ 0{ w $ 7  F V Zj  | '   9  + F "e G   a X 8 #/ S #h =   $ 3 9 uJ  u  * _ c RM *  y U! bg! 1" " e # Mq# $ % % 1% & ' >+' j) c) Q* m* * * ,* * * + u?+ + - / 2 M3 ^6 :_7 9 l: ; < xM> z> 6A? x? ? NB YC A.D mpD D rE ?wE 8E E HG I k^J GM Q Q BS cT @U HU S;V X 8Y /Y &\ 4] e] M_ Y` a Ub b 1b d 8d Kf kOh i i k am m on jo @p p q _s Dt y=u u Ey vy ;p{ { | | } Z~ T  =a  T+ d t Z J \B w  xl w ] M, z  ,̓ T N ^ 5\ !  Qǘ % E? v 9 & ߣ < . D Ҧ   %   / G _ h u ~ ' U { > 6Ƴ I *G #r )  Y 0p f   Y 4t 8  Ip $ M - +@ l W H ( !7 TY Z W a By n + N g  U V Q) { j #} +   V E) Wo & & ^ t f u Y4 y   ]t  Z . O y J E (% 2N * (  ` V Fo  A y m 0 0 2J N}   D ? L W ^ +[ e  p ` . 1A s D  ] \: d   = a ], D  = (  b  v L + DG $ z v, ! # $ j% <' ( * *+ ,+ , C, 89- #r- 6- . ^/ K91 1 P3 Y 7 z7 9 9 ^: {< Q= -l> > H@ B 5D  H [I ]nI VI L#J pJ C8K t|K M N QP R S qT >U =V nFW ,W 2W X OX >Z Q\ gm^ ^ N_ ` 4b c d If [i }&k (k l m o q 2r Zt g^t _t &u v w ^z rz g{ { &B| i} }  %   p|  ] TC U  Ž m z R 4 ޒ ؓ p A. Pp  Ǚ sؙ 6L  \   n% +  ۡ ä j Iڧ q$   Ab  e:  # R   _ z    T" w t 5 Ǿ ,  - 3H ;| ٿ  [ Iv [ 1 9N /  I & G [ x B  $ 6 S Vd   .  7 #M q M * ! !" 0D 1u > D 5+ )a , 4 # '2 4Z %   I 9< @v [ j )~ o D B] B { Q_ 6  R &   =  c u Q  WH  N~ H  ,@ m b V 6 V ~9 E f*  tT a e+ i) L   Jr  V Y x EM L t {U  v # &  ~  qT  K } x   * a: U "    R  Ic  "t  o % r [ lo  bl! ^! |.$ t$ % f% @& S& & & f~' ' '( * 3+ r, {, N, K. / 1 2 N.3 }4 5 j5 _6 57 )8 8 1<9 n: &; < ~= = ? ? .@ @ dA %FB lB ,B $C F RkG G NKH H EI I eJ mJ W]K yK /L N `O JQ _R S S T m/U :V {W nTX X pd] t` Jd %f g Qth j hXk l n jr 6t u gw xz 5} /  N  7 } s   2  щ j O -  n m+ k  %  Nu ē ~ړ wY є  " {Ǘ C ٚ r l* } ` 1v =8 |v ҡ r # ǥ kߥ K \ p tC w 0 7 : ɲ K  < q e A Ǿ fN B > r7 d  8 f  g. . m A' di nS 4 " R Hm V  n _ < D Ie T   / F H` # 8 I WP s D Ta _ T _k  1 @ A^ P \ N _ /6 /f Y E n6 s _ Wy z |L f h0 j . 3 ;N V " 3 48 &m > o C [d W  a9 # D , b1 q C (J As X 4 [C 5 \ :2 m -z ` 1 F; : ( - d fy 1 " I5 < 0 C `1 e L 6E \|  C Z<   N O! 5q f I X " # j?   $ 5 G5 K} E g Aw c  k H *T  / " # t T # / )5 &_ Y I @* 'k   ! k oQ    4 0C %t v B BT % 1 : * - }'  _ v Y   O Q eLbX~K  ? _ ( v= / > # 7 ).HX?6Q4H vVAFyVV?'$gmSkN]KLU@P;r#RyQcEC>?H~NG<^JegLJW6Wi^XW<WFE[J\3C=ROe|r2 j U!Of!4!X!bD"K"~"Wr#\#P'$^x$,$]%Ab%p%&/&&t^'O'/#([S(I(6(?0)9p)P)V)MR*/*5*5+R<+U+J+R0,P,M,Q"-Et-P-Q .N]..Xa/P/= 0I0?0<1RL1J1G1222oT3x37=4Qu40474L05V}55D5886,q6656<6d+7L77bl88]9|9^9)9[%:5:h:M ;n;5;3;K;,5<b<C<&<i<&V=0}=*=8=F> Y>.f>5>3>;>;?yT?l?A;@?}@9@=@/5AUeAKABB.+BCZB=BhByECrCh2DiDyEgEeEiMFZFeG$xG#GoGS1HH=H-H! I+I<GII7&J1^JJ5K;QK:K3K$KE!LHgL_L^M]oMVMb$N N'NFNO+"O"NO/qOO OTO,5PmbP0P!Q#Q<BQjQSQJ>RPRFR!!S[CSTS+SV TKwTBT*UE1UwUnUKlV"VSVC/WrsWXWQ?X-X(X0XY')YQY3KZ?Z)ZtZ^[\_\r\im]]2]M ^7n^5^=^ _;__R_M_g`Th`U`aazc25dKhd/d0d0e<FeVeKe-&f TfufLfvf@Lg>g)g9g(0hJYhHh.h i*iHijnjbjDWk-kk$kCkBlEl*m,Fm~smem\Xn-n=nU!oYwo5opNp\npcp1/qZaq6q[q=Or[r}rBgs(sBs>toUtXtLuKkuuUuK!v.mv&vHv$ w=1wRow9wrw1ox>xQx22y8ey:y'yJz;Lz)zVz {c{0%|?V|-|Y|?}^},x}&},}8}02~*c~2~4~c~Z8GeG25ch́*a',C4%"Z3}B6g+=0ф[[^v-1_^{fچnA:C ,O:|_1'I)qg0J40I&<&[HIˋ)r?V= UG0I΍83V(:9")\ $9̏D0Kp|#^dpaՑ 7DS bn^J=08n[(?ŔmCs&Oޕ6.Te=SL,nw/.]^1:]AUț1Ĝ"ۜ/#.6R)f)>YDs,ԞL(Nw;!  #(D+mOS-=?k*E.O-2qE) D*1B\E71-9_!18.&UHq SۦI//y./ا1.:2i ;.(,Fs<'̩E:GP A / &:47oK A10s "¬-1.`Dh^; H9P*$/ڮ4 1?qb/i;SղE)So{óc?E<V&e}oJS5.Զ/Z306+.AQp9¸G0Diui߹:Ia+:+0ft4*}_Lݼ[*AkȽb4ma#MBӿc=/9Gi CCDoUpA-56Pln",aOXA 6L>f\)FF5<J-Po[voRBAFV=uTb5kPM@Q6d#<K<H-%JJ$(o%A@kA2.>%N.tTD==[{p#Hdl[=-k9p9C&(#O7s#Y)jt{_ 5m'M-u?=I!8kFT=_7GY9>YU?c.:8I!Nk7MS@LQ23Cf&HJEe44nOK0 VQU<2.%lG0,-IWE[}//O?.K:Xik1=cE35fBzDB ZE:-k>77v.OI-w'\_u&'Y$\~cbRD(^\J/1N$H[kJ"Z+4``(@);eBu\CAY9>318ez!`HGF'81~!Y:kH)I'sFI2,E_7(.:'v5.@)<LfH(6% x\ 2 . 17 ji K # ?D 1 I ( 0) Z * * 4 OD $ % ( )<2.oN)(<@1}F,5# YCzClfo>3%IXo1^SYJ=]6;Z)+Um.&>,XG'mE_A%lgE_qz= mGwz-V(*Cn*Mm u!1>"p#$$t%D?&'nl)h)D*R+NW++(+0+r,K,v,1M-O-.-m-ul.O.02/8c/M/u/Y`0r0`-1:11817"2<Z2@2^2I73D3A34O45&565V6<Z6K6W6h;717G7H8Hg8T8D91J9g|9I9@.:Yo:_:l);r;c <m<<<e<P=3n=,==v>?A?52@h@)w@%@&@h@PWAAA ANAANBWB@B2)C-\CCuDLD1D>EFFE4E]E! F1BFGtFXFIGS_GsGF'HnHBHYHG"IGjIJI&I<$JaJGJ*K7IK~KMLaNLVLlMAtMCMM_N;aN@N;N<OOWOHO(OQP;kP^PLQ^SQ#QMQ4$R_YR7RVRTHS;S@SXTWsTNT.U/IUTyUUPiV3V+VcW~W#W<WAWN?XYXoXZXYSY/Z27ZEjZ>ZBZ2[[>[C$\;h\\Z\0]<P]t]L^LO^^A^@^_?_ ___/_H`_`>`3a?Sa,a/a+ab6bHRb0b2bbVcAMdRd2d_eueee?e>4f[sf^f\.g2g4g^ggRhVhai3siqidjd~jFj *ks4kks^lWl#*m-NmN|memR1n`nnWo4pCOpOppp9q9LqXqDq>$rLcrrCs-]smsWs0QtDt#tt%u(uCHu-u>u#u:vMXvv,:wagww7QxBxx1x)y->y7ly$y8yOz^Rz^zb{As{P{1|S8||N|@|18}&j}}V}w~4~~B~@~w7gay,W^:dU T9uf]%M5у3(;Ad`WK_;Pu?ƆP"W&z$,Ƈ0$$7I2U E4_&,ىH:cGW[?A0PrUÌHHbv->^<{CDVeߐ;EDTƑ@\u/NȒ_ wD5Ǔ>&YO/Д)'*SR]ch=54Zj\ŗ"3 E:f6ؘOYQQ_MnQEn<'2LnߜtN,ÝYKJ$!ݞS`Mohjn:al` Djj3kNcO|nV_Bje Ss=Ǧb<hKB?4htwݨ_UAaBYHAC'=k=3Pal6άEKee^˭`*^I94nW2?YU(Wذ80WiZKmhXֲ!/@QA&Գ#M80IȴE=XEgܵmD#GֶA3`99ηQ4Z[hTT v:+=fB`>aTK,AnXݼs0f[2Y&_(8PrP#U8;F_-q Qn9\hY_A<b> 0FX2] OkCRRk-W3*IFt9;0u)~jON MZ)2:\8h<9,v7 [22=9g9E@q(V W*jFFA#!e5O6 LD.QXkDc3WX?Y=\h4h>+EfqA'2BQu=DJ-A aO]N,^Ed96upIJ0){+3AJGTT<H1ppsI!I4dRtMa('/0.E,t/1&8*Lc(-77?.w&*#&$CCh'ZZ/&*52`7:89?0y#B7)Raa1(Heq^Z6T319L27IF;'wj*G =U(rF]J]f'mb) :7&r=5  .-O@}*1,XHJ[l`PigA"wdpU"9G\PTRJS'j{X2?]r2 r 1 t1 X 8 J8 x H sE V  . \ }:ra++O PY9+EeJPiGdo,<bPS!BqI[C+Coky:]E2FxUoc5K4bkkOJ3".V)  !Z3"" ##D#$%W&p&'y'+(;(X)Wl)G)Q *Y^* *\*a6+n+Q, Y,Ff,L,6,1-S.1/)/00b1|2B3t & Djn 8  n o$o  M N$ Rg0| a O } k\ Rn2 il@/ V q:   e4 Q   1o rjD, xUsO }c   Xf 7 )6 < w  # ! 6%_ i> 8 ]v ] p/ E < W 9yp   y  )[ X"J ~ wWl  7vk f +B A)uO - M 4 R NC 4  ;9 H + Qa H Jh |: ;D y'< h SX ( 16VG)* @ pvGz-  v ]b.n / |. P   k + 7+< ?[Y 3 oO iYa A a C ?   Ub/U- ` C -f    *h ; 0    &w +A6' Qs  4 . ~d WJ b ev c  R l[   +]] ` ^'s kb `3W [srn%  5 vF = l : <)h ni {xT  ([  T 8>$ " z S  w D=  m# zh` 4v 0 M Z J Hv ! K TrDG kV !l x Q R 0& 7~ i~1 ;y \( x   + v'8WPw f *>M r r *  7  ' p zr  # tcVo d  p t)4F]@KF [_V [H T 6 ;^ rW     SG    k  ne Ik0 g2) NjU Je G P{|e # .9"RXe q \ @ h 1ltxl0?g V|; ]x E'xo `'.! 5 57 ro g u0  9 6 dQ " hA  a"Tg  w  2r  t@ M X T (ud e *m # % I  2< E  fZM d p_T* _y ZT  vN  m aKoQvJ  %  f    =  4_r 9 T yY 2 *^. Hs"IV A[ b \ug " e ~D = ? h  =6 j k Z , N O k H  }@c ( 3 6};  { ^<  ? focd]  :%n|"  +^    PiY | 5 p4 ar Z 10D  S= t #   v %A  y J % H  g S3m K s X K )w XPu x  l h t  X -;O: 7 "X S f3 8 .  , bP]  P Iz 0 [H 2 N[, TL    Sd   &Y9 S  b ^} 0M 1 8<W 4m @8 O % I ' & q/  >L Frh_Q{$ o ~z gm@ = # :8 1Pt( , T z6bH i. zk5 `_ 6 1 +a B$3  p U` 8L +U m a  r  E  Kp   2 @ M Me ) ( x j&;  c =j  Uo'2  > ) F3x J7 E m2 d  Cq $- Z<  .  cOY  PCh d z6X =L 2  L 9  ( u u  ({ D \FX " "Q  q3  }   z X : p : se5 p` &_c  ,   * I  ;   >( f`     h:   W [ `! eHf ; @s { 9 5} w  | u < TRGa 1  z|d ?  Tb e  B ~ F )   K  w  + / _  * cFeKM { "+ Q]d{UB y   d<7 s   -~   >_  Oy V\^6lV 3z: t5Aw% 3 T! 7|  }t ?i y <t ,  ? &  \& OU 1f  )t A / k  V c  6.!8    i] q 8Q  , 5~dB > $ L G $  jS  #? p  .  B I  % dCn o  !  R I K L  |I | i d ! \D  V Z j 9 (} q `: .b_  sw ^< e - 3o HYb  7E; : 2 {@ NqZ  Ua0   c . *X B{ yr` / " n- l| 4 ;B R] S ?fL 59s /&+  n/<O RSq w  ,  a#JG^ ~ }Py Ps  S" ch 4 } ?  Bj 28U%#XFDG Ov'rRoq S D} ]1 #xB CY?F - 8"B  V $f , h 6Ci  xG A1I  ; `  :W5N A t  < 3 N  U m! .   EMX V , #   %6 T } mc *  kI  q . z  u ( n w QyD   I2  { Q> |t Bp      qBQ* Y $ $+   KJC n ! gx :Ob\ , Uk ) A C  f ^ xZ j aL C 5 ek9kz C] k ~ X g;EZ  R OK F &dh[J ' &p  -u7 Mf Mq; ? KP K ' E\_Ei 7r Fy!_l  S [  2{ 3l s {Cp F k # ( GR 0 $ug |  j z  N5 {0L Y.^ sN S u Zw]ZI >l I58 RE  g /,, 9 3 * L uDL^5 $ K  `m UK xe2|) (1\ ?`9/ /P^x qbE J7,B(B-8q \wY > CWmH b {%N gJu y  P uE~ $ 'p? 5N#  )qcQ77^ C  OI -} BtYDq e ^ in ~~ =j j ? L FU Y  b/ A Y 6  3rm ?4%   Y _ 3 _  a 99E  0 s  _ ,K HT   8 3u Q } W  1 #! [  gv@"Va * / A f  A: * `O  yn4 zE HS  =; s~G&   Rj Vc| 2A != + - sNR G Og ( ( I> [  >4J  @>M  L [\I   N < fm+_' >~& F h Mo { 24 l&&W- 9  i LLoWW W + v V !GJ ]*) ZPMmR c  =0 = F   E cQ j l  l A = 1 Zw hdL  mi \ bQJ/$1>G\}  Y XH b 4 w P! #G ):9 ^$ z  ]-\  !  n : >Z W {@=Hi U &  ~ D-H   1u 5 $4@pvj K Tt} @ [g x ^ ,6gyZi\ P /. <  80N S@ GZ j'  ` ' C N W'7 YAm  %nF C% oa B U #*VtED v a D % 0 =M  J l "  disabling current template maps extending current template maps overriding default cvs keywordset overriding default svn keywordset configuration using current keyword template maps configuration using custom keyword template maps configuration using default cvs keywordset configuration using default svn keywordset keywords expanded Adding a Subrepository ====================== Final summary: The following predicates are supported: To prevent this mistake in your local repository, add to Mercurial.ini or .hg/hgrc: To remove '-' lines, make them ' ' lines (context). To remove '+' lines, delete them. Lines starting with # will be removed from the patch. Write the introductory message for the patch series. [+] marked option can be specified multiple times ``annotate`` ------------ ``auth`` -------- ``decode/encode`` ----------------- ``defaults`` ------------ ``diff`` -------- ``extensions`` -------------- ``format`` ---------- ``hostfingerprints`` -------------------- ``http_proxy`` -------------- ``patch`` --------- ``paths`` --------- ``phases`` ---------- ``subpaths`` ------------ ``ui`` ------ ``web`` ------- additional help topics: aliases: %s broken pipe diffs (%d lines): diffs (truncated from %d to %d lines): keywords written to %s: use "hg help %s" to show the full help text use "hg help -c %s" to see help for the %s command hg archive -r 1.0 project-1.0.zip hg archive project.tar.gz -X ".hg*" hg bisect --bad 34 hg bisect --good 12 hg bisect --good hg bisect --bad hg bisect --reset hg bisect --reset hg bisect --bad 34 hg bisect --good 12 hg bisect --command 'make && make tests' hg bisect --skip hg bisect --skip 23 hg clone --uncompressed http://server/repo -u 1.5 hg clone -r 04e544 experimental/ good/ hg clone http://selenic.com/hg hg clone http://selenic.com/hg#stable hg clone project/ project-feature/ hg clone ssh://user@server//home/projects/alpha/ hg diff "set:added() and grep(GNU)" hg diff --git -r 1.0:1.2 lib/ hg diff --stat -r "date('may 2')" hg diff -c 9353 # compare against first parent hg diff -r 9353^:9353 # same using revset syntax hg diff -r 9353^2:9353 # compare against the second parent hg diff foo.c hg export --git -r 123:150 > changes.txt hg export -r "outgoing()" -o "%n-%m.patch" hg export -r 9353 | hg import - hg forget "set:added() and binary()" hg forget "set:hgignore()" hg graft -D "2085::2093 and not 2091" hg graft -c hg id --id > build-id.dat hg id -n -r 1.3 hg id -r tip http://selenic.com/hg/ hg import --exact proposed-fix.patch hg import -s 80 http://example.com/bugfix.patch hg import http://www.selenic.com/hg/rev/5ca8c111e9aa hg import incoming-patches.mbox hg log --debug -r tip hg log --graph -r "bisect(range)" hg log --removed file.c hg log -Mp lib/ hg log -f hg log -k alice -d "may 2008 to jul 2008" hg log -k bug --template "{rev}\n" hg log -l 10 -b . hg log -r "a21ccf and ancestor(1.9)" hg log -r "bisect(current)" hg log -r "bisect(pruned)" hg log -r "bisect(range)" hg log -r "last(tagged())::" --template "{desc|firstline}\n" hg log -v hg status --copies --change 9353 hg status --rev 9353 hg status -an0 hg update stable hg graft --edit 9393 $ ls foo.c $ hg status ? foo.c $ hg add adding foo.c $ hg status A foo.c $ cp -al REPO REPOCLONE -----BEGIN CERTIFICATE----- ... (certificate in base64 PEM encoding) ... -----END CERTIFICATE----- -----BEGIN CERTIFICATE----- ... (certificate in base64 PEM encoding) ... -----END CERTIFICATE----- public < draft < secret qguard foo.patch -- -stable (negative guard) qguard bar.patch +stable (positive guard) qselect stable An example showing how new (unknown) files are added automatically by :hg:`add`:: To check out earlier revisions, you should use :hg:`update REV`. To cancel an uncommitted merge (and lose your changes), use :hg:`update --clean .`. # display activity of developers by month hg churn -f '%Y-%m' -s -c # display count of changed lines for every committer hg churn -t '{author|email}' # display count of lines changed in every year hg churn -f '%Y' -s # display daily activity graph hg churn -f '%H' -s -c (grafted from CHANGESETHASH) (transplanted from CHANGESETHASH) - advance the current bisection by marking current revision as good or bad:: - all changesets that touch a directory, with diffs, excluding merges:: - all revision numbers that match a keyword:: - attempt to exactly restore an exported changeset (not always possible):: - changesets ancestral to the working directory:: - changesets showing all modifications of a file, including removals:: - changesets with full descriptions and file lists:: - check if a given changeset is included is a tagged release:: - check the most recent revision of a remote repository:: - clone (and track) a particular named branch:: - clone a remote repository to a new directory named hg/:: - clone from an absolute path on an ssh server (note double-slash):: - commit - import - pull - push (with this repository as the destination) - unbundle - compare a file in the current working directory to its parent:: - compare a revision and its parents:: - compare two historical versions of a directory, with rename info:: - continue a graft after resolving conflicts:: - copy a single change to the stable branch and edit its description:: - create a lightweight local clone:: - create a repository without changesets after a particular revision:: - create a tarball excluding .hg files:: - create a zip file containing the 1.0 release:: - diff all newly-added files that contain a keyword:: - do a high-speed clone over a LAN while checking out a specified version:: - export all the changesets between two revisions to a file with rename information:: - find all changesets by some user in a date range:: - find the revision corresponding to a tag:: - forget files that would be excluded by .hgignore:: - forget newly-added binary files:: - forget the current bisection:: - generate a build identifier for the working directory:: - get a NUL separated list of added files, suitable for xargs:: - get change stats relative to the last change on some date:: - graft a range of changesets with one exception, updating dates:: - import a changeset from an hgweb server:: - import a traditional patch from a website and detect renames:: - import all the patches in an Unix-style mbox:: - last 10 commits on the current branch:: - mark the current revision, or a known revision, to be skipped (e.g. if that revision is not usable because of another issue):: - see all changesets that took part in the current bisection:: - see all changesets whose states are already known in the current bisection:: - see the changeset currently being bisected (especially useful if running with -U/--noupdate):: - show all changes including copies in an existing changeset:: - show changes in the working directory relative to a changeset:: - show the source of a grafted changeset:: - split outgoing changes into a series of patches with descriptive names:: - start a bisection with known bad revision 12, and good revision 34:: - summary of all changesets after the last tag:: - use 'make && make tests' to automatically find the first broken revision:: - use export and import to transplant a bugfix to the current branch:: - with the graphlog extension, you can even get a nice graph:: -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. 1. If neither -c/--check nor -C/--clean 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 -c/--check option, the update is aborted and the uncommitted changes are preserved. 3. With the -C/--clean option, uncommitted changes are discarded and the working directory is updated to the requested changeset. = ======= == == == == A C M ! ======= == == == == none W RD W R -f R RD RD R -A W W W R -Af R R R R ======= == == == == ? - display help 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. 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. Examples: 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. For example, the following commands are transactional, and their effects can be rolled back: In some cases, you can clone repositories and the working directory using full hardlinks with :: K = keyword expansion candidate k = keyword expansion candidate (not tracked) I = ignored i = ignored (not tracked) 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 listed as A (added) Mercurial will update the working directory to the first applicable revision from this list: Note that remove never deletes files in Added [A] state from the working directory, not even if option --force is specified. See :hg:`help revsets` for more about the `bisect()` keyword. Some examples: The following rules apply when the working directory contains uncommitted changes: 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): This is the fastest way to clone, but it is not always safe. The operation is not atomic (making sure REPO is not modified during the operation is up to you) and you have to make sure your editor breaks hardlinks (Emacs and most Linux Kernel tools do so). Also, this is not compatible with certain extensions that place their metadata under the .hg directory, such as mq. 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. 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 tipmost head of the default branch h) tip d - done, skip remaining changes and files a - record all changes to all remaining files q - quit, recording no changes exclude path/to/file-or-dir hg email -b # send bundle of all patches not in default hg email -b DEST # send bundle of all patches not in DEST hg email -b -r 3000 # bundle of all ancestors of 3000 not in default hg email -b -r 3000 DEST # bundle of all ancestors of 3000 not in DEST hg email -o # send all patches not in default hg email -o DEST # send all patches not in DEST hg email -o -r 3000 # send all ancestors of 3000 not in default hg email -o -r 3000 DEST # send all ancestors of 3000 not in DEST hg email -o -m mbox && # generate an mbox file... mutt -R -f mbox # ... and view it with mutt hg email -o -m mbox && # generate an mbox file ... formail -s sendmail \ # ... and use formail to send from the mbox -bm -t < mbox # ... using sendmail hg email -r 3000 # send patch 3000 only hg email -r 3000 -r 3001 # send patches 3000 and 3001 hg email -r 3000:3005 # send patches 3000 through 3005 hg email 3000 # send patch 3000 (deprecated) hg qguard other.patch -- +2.6.17 -stable hg qimport -e existing-patch -n new-name include path/to/file-or-dir key parent1, parent2 original_branch_name new_branch_name rename path/to/source path/to/destination s - skip remaining changes to this file f - record remaining changes to this file source author = destination author y - record this change n - skip this change e - edit this change manually - "+n" is a linear run of n nodes based on the current default parent - "." is a single node based on the current default parent - "$" resets the default parent to null (implied at the start); otherwise the default parent is always the last node created - "= .5MB (files at least 524288 bytes) - 4k - 1MB (files from 4096 bytes to 1048576 bytes) - :hg:`resolve -l`: list files which had or still have conflicts. In the printed list, ``U`` = unresolved and ``R`` = resolved. - :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 [--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. - HGUSER (deprecated) - configuration files from the HGRCPATH - EMAIL - interactive prompt - LOGNAME (with ``@hostname`` appended) - Mercurial [hg] - CVS [cvs] - Darcs [darcs] - git [git] - Subversion [svn] - Monotone [mtn] - GNU Arch [gnuarch] - Bazaar [bzr] - Perforce [p4] - Mercurial [hg] - Subversion [svn] (history on branches is not preserved) - Modified and unmodified tracked files - Ignored files (unless --all is specified) - New files added to the repository (with :hg:`add`) - Unknown files: files marked with "?" by :hg:`status` - Empty directories: in fact Mercurial ignores directories unless they contain files under source control management - ``good``, ``bad``, ``skip``: csets explicitly marked as good/bad/skip - ``goods``, ``bads`` : csets topologically good/bad - ``range`` : csets taking part in the bisection - ``pruned`` : csets that are goods, bads or skipped - ``untested`` : csets whose fate is yet unknown - ``ignored`` : csets ignored due to DAG topology - ``current`` : the cset currently being bisected - ``rev`` for the revision number, - ``branch`` for the branch name, - ``desc`` for the commit message (description), - ``user`` for user name (``author`` can be used as an alias), - ``date`` for the commit date - if it's a directory, all files ending with .rc are added - otherwise, the file itself will be added --branchsort convert from parent to child revision when possible, which means branches are usually converted one after the other. It generates more compact repositories. --datesort sort revisions by date. Converted repositories have good-looking changelogs but are often an order of magnitude larger than the same ones generated by --branchsort. --sourcesort try to preserve source revisions order, only supported by Mercurial sources. -e/--edit, -m/--message or -l/--logfile set the patch header as well as the commit message. If none is specified, the header is empty and the commit message is '[mq]: PATCH'. -u/--user and -d/--date can be used to set the (given) user and date, respectively. -U/--currentuser and -D/--currentdate set user to current user and date to current date. .. container:: verbose .. note:: .. 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. .. note:: Specifying negative guards now requires '--'. .. note:: 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. .. note:: export may generate unexpected diff output for merge changesets, as it will compare the merge changeset against its first parent only. .. note:: for performance reasons, log FILE may omit duplicate changes made on branches and will not show deletions. To see all changes including duplicates and deletions, use the --removed switch. .. note:: log -p/--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:: 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. .. note:: using rollback or extensions that destroy/modify history (mq, rebase, etc.) can cause considerable confusion with shared clones. In particular, if two shared clones are both updated to the same changeset, and one of them destroys that changeset with rollback, the other clone will suddenly stop working: all operations will fail with "abort: working directory has unknown parent". The only known workaround is to use debugsetparents on the broken clone to reset it to a changeset that still exists (e.g. tip). .. note:: The -c/--continue option does not reapply earlier options. .. note:: backout cannot be used to fix either an unwanted or incorrect merge. 1. ``us-ascii``: always first, regardless of settings 2. ``email.charsets``: in order given by user 3. ``ui.fallbackencoding``: if not in email.charsets 4. ``$HGENCODING``: if not in email.charsets 5. ``utf-8``: always last, regardless of settings :``%%``: 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 :``%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 :``files``: a directory full of files (default) :``tar``: tar archive, uncompressed :``tbz2``: tar archive, compressed using bzip2 :``tgz``: tar archive, compressed using gzip :``uzip``: zip archive, uncompressed :``zip``: zip archive, compressed using deflate :convert.cvsps.cache: Set to False to disable remote log caching, for testing and debugging purposes. Default is True. :convert.cvsps.fuzz: Specify the maximum time (in seconds) that is allowed between commits with identical user and log message in a single changeset. When very large files were checked in as part of a changeset then the default may not be long enough. The default is 60. :convert.cvsps.mergefrom: Specify a regular expression to which commit log messages are matched. If a match occurs, then the conversion process will add the most recent revision on the branch indicated in the regex as the second parent of the changeset. Default is ``{{mergefrombranch ([-\w]+)}}`` :convert.cvsps.mergeto: Specify a regular expression to which commit log messages are matched. If a match occurs, then the conversion process will insert a dummy revision merging the branch on which this log message occurs to the branch indicated in the regex. Default is ``{{mergetobranch ([-\w]+)}}`` :convert.hg.clonebranches: dispatch source branches in separate clones. The default is False. :convert.hg.ignoreerrors: ignore integrity errors when reading. Use it to fix Mercurial repositories with missing revlogs, by converting from and to Mercurial. Default is False. :convert.hg.saverev: store original revision ID in changeset (forces target IDs to change). It takes a boolean argument and defaults to False. :convert.hg.startrev: convert start revision and its descendants. It takes a hg revision identifier and defaults to 0. :convert.hg.tagsbranch: branch name for tag revisions, defaults to ``default``. :convert.hg.usebranchnames: preserve branch names. The default is True. :convert.p4.startrev: specify initial Perforce revision (a Perforce changelist number). :convert.svn.branches: specify the directory containing branches. The default is ``branches``. :convert.svn.startrev: specify start Subversion revision number. The default is 0. :convert.svn.tags: specify the directory containing tags. The default is ``tags``. :convert.svn.trunk: specify the name of the trunk branch. The default is ``trunk``. :hg:`resolve` must be used to resolve unresolved files. :hg:`transplant --branch REV --all` will transplant the selected branch (up to the named revision) onto your current working directory. :hook.cvschangesets: Specify a Python function to be called after the changesets are calculated from the CVS log. The function is passed a list with the changeset entries, and can modify the changesets in-place, or add or delete them. :hook.cvslog: Specify a Python function to be called at the end of gathering the CVS log. The function is passed a list with the log entries, and can modify the entries in-place, or add or delete them. = []... . = . = = >>> person('foo@bar') 'foo' >>> person('Foo Bar ') 'Foo Bar' >>> person('"Foo Bar" ') 'Foo Bar' >>> person('"Foo "buz" Bar" ') 'Foo "buz" Bar' >>> # The following are invalid, but do exist in real-life ... >>> person('Foo "buz" Bar ') 'Foo "buz" Bar' >>> person('"Foo Bar ') 'Foo Bar' A backref is either Accepted destination formats [identifiers]: Accepted source formats [identifiers]: Accepts a revision range or the -a/--applied option. If --applied is specified, all applied mq revisions are removed from mq control. Otherwise, the given revisions must be at the base of the stack of applied patches. Add all new files and remove all missing files from the repository. After running this command you will need to make sure that largefiles is enabled anywhere you intend to push the new repository. All string valued-elements are either strictly alphanumeric, or must be enclosed in double quotes ("..."), with "\" as escape character. Alternatively you can specify -c/--change with a revision to see the changes in that changeset relative to its first parent. An additional "debugcvsps" Mercurial command allows the builtin changeset merging code to be run without doing a conversion. Its parameters and output are similar to that of cvsps 2.1. Please see the command help for more details. An existing changeset may be placed under mq control with -r/--rev (e.g. qimport --rev tip -n patch will place tip under mq control). With -g/--git, patches imported with --rev will use the git diff format. See the diffs help topic for information on why this is important for preserving rename/copy information and permission changes. Use :hg:`qfinish` to remove changesets from mq control. Any stripped changesets are stored in ``.hg/strip-backup`` as a bundle (see :hg:`help bundle` and :hg:`help unbundle`). They can be restored by running :hg:`unbundle .hg/strip-backup/BUNDLE`, where BUNDLE is the bundle file created by the strip. Note that the local revision numbers will in general be different after the restore. Apply one or more compressed changegroup files generated by the bundle command. Applying bundles preserves all changeset contents including permissions, copy/rename information, and revision history. As a shortcut, you can also use the revision argument to mark a revision as good or bad without checking it out first. 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. Before using this command, you will need to enable email in your hgrc. See the [email] section in hgrc(5) for details. Bookmarks are pointers to certain commits that move when committing. Bookmarks are local. They can be renamed, copied and deleted. It is possible to use :hg:`merge NAME` to merge from a given bookmark, and :hg:`update NAME` to update to a given bookmark. Bookmarks can be pushed and pulled between repositories (see :hg:`help push` and :hg:`help pull`). This requires both the local and remote repositories to support bookmarks. For versions prior to 1.8, this means the bookmarks extension must be enabled. Bookmarks can be renamed, copied and deleted. Bookmarks are local, unless they are explicitly pushed or pulled between repositories. Pushing and pulling bookmarks allow you to collaborate with others on a branch without creating a named branch. Branches may be created when changes are pulled from or pushed to a remote repository, since new heads may be created by these operations. Note that the term branch can also be used informally to describe a development process in which certain development is done independently of other development. This is sometimes done explicitly with a named branch, but it can also be done locally, using bookmarks or clones and anonymous branches. But it will leave untouched: By default the patch is included as text in the email body for easy reviewing. Using the -a/--attach option will instead create an attachment for the patch. With -i/--inline an inline attachment will be created. You can include a patch both as text in the email body and as a regular or an inline attachment by combining the -a/--attach or -i/--inline with the --body option. 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. By default, abort if the working directory contains uncommitted changes. With --keep-changes, abort only if the uncommitted files overlap with patched files. With -f/--force, backup and discard changes made to such files. By default, abort if the working directory contains uncommitted changes. With --keep-changes, abort only if the uncommitted files overlap with patched files. With -f/--force, backup and patch over uncommitted changes. By default, all sources except Mercurial will use --branchsort. Mercurial uses --sourcesort to preserve original revision numbers order. Sort modes have the following effects: By default, diffs are sent in the format generated by :hg:`export`, one per message. The series starts with a "[PATCH 0 of N]" introduction, which describes the series as a whole. By default, grep only prints output for the first revision of a file in which it finds a match. To get it to print every revision 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 --all flag. 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. By default, rebase recreates the changesets in the source branch as descendants of dest and then destroys the originals. Use ``--keep`` to preserve the original source changesets. Some changesets in the source branch (e.g. merges from the destination branch) may be dropped if they no longer contribute any change. By default, the revision used is the parent of the working directory; use -r/--rev to specify a different revision. By default, the server logs accesses to stdout and errors to stderr. Use the -A/--accesslog and -E/--errorlog options to log to files. By default, this command copies the contents of files as they exist in the working directory. If invoked with -A/--after, the operation is recorded, but no copying is performed. By default, this command searches all directories in the working directory. To search just the current directory and its subdirectories, use "--include .". CVS Source ########## CVS source will use a sandbox (i.e. a checked-out copy) from CVS to indicate the starting point of what will be converted. Direct access to the repository files is not needed, unless of course the repository is ``:local:``. The conversion uses the top level directory in the sandbox to find the CVS repository, and then uses CVS rlog commands to find files to convert. This means that unless a filemap is given, all files under the starting directory will be converted, and that any directory reorganization in the CVS sandbox is ignored. Changeset 3b16791d6642 in repository-name. http://my-project.org/hg/repository-name/rev/3b16791d6642 Changeset commit comment. Bug 1234. Changesets that are ancestors of the current revision, that have already been grafted, or that are merges will be skipped. Closed heads can be re-opened by committing new changeset as the child of the changeset that marks a head as closed. Comment lines start with ``#``. A specified path matches if it equals the full relative name of a file or one of its parent directories. The ``include`` or ``exclude`` directive with the longest matching path applies, so line order does not matter. 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. Convert repository SOURCE to a new repository DEST, identical to SOURCE except that certain files will be converted as largefiles: specifically, any file that matches any PATTERN *or* whose size is above the minimum size threshold is converted as a largefile. The size used to determine whether or not to track a file as a largefile is the size of the first version of the file. The minimum size can be specified either with --size or in configuration as ``largefiles.size``. Copy the store data to the repo and remove the sharedpath data. Create a copy of an existing repository in a new directory. Delete files not known to Mercurial. This is useful to test local and uncommitted changes in an otherwise-clean source tree. Differences between files are shown using the unified diff format. Do not attempt any read operations on this repository while the command is running. (Both repositories will be locked against writes.) Each member added to an archive file has a directory prefix prepended. Use -p/--prefix to specify a format string for the prefix. The default is the basename of the archive, with suffixes removed. Each patch email has a Subject line of "[PATCH M of N] ...", using the first line of the changeset description as the subject text. The message contains two or three parts. First, the changeset description. Elements: Empty lines and lines starting with a ``#`` are ignored. Equivalent options set via command line flags or environment variables are not overridden. Every ID must be a full-length hex node id string. Returns a list of 0s and 1s indicating unknown/known. Every ID must be a full-length hex node id string. Saves the bundle to the given file. Example: "Did you see my correction in the diff?" Example: "I'm going to branch at X". Example: "I'm going to check out changeset X." Example: "I'm going to clone the repository". Example: "I'm using checkout X." Example: "I've pushed an update". Example: "I've sent you my patch." Example: "If you diff with changeset X, you will see what I mean." Example: "Is the bug fixed in your recent commit?" Example: "Is your clone up to date?". Example: "The experimental branch". Example: "You should commit those changes now." Example: "You should update". Example: "You will need to patch that revision." Examples:: Extend the current configuration by specifying maps as arguments and using -f/--rcfile to source an external hgrc file. 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 or descendants of the starting 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. Finally, the patch itself, as generated by :hg:`export`. Finishes the specified revisions (corresponding to applied patches) by moving them out of mq control into regular repository history. For a faster but less accurate result, consider using ``filelog()`` instead. For each element in HGRCPATH: For performance reasons, ``filelog()`` does not show every changeset that affects the requested file(s). See :hg:`help log` for details. For a slower, more accurate result, use ``file()``. For remote repository, using --bundle avoids downloading the changesets twice if the incoming is followed by a pull. Generate a compressed changegroup file collecting changesets not known to be in another repository. Given a topic, extension, or command name, print help for that topic. Guards control whether a patch can be pushed. A patch with no guards is always pushed. A patch with a positive guard ("+foo") is pushed only if the :hg:`qselect` command has activated it. A patch with a negative guard ("-foo") is never pushed if the :hg:`qselect` command has activated it. Heads are where development generally takes place and are the usual targets for update and merge operations. Hg debugcvsps reads the CVS rlog for current directory (or any named directory) in the CVS repository, and converts the log to a series of changesets based on matching commit log entries and dates. Host *.mylocalnetwork.example.com Compression no Host * Compression yes 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 may happen due to character set problems or other deficiencies in the text patch format. If --log is specified, log messages will have a comment appended of the form:: If --source/-s is specified, selects changesets from the named repository. If --branch/-b is specified, selects changesets from the branch holding the named revision, up to that revision. If --all/-a is specified, all changesets on the branch will be transplanted, otherwise you will be prompted to select the changesets you want. If -B/--bookmark is used, the specified bookmarked revision, its ancestors, and the bookmark will be pushed to the remote repository. If -a/--active is specified, only show active branches. A branch is considered active if it contains repository heads. If -c/--closed is specified, also show branch heads marked closed (see :hg:`commit --close-branch`). If -e/--edit is specified, Mercurial will start your configured editor for you to enter a message. In case qrefresh fails, you will find a backup of your message in ``.hg/last-message.txt``. If -r/--rev is used, the specified revision and all its ancestors will be pushed to the remote repository. If -s/--short is specified, files currently included in the patch will be refreshed just like matched files and remain in the patch. If -t/--topo is specified, named branch mechanics will be ignored and only changesets without children will be shown. If REV is the parent of the working directory, then this new changeset is committed automatically. Otherwise, hg needs to merge the changes and the merged result is left uncommitted. If SOURCE is omitted, the 'default' path will be used. See :hg:`help urls` for more information. If STARTREV is specified, only those heads that are descendants of STARTREV will be displayed. If ``REVMAP`` isn't given, it will be put in a default location (``/.hg/shamap`` by default). The ``REVMAP`` is a simple text file that maps each source commit ID to the destination ID for that revision, like so:: If `name` starts with `re:`, the remainder of the name is treated as a regular expression. To match a bookmark that actually starts with `re:`, use the prefix `literal:`. If `string` starts with `re:`, the remainder of the name is treated as a regular expression. To match a branch that actually starts with `re:`, use the prefix `literal:`. If `string` starts with `re:`, the remainder of the string is treated as a regular expression. To match a user that actually contains `re:`, use the prefix `literal:`. If `value` starts with `re:`, the remainder of the value is treated as a regular expression. To match a value that actually starts with `re:`, use the prefix `literal:`. If a changeset application fails, you can fix the merge by hand and then resume where you left off by calling :hg:`transplant --continue/-c`. 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. If a list of files is omitted, all changes reported by :hg:`status` will be candidates for recording. If a list of files is omitted, all changes reported by :hg:`status` will be committed. If a parent of the working directory is stripped, then the working directory will automatically be updated to the most recent available ancestor of the stripped parent after the operation completes. If a rebase is interrupted to manually resolve a merge, it can be continued with --continue/-c or aborted with --abort/-a. If any file patterns are provided, the refreshed patch will contain only the modifications that match those patterns; the remaining modifications will remain in the working directory. If any of specified revisions is not present in the local repository, the query is normally aborted. But this predicate allows the query to continue even in such cases. If directories are given on the command line, only files in these directories are considered. 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``. If no destination directory name is specified, it defaults to the basename of the source with ``-hg`` appended. If the destination repository doesn't exist, it will be created. If no destination directory name is specified, it defaults to the basename of the source. If no directory is given, the current directory is used. If no merges or revisions are provided, :hg:`transplant` will start an interactive changeset browser. If no names are given, add all files to the repository. If no patterns are given to match, this command prints the names of all files under Mercurial control in the working directory. If no revision is given, all revisions will be converted. Otherwise, convert will only import up to the named revision (given in a format understood by the source). If no revision is given, the parent of the working directory is used, or tip if no revision is checked out. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out. 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 with must be provided. If no revision range is specified, the default is ``tip:0`` unless --follow is set, in which case the working directory parent is used as the starting revision. If one or more REVs are given, only branch heads on the branches associated with the specified changesets are shown. This means that you can use :hg:`heads foo` to see the heads on a branch named ``foo``. 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. If option --all is specified, the list of all files from all revisions is printed. This includes deleted and renamed files. If source is local, destination will have no patches applied. If source is remote, this command can not check if patches are applied in source, so cannot guarantee that patches are not applied in destination. If you clone remote repository, be sure before that it has no patches applied. If the changeset is not a descendant or ancestor of the working directory's parent, 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. If the file doesn't exist, it's automatically created. It's updated on each commit copied, so :hg:`convert` can be interrupted and can be run repeatedly to copy new commits. 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 the pulled changes add a new branch head, the head is automatically merged, and the result of the merge is committed. Otherwise, the working directory is updated to include the new changes. If there are outstanding changes in the working directory, import will abort unless given the -f/--force flag. If you are committing the result of a merge, do not provide any filenames or -I/-X filters. If you don't specify a destination changeset (``-d/--dest``), rebase uses the tipmost head of the current named branch as the destination. (The destination changeset is not modified by rebasing, but new changesets are added as its descendants.) 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. If you omit the destination repository, then hg assumes the destination will have all the nodes you specify with --base parameters. To create a bundle containing all changesets, use -a/--all (or --base null). If you pass a revlog index, the revlog's DAG is emitted. If you list revision numbers, they get labeled in the output as rN. 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. 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. If you want to revert just one file to an older revision, use :hg:`revert [-r REV] NAME`. Import a list of patches and commit them individually (unless --no-commit is specified). In case email sending fails, you will find a backup of your series introductory message in ``.hg/last-email.txt``. Initialize a new repository and working directory that shares its history with another repository. Initialize a new repository in the given directory. If the given directory does not exist, it will be created. It is not possible to amend public changesets (see :hg:`help phases`) or changesets that have children. It is possible to limit the amount of source history to be converted by specifying an initial Perforce revision: It is possible to map alternate email addresses to a main address by providing a file using the following format:: It is possible to specify an ``ssh://`` URL as the destination. See :hg:`help urls` for more information. List changes in files, showing the revision id responsible for each line 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`). List which files in the working directory are matched by the [keyword] configuration patterns. Mark dest as copies of sources; mark sources for deletion. If dest is a directory, copies are put in that directory. If dest is a file, there can only be one source. Mark dest as having copies of source files. If dest is a directory, copies are put in that directory. If dest is a file, the source must be a single file. Mark the specified files so they will no longer be tracked after the next commit. Mercurial Destination ##################### Mercurial Source ################ Merge changesets may be transplanted directly by specifying the proper parent changeset by calling :hg:`transplant --parent`. 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. 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. Modified files are saved with a .orig suffix before reverting. To disable these backups, use --no-backup. Must be run before changing/disabling active keywords. NOTE: this concept is deprecated because it is too implicit. Branches should now be explicitly closed using :hg:`commit --close-branch` when they are no longer needed. Name a particular revision using . Named branches can be thought of as a kind of namespace, dividing the collection of changesets that comprise the repository into a collection of disjoint subsets. A named branch is not necessarily a topological branch. If a new named branch is created from the head of another named branch, or the default branch, but no further changesets are added to that previous branch, then that previous branch will be a branch in name only. New files are ignored if they match any of the patterns in ``.hgignore``. As with add, these changes take effect at the next commit. Nodes printed as an @ character are parents of the working directory. Note that 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. Omitting a queue name or specifying -l/--list will show you the registered queues - by default the "normal" patches queue is registered. The currently active queue will be marked with "(active)". Specifying --active will print only the name of the active queue. One result of the rules for selecting the destination changeset and source branch is that, unlike ``merge``, rebase will do nothing if you are at the latest (tipmost) head of a named branch with two heads. You need to explicitly specify source and/or destination (or ``update`` to the other head, if it's the head of the intended source branch). 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. Only non-public and non-obsolete changesets can be `bumped`. Option -q/--quiet hides untracked (unknown and ignored) files unless explicitly requested with -u/--unknown or -i/--ignored. Option -q/--quiet suppresses all output when searching for NAME and shows only the path names when listing all definitions. Order of outgoing email character sets: Otherwise, the changelog DAG of the current repo is emitted. Output may be to a file, in which case the name of the file is given using a format string. The formatting rules are as follows: Output may be to a file, in which case the name of the file is given using a format string. The formatting rules are the same as for the export command, with the following additions: Patches must not yet be applied. Each patch will be successively applied to the current patch in the order given. If all the patches apply successfully, the current patch will be refreshed with the new cumulative patch, and the folded patches will be deleted. With -k/--keep, the folded patch files will not be removed afterwards. 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. Per-installation configuration files, searched for in the directory where Mercurial is installed. ```` is the parent directory of the **hg** executable (or symlink) being run. For example, if installed in ``/shared/tools/bin/hg``, Mercurial will look in ``/shared/tools/etc/mercurial/hgrc``. Options in these files apply to all Mercurial commands executed by any user in any directory. Per-installation/system configuration files, for the system on which Mercurial is running. Options in these files apply to all Mercurial commands executed by any user in any directory. Registry keys contain PATH-like strings, every part of which must reference a ``Mercurial.ini`` file or be a directory where ``*.rc`` files will be read. Mercurial checks each of these locations in the specified order until one or more configuration files are detected. Per-repository configuration options that only apply in a particular repository. This file is not version-controlled, and will not get transferred during a "clone" operation. Options in this file override options in all other configuration files. On Plan 9 and Unix, most of this file will be ignored if it doesn't belong to a trusted user or to a trusted group. See the documentation for the ``[trusted]`` section below for more details. Per-system configuration files, for the system on which Mercurial is running. Options in these files apply to all Mercurial commands executed by any user in any directory. Options in these files override per-installation options. Per-user configuration file(s), for the user running Mercurial. On Windows 9x, ``%HOME%`` is replaced by ``%APPDATA%``. Options in these files apply to all Mercurial commands executed by this user in any directory. Options in these files override per-system and per-installation options. Perforce Source ############### 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. Please see :hg:`help urls` for important details about ``ssh://`` URLs. If DESTINATION is omitted, a default path will be used. Please see http://mercurial.selenic.com/wiki/RepositoryCorruption for more information about recovery from corruption of the repository. Prepare a new changeset with the effect of REV undone in the current working directory. 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. Print a revision history alongside a revision graph drawn with ASCII characters. 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. Print files under Mercurial control in the working directory whose names match the given patterns. Print the changeset header and diffs for one or more revisions. Print the children of the working directory's revisions. If a revision is given via -r/--rev, the children of that revision will be printed. If a file argument is given, revision in which the file was last changed (after the working directory revision or the argument to --rev if given) is printed. Print the revision history of the specified files or the entire project. Print the root directory of the current repository. Print the specified files as they were at the given revision. If no revision is given, the parent of the working directory is used, or tip if no revision is checked out. 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. Prints the list of directories being watched by the inotify server. Pull changes from a remote repository to a local one. Push changesets from the local repository to the specified destination. Rebase uses repeated merging to graft changesets from one part of history (the source) onto another (the destination). This can be useful for linearizing *local* changes relative to a master development tree. Recover from an interrupted commit or pull. Regular revision fields are ``description``, ``author``, ``branch``, ``date``, ``files``, ``phase``, ``parents``, ``substate``, ``user`` and ``diff``. Note that ``author`` and ``user`` are synonyms. ``diff`` refers to the contents of the revision. Two revisions matching their ``diff`` will also match their ``files``. Repository "heads" are changesets with no child changesets. They are where development generally takes place and are the usual targets for update and merge operations. Branch heads are changesets that have no child changeset on the same branch. Return 0 on success, 1 if no phases were changed or some could not be changed. Return 0 on success. Returns 0 if a match is found, 1 otherwise. Returns 0 if all files are successfully added. Returns 0 if import succeeded. Returns 0 if matching heads are found, 1 if not. Returns 0 if push was successful, 1 if nothing to push. Returns 0 if successful, 1 if nothing to recover or verify fails. Returns 0 if successful. Returns 0 if there are incoming changes, 1 otherwise. Returns 0 if there are outgoing changes, 1 otherwise. Returns 0 on success, 1 if an update had unresolved files. Returns 0 on success, 1 if an update has unresolved files. Returns 0 on success, 1 if any files fail a resolve attempt. Returns 0 on success, 1 if any warnings encountered. Returns 0 on success, 1 if errors are encountered. Returns 0 on success, 1 if no changes found. Returns 0 on success, 1 if no rollback data is available. Returns 0 on success, 1 if nothing changed. Returns 0 on success, 1 if nothing to rebase. Returns 0 on success, 1 if there are unresolved files. Returns 0 on success. Returns 0 on success. Returns 0 on successful completion. Returns 0 on successful creation of a new patch. Returns 0. Run after (re)enabling keyword expansion. Schedule files to be version controlled and added to the repository. Schedule the indicated files for removal from the current branch. Search revisions of files for a regular expression. See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help dates` for a list of formats valid for -d/--date. See :hg:`help keyword` on how to construct patterns both for inclusion and exclusion of files. See :hg:`help qnew` & :hg:`help record` for more information and usage. See :hg:`help revisions` and :hg:`help revsets` for more about specifying revisions. See :hg:`help templates` for information on templates and filters. See :hg:`help templates` for more about pre-packaged styles and specifying custom templates. See :hg:`help urls` for details on specifying URLs. See :hg:`help urls` for more information. See pull for details of valid destination formats. See pull for valid source format details. Selected changesets will be applied on top of the current working directory with the log of the original changeset. The changesets are copied and will thus appear twice in the history. Use the rebase extension instead if you want to move a whole branch of unpublished changesets. Setting HGPLAINEXCEPT to anything (even an empty string) will enable plain mode. 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. Show current, custom, or default keyword template maps and their expansions. Show definition of symbolic path name NAME. If no name is given, show definition of all available names. Show differences between revisions for the specified files, using an external program. The default program used is diff, with default options "-Npru". Show differences between revisions for the specified files, using the %(path)s program. Show differences between revisions for the specified files. Show new changesets found in the specified path/URL or the default pull location. These are the changesets that would have been pulled if a pull at the time you issued this command. 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. Shows a diff which includes the current patch as well as any changes which have been made in the working directory since the last refresh (thus showing what the current patch would become after a qrefresh). Similarly, passing --rev to "hg clone" will fail to use any hardlinks, falling back to a complete copy of the source repository. Since tag names have priority over branch names during revision lookup, using an existing branch name as a tag name is discouraged. Source history can be retrieved starting at a specific revision, instead of being integrally converted. Only single branch conversions are supported. Source patch repository is looked for in /.hg/patches by default. Use -p to change. Special fields are ``summary`` and ``metadata``: ``summary`` matches the first line of the description. ``metadata`` is equivalent to matching ``description user date`` (i.e. it matches the main metadata fields). Specifying a path to a repository root or Mercurial bundle will cause lookup to operate on that repository/bundle. 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. Statistics are based on the number of changed lines, or alternatively the number of matching revisions if the --changesets option is specified. Strip is not a history-rewriting operation and can be used on changesets in the public phase. But if the stripped changesets have been pushed to a remote repository you will likely pull them again. Subversion Source ################# Subversion source detects classical trunk/branches/tags layouts. By default, the supplied ``svn://repo/path/`` source URL is converted as a single branch. If ``svn://repo/path/trunk`` exists it replaces the default branch. If ``svn://repo/path/branches`` exists, its subdirectories are listed as possible branches. If ``svn://repo/path/tags`` exists, it is looked for tags referencing converted branches. Default ``trunk``, ``branches`` and ``tags`` values can be overridden with following options. Set them to paths relative to the source URL, or leave them blank to disable auto detection. Such a file may be specified with the --aliases option, otherwise a .hgchurn file will be looked for in the working directory root. Supports switching between different patch queues, as well as creating new patch queues and deleting existing ones. 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. 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. 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). The Mercurial source recognizes the following configuration options, which you can set on the command line with ``--config``: The Perforce (P4) importer can be given a p4 depot path or a client specification as source. It will convert all files in the source to a flat Mercurial repository, ignoring labels, branches and integrations. Note that when a depot path is given you then usually should specify a target directory, because otherwise the target may be named ``...-hg``. The ``include`` directive causes a file, or all files under a directory, to be included in the destination repository, and the exclusion of all other files and directories not explicitly included. The ``exclude`` directive causes files or directories to be omitted. The ``rename`` directive renames a file or directory if it is converted. To rename from a subdirectory into the root of the repository, use ``.`` as the path to rename to. The archive type is automatically detected based on file extension (or override using -t/--type). The authormap is a simple text file that maps each source commit author to a destination commit author. It is handy for source SCMs that use unix logins to identify authors (e.g.: CVS). One line per author mapping and the line format is:: The branchmap is a file that allows you to rename a branch when it is being brought in from whatever external repository. When used in conjunction with a splicemap, it allows for a powerful combination to help fix even the most badly mismanaged repositories and turn them into nicely structured Mercurial repositories. The branchmap contains lines of the form:: 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. The codes used to show the status of files are:: The current working directory is updated with all changes made in the requested revision since the last common predecessor revision. The description of the DAG is read from stdin if not given on the command line. The exact name of the destination archive or directory is given using a format string; see :hg:`help export` for details. The filemap is a file that allows filtering and remapping of files and directories. Each line can contain one of the following directives:: The files will be added to the repository at the next commit. To undo an add before that, see :hg:`forget`. The following options are supported: The following options can be set with ``--config``: The following options can be used with ``--config``: The header for each folded patch will be concatenated with the current patch header, separated by a line of ``* * *``. The information shown in the changeset header is: author, date, branch name (if non-default), changeset hash, parent(s) and commit comment. The key is the revision ID in the source revision control system whose parents should be modified (same format as a key in .hg/shamap). The values are the revision IDs (in either the source or destination revision control system) that should be used as the new parents for that node. For example, if you have merged "release-1.0" into "trunk", then you should specify the revision on "trunk" as the first parent and the one on the "release-1.0" branch as the second. The keys can be: The location of the source is added to the new repository's ``.hg/hgrc`` file, as the default to be used for future pulls. The patch directory must be a nested Mercurial repository, as would be created by :hg:`init --mq`. The patch is inserted into the series after the last applied patch. If no patches have been applied, qimport prepends the patch to the series. The patch will have the same name as its source file unless you give it a new one with -n/--name. The patches must not be applied, and at least one patch is required. Exact patch identifiers must be given. With -k/--keep, the patch files are preserved in the patch directory. 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 that ``default`` and ``default-push`` apply to all inbound (e.g. :hg:`incoming`) and outbound (e.g. :hg:`outgoing`, :hg:`email` and :hg:`bundle`) operations. The queue repository is unversioned by default. If -c/--create-repo is specified, qinit will create a separate nested repository for patches (qinit -c may also be run later to convert an unversioned patch repository into a versioned one). You can use qcommit to commit changes to this queue repository. The resolve command can be used in the following ways: The splicemap is a file that allows insertion of synthetic history, letting you specify the parents of a revision. This is useful if you want to e.g. give a Subversion merge two parents, or graft two disconnected series of history together. Each entry contains a key, followed by a space, followed by one or two comma-separated values:: The strip command removes the specified changesets and all their descendants. If the working directory has uncommitted changes, the operation is aborted unless the --force flag is supplied, in which case changes will be discarded. The tip revision (usually just called the tip) is the changeset most recently added to the repository (and therefore the most recently changed head). This activates the "stable" guard. mq will skip foo.patch (because it has a negative match) but push bar.patch (because it has a positive match). This can be especially useful if your changes have been applied to an upstream repository, or if you are about to push your changes to upstream. This command behaves differently than Unix grep. It only accepts Python/Perl regexps. It searches repository history, not the working directory. It always prints the revision number in which a match appears. 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. This command is deprecated, use :hg:`rebase` instead. This command is deprecated. Without -c, it's implied by other relevant commands. With -c, use :hg:`init --mq` instead. This command is deprecated; use :hg:`commit --mq` instead. This command is intended as a debugging tool for the CVS to Mercurial converter, and can be used as a direct replacement for cvsps. This command is not available when committing a merge. 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. This command is useful for discovering when a change was made and by whom. This command lets you recreate those hardlinks and reclaim that wasted space. 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`. 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. This command takes effect at the next commit. To undo a rename before that, see :hg:`revert`. This command takes effect with the next commit. To undo a copy before that, see :hg:`revert`. This command tries to fix the repository status after an interrupted operation. It should only be necessary when Mercurial suggests it. 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. This command will display a histogram representing the number of changed lines or revisions, grouped according to the given template. The default template will group changes by author. The --dateformat option may be used to group the results by date instead. This feature is only supported when using Python 2.6 or later. If you wish to use it with earlier versions of Python, install the backported version of the ssl library that is available from ``http://pypi.python.org``. 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. This finds all changes from the repository at the specified path or URL and adds them to the local repository. This generates a brief summary of the working directory state, including parents, branch, commit status, and available updates. This is useful for writing repository conversion tools, but should be used with care. This lists both regular and local tags. When the -v/--verbose switch is used, a third column "local" is printed for local tags. This means that purge will delete: This only removes files from the current branch, not from the entire project history, and it does not delete them from the working directory. This operation is symmetrical to pull: it is identical to a pull in the destination repository from the current one. This repository will be relinked to share space with ORIGIN, which must be on the same local disk. If ORIGIN is omitted, looks for "default-relink", then "default", in [paths]. 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. To cancel an uncommitted merge (and lose your changes), use :hg:`update --clean .`. To check out a particular version, use -u/--update, or -U/--noupdate to create a clone with no working directory. To create a new queue, use -c/--create. The queue is automatically made active, except in the case where there are applied patches from the currently active queue in the repository. Then the queue will only be created and switching will fail. To delete an existing queue, use --delete. You cannot delete the currently active queue. To disable SSL verification temporarily, specify ``--insecure`` from command line. 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). 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. To import a patch from standard input, pass - as the patch file. When importing from standard input, a patch name must be specified using the --name flag. To import an existing patch while renaming it:: To match more than one field pass the list of fields to match separated by spaces (e.g. ``author description``). 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. Note that specifying a tag will include the tagged changeset but not the changeset containing the tag. To read a patch from standard input, use "-" as the patch name. If a URL is specified, the patch will be downloaded from it. See :hg:`help dates` for a list of formats valid for -d/--date. To select a different program, use the -p/--program option. The program will be passed the names of two directories to compare. To pass additional options to the program, use -o/--option. These will be passed before the names of the directories to compare. To set guards on another patch:: To stop managing a patch and move it into permanent history, use the :hg:`qfinish` command. To undo a forget before the next commit, see :hg:`add`. To undo an uncommitted merge, use :hg:`update --clean .` which will check out a clean copy of the original merge parent, losing all changes. Transactions are used to encapsulate the effects of all commands that create new changesets or propagate existing changesets into a repository. Unfortunately, subsequent pulls into either repository will break hardlinks for any files touched by the new changesets, even if both repositories end up pulling the same changes. Unless -f/--force is specified, :hg:`phase` won't move changeset from a lower phase to an higher phase. Phases are ordered as follows:: Unless -f/--force is specified, branch will not let you set a branch name that already exists, even if it's inactive. Update sets the working directory's parent revision to the specified changeset (see :hg:`help parents`). 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 current bookmark (see :hg:`help bookmarks`). Use --bypass to apply and commit patches directly to the repository, not touching the working directory. Without --exact, patches will be applied on top of the working directory parent revision. 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. Use --to-normal to convert largefiles back to normal files; after this, the DEST repository can be used without largefiles at all. Use --verbose to print the parsed tree before and after aliases expansion. Use -C/--clean to reset the working directory branch to that of the parent of the working directory, negating a previous branch change. Use -d/--default to disable current configuration. Use -f/--force to override the default behavior and push all changesets on all branches. Use -n/--none to deactivate guards (no other arguments needed). When no guards are active, patches with positive guards are skipped and patches with negative guards are pushed. Use -s/--series to print a list of all guards in the series file (no other arguments needed). Use -v for more information. Use :hg:`diff` if you only want to see the changes made since the last qrefresh, or :hg:`export qtip` if you want to see changes made by the current patch without including changes made since the qrefresh. 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`. Use null as the changeset to remove the working directory (like :hg:`clone -U`). Use the --no-backup option to discard the backup bundle once the operation completes. Use the -g/--git option to generate diffs in the git extended diff format. For more information, read :hg:`help diffs`. Use the -g/--git option to generate diffs in the git extended diff format. See :hg:`help diffs` for more information. Use the -g/--git option to keep the patch in the git extended diff format. Read the diffs help topic for more information on why this is important for preserving permission changes and copy/rename information. 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. Use the :hg:`qguard` command to set or print guards on patch, then use qselect to tell mq which guards to use. A patch will be pushed if it has no guards or any positive guards match the currently selected guard, but will not be pushed if any negative guards match the current guard. For example:: Use the command :hg:`update` to switch to an existing branch. Use the command :hg:`update` to switch to an existing branch. Use :hg:`commit --close-branch` to mark this branch as closed. Useful to prevent inadvertent keyword expansion and to speed up execution by including only files that are actual candidates for expansion. 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. Valid fields are most regular revision fields and some special fields. Valid types are: Verify the integrity of the current repository. When REV is not given, print a summary of the current state of the repository. When a merge is needed, the working directory is first updated to the newly pulled changes. Local changes are then merged into the pulled changes. To switch the merge order, use --switch-parent. When repositories are cloned locally, their data files will be hardlinked so that they only use the space of a single repository. When two revision arguments are given, then changes are shown between those revisions. If only one revision is specified then that revision is compared to the working directory, and, when no revisions are specified, the working directory files are compared to its parent. Whitespace between the above elements is ignored. With --debug, the source (filename and line number) is printed for each config item. With -A/--all and -v/--verbose the codes used to show the status of files are:: With -b/--bundle, changesets are selected as for --outgoing, but a single email containing a binary Mercurial bundle as an attachment will be sent. With -f/--force, an existing patch of the same name will be overwritten. With -i/--inactive, the new bookmark will not be made the active bookmark. If -r/--rev is given, the new bookmark will not be made active even if -i/--inactive is not given. If no NAME is given, the current active bookmark will be marked inactive. With -m/--mbox, instead of previewing each patchbomb message in a pager or sending the messages directly, it will create a UNIX mailbox file with the patch emails. This mailbox file can be previewed with any mail user agent which supports UNIX mbox files. With -n/--test, all steps will run, but mail will not be sent. You will be prompted for an email recipient address, a subject and an introductory message describing the patches of your patchbomb. Then when all is done, patchbomb messages are displayed. If the PAGER environment variable is set, your pager will be fired up once for each patchbomb message, so you can verify everything is alright. With -o/--outgoing, emails will be generated for patches not found in the destination repository (or only those which are ancestors of the specified revisions if any are provided) With -s/--similarity, hg will attempt to discover renames and copies in the patch in the same way as :hg:`addremove`. With -v, print file permissions, symlink and executable bits. With --debug, print file revision hashes. With five args, set a key to new if it currently is set to old. Reports success or failure. With multiple arguments, print names and values of all config items with matching section names. 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. With no argument, show the phase name of specified revisions. With no arguments, print a list of commands with short help messages. With no arguments, print names and values of all config items. With no arguments, print the currently active guards. With arguments, set guards for the named patch. With no arguments, prints the currently active guards. With one argument, sets the active guard. With no arguments, show all repository branch heads. 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. With one argument of the form section.name, print just the value of that config item. With one argument, renames the current patch to PATCH1. With two arguments, renames PATCH1 to PATCH2. With one of -p/--public, -d/--draft or -s/--secret, change the phase value of the specified revisions. With the --remote option, this will check the default paths for incoming and outgoing changes. This can be time-consuming. With the --switch-parent option, the diff will be against the second parent. It can be useful to review a merge. With the -d/--diffstat option, if the diffstat program is installed, the result of running diffstat on the patch is inserted. With the -d/--diffstat or --confirm options, you will be presented with a final summary of all messages and asked for confirmation before the messages are sent. With two args, list the keys in the given namespace. Without argument, pops off the top of the patch stack. If given a patch name, keeps popping off patches until the named patch is at the top of the stack. 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. 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. 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. You can change compression method with the -t/--type option. The available compression methods are: none, bzip2, and gzip (by default, bundles are compressed using bzip2). 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 commit message. You can optionally mark selected transplanted changesets as merge changesets. You will not be prompted to transplant any ancestors of a merged transplant, and you can merge descendants of them normally instead of transplanting them. You can register an existing patch inside the patch directory with the -e/--existing flag. You can rewrite the changelog message with the --filter option. Its argument will be invoked with the current changelog message as $1 and the patch as $2. You can specify which changesets to rebase in two ways: as a "source" changeset or as a "base" changeset. Both are shorthand for a topologically related set of changesets (the "source branch"). If you specify source (``-s/--source``), rebase will rebase that changeset and all of its descendants onto dest. If you specify base (``-b/--base``), rebase will select ancestors of base back to but not including the common ancestor with dest. Thus, ``-b`` is less precise but more convenient than ``-s``: you can specify any changeset in the source branch, and rebase will select the whole branch. If you specify neither ``-s`` nor ``-b``, rebase uses the parent of the working directory as the base. You can use :hg:`bookmark NAME` to set a bookmark on the working directory's parent revision with the given name. If you specify a revision using -r REV (where REV may be an existing bookmark), the bookmark is assigned to that revision. You can use OpenSSL's CA certificate file if your platform has one. On most Linux systems this will be ``/etc/ssl/certs/ca-certificates.crt``. Otherwise you will have to generate this file manually. The form must be as follows:: You should not rebase changesets that have already been shared with others. Doing so will force everybody else to perform the same rebase or they will end up with duplicated changesets after pulling in your rebased changesets. You will be prompted for whether to record changes to each modified file, and for files with multiple changes, for each change to use. For each query, the following responses are possible:: [bar] eggs=ham green= eggs [bugzilla] bzurl=http://my-project.org/bugzilla user=bugmail@my-project.org password=plugh version=xmlrpc bzemail=bugzilla@my-project.org template=Changeset {node|short} in {root|basename}. {hgweb}/{webroot}/rev/{node|short}\n {desc}\n strip=5 [bugzilla] bzurl=http://my-project.org/bugzilla user=bugmail@my-project.org password=plugh version=xmlrpc template=Changeset {node|short} in {root|basename}. {hgweb}/{webroot}/rev/{node|short}\n {desc}\n strip=5 [bugzilla] host=localhost password=XYZZY version=3.0 bzuser=unknown@domain.com bzdir=/opt/bugzilla-3.2 template=Changeset {node|short} in {root|basename}. {hgweb}/{webroot}/rev/{node|short}\n {desc}\n strip=5 [extensions] bugzilla = [foo] eggs=large ham=serrano eggs=small [foo] ham=prosciutto eggs=medium bread=toasted [graph] # 2px width default.width = 2 # red color default.color = FF0000 [hooks] # run bugzilla hook on every change pulled or pushed in here incoming.bugzilla = python:hgext.bugzilla.hook [hostfingerprints] hg.intevation.org = 38:76:52:7c:87:26:9a:8f:4a:f8:d3:de:08:45:3b:ea:d6:4b:ee:cc [keyword] # expand keywords in every python file except those matching "x*" **.py = x* = ignore [keywordset] # prefer svn- over cvs-like default keywordmaps svn = True [paths] my_path = http://example.com/path [spam] eggs=ham green= eggs [spam] eggs=large ham=serrano eggs=small [usermap] user@emaildomain.com=user.name@bugzilladomain.com [web] baseurl=http://my-project.org/hg ``--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. ``ls`` Use Python's built-in instrumenting profiler. This profiler works on all platforms, but each line number it reports is the first line of a function. This restriction makes it difficult to identify the expensive parts of a non-trivial function. ``stat`` Use a third-party statistical profiler, statprof. This profiler currently runs only on Unix systems, and is most useful for profiling commands that run for longer than about 0.1 seconds. ``metadata`` is the default field which is used when no fields are specified. You can match more than one field at a time. ``text`` Generate a profiling report. When saving to a file, it should be noted that only the report is saved, and the profiling data is not kept. ``kcachegrind`` Format profiling data for kcachegrind use: when saving to a file, the generated file can directly be loaded into kcachegrind. aliases: %s bar.prefix = secure.example.org bar.key = path/to/file.key bar.cert = path/to/file.cert bar.schemes = https committer = Bugzilla user foo.prefix = hg.intevation.org/mercurial foo.username = foo foo.password = bar foo.schemes = http https hg add/remove/copy/rename work as usual, though you might want to use git-style patches (-g/--git or [diff] git=1) to track copies and renames. See the diffs help topic for more information on the git diff format. hg forget "set:hgignore() and not ignored()" hg locate "set:**.c and not encoding('UTF-8')" hg locate "set:grep(magic) and not binary()" hg log -r "(keyword(bug) or keyword(issue)) and not ancestors(tagged())" hg log -r "1.3::1.5 and keyword(bug) and file('hgext/*')" hg log -r "branch(default) and 1.5:: and not merge()" hg log -r "branch(default)" hg log -r "head() and not closed()" hg log -r "sort(date('May 2008'), user)" hg push my_path hg remove "set: 'listfile:foo.lst' and (**a* or **b*)" hg revert "set:copied() and binary() and size('>1M')" hg status -A "set:binary()" http://server/(.*)-hg/ = http://hg.server/\1/ kwexpand refuses to run if given files contain local changes. kwshrink refuses to run if given files contain local changes. latest = log --limit 5 qnew creates a new patch on top of the currently-applied patch (if any). The patch will be initialized with any outstanding changes in the working directory. You may also use -I/--include, -X/--exclude, and/or a list of files after the patch name to add only changes to matching files to the new patch, leaving the rest as uncommitted modifications. qselect can change the guards on applied patches. It does not pop guarded patches by default. Use --pop to pop back to the last applied patch that is not guarded. Use --reapply (which implies --pop) to push back to the current patch afterwards, but skip guarded patches. ssh://example.com//tmp/repository stable5 = latest -b stable where "original_branch_name" is the name of the branch in the source repository, and "new_branch_name" is the name of the branch is the destination repository. No whitespace is allowed in the branch names. This can be used to (for instance) move code in one repository from "default" to a named branch. $ hg tip --template "{date|isodate}\n" 2008-08-21 18:22 +0000 .. note:: The ``.hgsubstate`` file should not be edited manually. @ 6[tip] 038383181893 2009-04-27 18:04 -0500 stefan | Add theta | o 5 140988835471 2009-04-27 18:04 -0500 stefan | Add eta | o 4 122930637314 2009-04-27 18:04 -0500 stefan | Add zeta | o 3 836302820282 2009-04-27 18:04 -0500 stefan | Add epsilon | o 2 989b4d060121 2009-04-27 18:04 -0500 durin42 | Add beta and delta. | o 1 081603921c3f 2009-04-27 18:04 -0500 durin42 | Add gamma | o 0 d8d2fcd0e319 2009-04-27 18:04 -0500 durin42 Add alpha Git and Subversion subrepos are also supported:: Note that ``.hgsub`` does not exist by default in Mercurial repositories, you have to create and add it to the parent repository before using subrepositories. echo = !echo $@ purge = !$HG status --no-status --unknown -0 | xargs -0 rm where ``path/to/nested`` is the checkout location relatively to the parent Mercurial root, and ``https://example.com/nested/repo/path`` is the source repository path. The source can also reference a filesystem path. # 'none' turns off all effects status.clean = none status.copied = none # 1) only 'gollum' can commit to branch 'ring'; # 'gollum' and anyone else can still commit to any other branch. ring = !gollum # 2) only members of the group 'hobbit' can commit to branch 'lake'; # 'hobbit' members and anyone else can still commit to any other branch. lake = !@hobbit # A bad user is denied on all branches: * = bad-user # A few users are allowed on branch-a: branch-a = user-1, user-2, user-3 # Define new tool myHtmlTool.args = -m $local $other $base $output myHtmlTool.regkey = Software\FooSoftware\HtmlMerge myHtmlTool.priority = 1 # Everyone (except for "user6" and "@hg-denied" - see acl.deny above) # will have write access to any file under the "resources" folder # (except for 1 file. See acl.deny): src/main/resources/** = * # Everyone is allowed on branch-for-tests: branch-for-tests = * # Everyone is denied to the frozen branch: frozen-branch = * # Group "hg-denied" will not have write access to any file: ** = @hg-denied # Nobody will be able to change "DONT-TOUCH-THIS.txt", despite # everyone being able to change all other files. See below. src/main/resources/DONT-TOUCH-THIS.txt = * # Only one user is allowed on branch-b: branch-b = user-1 # The super user is allowed on any branch: * = super-user # To match everyone, use an asterisk for the user: # my/glob/pattern = * # Use this if you want to check access restrictions at commit time pretxncommit.acl = python:hgext.acl.hook # Use this if you want to check access restrictions for pull, push, # bundle and serve. pretxnchangegroup.acl = python:hgext.acl.hook # User "doc_writer" has write access to any file under the "docs" # folder: docs/** = doc_writer # User "jack" and group "designers" have write access to any file # under the "images" folder: images/** = jack, @designers # You can also deny access based on file paths: # add new command called meld, runs meld (no need to name twice) meld = # add new command called vdiff, runs kdiff3 vdiff = kdiff3 # add new command called vimdiff, runs gvimdiff with DirDiff plugin # (see http://www.vim.org/scripts/script.php?script_id=102) Non # English user, be sure to put "let g:DirDiffDynamicDiffText = 1" in # your .vimrc vimdiff = gvim -f "+next" \ "+execute 'DirDiff' fnameescape(argv(0)) fnameescape(argv(1))" # one email for all outgoing changesets outgoing.notify = python:hgext.notify.hook # switch to regexp syntax. syntax: regexp ^\.pc/ # use glob syntax. syntax: glob # user6 will not have write access to any file: ** = user6 $ cd test $ hg serve $ dd if=/dev/urandom of=randomdata count=2000 $ hg add --large randomdata $ hg commit -m 'add randomdata as a largefile' $ hg add --lfsize 2 $ hg lfconvert --size 10 oldrepo newrepo $ hg paths zc-test = http://example.com:8000/test $parent1, $plabel1 - filename, descriptive label of first parent $child, $clabel - filename, descriptive label of child revision $parent2, $plabel2 - filename, descriptive label of second parent $root - repository root $parent is an alias for $parent1. %include ~/.hgrc.d/$HOST.rc %s in %s should not have %s line endings *.elc *.pyc *~ - web - paths - collections -f -> ::. -d x -> date(x) -k x -> keyword(x) -m -> merge() -u x -> user(x) -b x -> branch(x) -P x -> !::x -l x -> limit(expr, x) .hgtags = release_engineer :``serve``: changesets received via http or ssh :``pull``: changesets received via ``hg pull`` :``unbundle``: changesets received via ``hg unbundle`` :``push``: changesets sent or received via ``hg push`` :``bundle``: changesets sent via ``hg unbundle`` :``xmlrpc``: Bugzilla XMLRPC interface. :``xmlrpc+email``: Bugzilla XMLRPC and email interfaces. :``3.0``: MySQL access, Bugzilla 3.0 and later. :``2.18``: MySQL access, Bugzilla 2.18 and up to but not including 3.0. :``2.16``: MySQL access, Bugzilla 2.16 and up to but not including 2.18. :``{bug}``: The Bugzilla bug ID. :``{root}``: The full pathname of the Mercurial repository. :``{webroot}``: Stripped pathname of the Mercurial repository. :``{hgweb}``: Base URL for browsing Mercurial repositories. = Alternatively specify "ssh -C" as your ssh command in your configuration file or with the --ssh command line option. An alternative syntax is ``x..y``. Default ``changeset {node|short} in repo {root} refers to bug {bug}.\ndetails:\n\t{desc|tabindent}`` Default: serve. Deprecation: The win32text extension requires each user to configure the extension again and again for each clone since the configuration is not copied when cloning. See also the ``[usermap]`` section. We have therefore made the ``eol`` as an alternative. The ``eol`` uses a version controlled file for its configuration and each clone will therefore use the right settings from the start. [acl.allow.branches] [acl.allow.branches] # Empty [acl.allow] # Empty [acl.allow] # if acl.allow is not present, all users are allowed by default # empty acl.allow = no users allowed [acl.deny.branches] [acl.deny] # 3) only 'gollum' can change the file below; # 'gollum' and anyone else can still change any other file. /misty/mountains/cave/ring = !gollum [acl.deny] # This list is checked first. If a match is found, acl.allow is not # checked. All users are granted access if acl.deny is not present. # Format for both lists: glob pattern = user, ..., @group, ... [acl] # Allow or deny access for incoming changes only if their source is # listed here, let them pass otherwise. Source is "serve" for all # remote access (http or ssh), "push", "pull" or "bundle" when the # related commands are run locally. # Default: serve sources = serve [cia] # your registered CIA user name user = foo # the name of the project in CIA project = foo # the module (subproject) (optional) #module = foo # Append a diffstat to the log message (optional) #diffstat = False # Template to use for log messages (optional) #template = {desc}\n{baseurl}{webroot}/rev/{node}-- {diffstat} # Style to use (optional) #style = foo # The URL of the CIA notification service (optional) # You can use mailto: URLs to send by email, e.g. # mailto:cia@cia.vc # Make sure to set email.from if you do this. #url = http://cia.vc/ # print message instead of sending it (optional) #test = False # number of slashes to strip for url paths #strip = 0 [color] mode = terminfo [color] status.modified = blue bold underline red_background status.added = green bold status.removed = red bold blue_background status.deleted = cyan bold underline status.unknown = magenta bold underline status.ignored = black bold [decode] # recompress gzip files when writing them to the working dir (we # can safely omit "pipe:", because it's the default) *.gz = gzip [decode] ** = cleverdecode: # or ** = macdecode: [defaults] log = -v status = -m [diff-tools] kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child [email] from = Joseph User method = /usr/sbin/sendmail # charsets for western Europeans # us-ascii, utf-8 omitted, as they are tried first and last charsets = iso-8859-1, iso-8859-15, windows-1252 [email] from = My Name to = recipient1, recipient2, ... cc = cc1, cc2, ... bcc = bcc1, bcc2, ... reply-to = address1, address2, ... [encode] # uncompress gzip files on checkin to improve delta compression # note: not necessarily a good idea, just an example *.gz = pipe: gunzip [extdiff] # add new command that runs GNU diff(1) in 'context diff' mode cdiff = gdiff -Nprc5 ## or the old way: #cmd.cdiff = gdiff #opts.cdiff = -Nprc5 [extdiff] kdiff3 = [extensions] # (the mq extension will get loaded from Mercurial's path) mq = # (this extension will get loaded from the file specified) myfeature = ~/.hgext/myfeature.py [extensions] # disabling extension bar residing in /path/to/extension/bar.py bar = !/path/to/extension/bar.py # ditto, but no path was supplied for extension baz baz = ! [extensions] foo = [extensions] myfeature = ~/.hgext/myfeature.py [extensions] win32text = [encode] ** = cleverencode: # or ** = macencode: [factotum] executable = /bin/auth/factotum mountpoint = /mnt/factotum service = hg [hgk] path=/location/of/hgk [hgk] vdiff=vdiff [hooks] [hooks] # one email for each incoming changeset incoming.notify = python:hgext.notify.hook # one email for all incoming changesets changegroup.notify = python:hgext.notify.hook [hooks] # one of these: changegroup.cia = python:hgcia.hook #incoming.cia = python:hgcia.hook [hooks] # update working directory after adding changesets changegroup.update = hg update # do not use the site-wide hook incoming = incoming.email = /my/email/hook incoming.autobuild = /my/build/hook # force autobuild hook to run before other incoming hooks priority.incoming.autobuild = 1 [hooks] pretxnchangegroup.crlf = python:hgext.win32text.forbidcrlf # or pretxnchangegroup.cr = python:hgext.win32text.forbidcr [hooks] pretxncommit.crlf = python:hgext.win32text.forbidcrlf # or pretxncommit.cr = python:hgext.win32text.forbidcr [interhg] issues = s!issue(\d+)!issue\1! bugzilla = s!((?:bug|b=|(?=#?\d{4,}))(?:\s*#?)(\d+))!\1!i boldify = s!(^|\s)#(\d+)\b! #\2! [largefiles] minsize = 2 [largefiles] patterns = *.jpg re:.*\.(png|bmp)$ library.zip content/audio/* [merge-patterns] **.c = kdiff3 **.jpg = myimgmerge [merge-tools] # Override stock tool location kdiff3.executable = ~/bin/kdiff3 # Specify command line kdiff3.args = $base $local $other -o $output # Give higher priority kdiff3.priority = 1 [mq] git = auto/keep/yes/no [mq] keepchanges = True [mq] secret = True [notify] config = /path/to/subscriptionsfile [pager] attend = annotate, cat, diff, export, glog, log, qdiff [pager] ignore = version, help, update [pager] pager = less -FRX [paths] /projects/a = /srv/tmprepos/a /projects/b = c:/repos/b / = /srv/repos/* /user/bob = /home/bob/repos/** [paths] alias1 = URL1 alias2 = URL2 ... [patterns] **.py = native **.vcproj = CRLF **.txt = native Makefile = LF **.jpg = BIN [phases] publish = False [progress] delay = 3 # number of seconds (float) before showing the progress bar changedelay = 1 # changedelay: minimum delay before showing a new topic. # If set to less than 3 * refresh, that value will # be used instead. refresh = 0.1 # time in seconds between refreshes of the progress bar format = topic bar number estimate # format of the progress bar width = # if set, the maximum width of the progress information # (that is, min(width, term width) will be used) clear-complete = True # clear the progress bar after it's done disable = False # if true, don't show a progress bar assume-tty = False # if true, ALWAYS show a progress bar, unless # disable is given [repository] native = LF [reposubs] # key is repo pattern, value is a comma-separated list of subscriber emails pattern = user@host [reposubs] */widgets#branch(release) = qa-team@example.com [revsetalias] h = heads() d($1) = sort($1, date) rs($1, $2) = reverse(sort($1, $2)) [schemes] gcode = http://{1}.googlecode.com/hg/ [schemes] py = http://code.python.org/hg/ [schemes] py = http://hg.python.org/ bb = https://bitbucket.org/ bb+ssh = ssh://hg@bitbucket.org/ gcode = https://{1}.googlecode.com/hg/ kiln = https://{1}.kilnhg.com/Repo/ [ui] username = Firstname Lastname verbose = True [usersubs] # key is subscriber email, value is a comma-separated list of repo patterns user@host = pattern [web] # If you want hyperlinks (optional) baseurl = http://server/path/to/repo [web] pygments_style =