From b6e6e09ac1bc4fb22843d9ba8920dffa88f8ce37 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 6 Aug 2007 21:17:34 +0000 Subject: [PATCH] (vc-bzr-registered): Gracefully handle missing "bzr" program, and return nil (vc-bzr-state): Gracefully handle missing "bzr" program, and return nil. (vc-bzr-state): Look for path names relative to the repository root after status keyword. (vc-bzr-file-name-relative): New function. (vc-bzr-admin-dirname): Reinstate, as other vc-bzr-admin-... paths depend on it. (vc-bzr-admin-dirname, ...-checkout-format-file) (...-branch-format-file, ...-revhistory): Paths to some Bzr internal files that we now parse directly for speed. (vc-bzr-root-dir): Use `vc-bzr-admin-checkout-format-file' as witness. (vc-bzr-registered): Only parse vc-bzr-admin-dirstate file if it exists. (vc-bzr-state): "bzr status" successful only if exitcode is 0 (vc-bzr-root): Use `vc-bzr-shell-command'. Stderr may contain Bzr warnings, so we must discard it. (vc-bzr-workfile-version): Speedup counting lines from `vc-bzr-admin-revhistory' file, but fallback to spawning "bzr revno" if that file doesn't exist. (vc-bzr-responsible-p): Use `vc-bzr-root' instead of `vc-bzr-root-dir' for speed. add `vc-bzr-admin-dirname' (not ".bzr"!) to `vc-directory-exclusion-list' (vc-bzr-shell-command): New function. --- lisp/ChangeLog | 26 ++++++++++++++++++++++++++ lisp/vc-bzr.el | Bin 21032 -> 23605 bytes 2 files changed, 26 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 790bb74d2d9..2f77c64fa41 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,29 @@ +2007-08-06 Riccardo Murri + + * vc-bzr.el (vc-bzr-registered): Gracefully handle missing "bzr" + program, and return nil + (vc-bzr-state): Gracefully handle missing "bzr" program, and return nil. + (vc-bzr-state): Look for path names relative to the repository + root after status keyword. + (vc-bzr-file-name-relative): New function. + (vc-bzr-admin-dirname): Reinstate, as other vc-bzr-admin-... paths + depend on it. + (vc-bzr-admin-dirname, ...-checkout-format-file) + (...-branch-format-file, ...-revhistory): Paths to some Bzr internal + files that we now parse directly for speed. + (vc-bzr-root-dir): Use `vc-bzr-admin-checkout-format-file' as witness. + (vc-bzr-registered): Only parse vc-bzr-admin-dirstate file if it exists. + (vc-bzr-state): "bzr status" successful only if exitcode is 0 + (vc-bzr-root): Use `vc-bzr-shell-command'. Stderr may contain + Bzr warnings, so we must discard it. + (vc-bzr-workfile-version): Speedup counting lines from + `vc-bzr-admin-revhistory' file, but fallback to spawning "bzr revno" + if that file doesn't exist. + (vc-bzr-responsible-p): Use `vc-bzr-root' instead of + `vc-bzr-root-dir' for speed. + add `vc-bzr-admin-dirname' (not ".bzr"!) to `vc-directory-exclusion-list' + (vc-bzr-shell-command): New function. + 2007-08-06 Tom Tromey * diff-mode.el (diff-unified->context, diff-reverse-direction) diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index c2128de90c9e0615352109c7ed516167364ef4bd..907bcc5200ce0f434240bac99f03f67bde9e79a1 100644 GIT binary patch delta 2894 zcmb7GO>7%Q6qc(TiYblbq;c$|>8lHLH}X0uK?-fu61PoD5l;G(O1&W1?2hYE*0b); zteqB+PnNr0kOnUU zSk`6gICkLra%}Xc4zn8sisj8)K@sq`4CgLftFE4a;%oYo&!D~d+>2>|;+nGbYar?b zTpAEZ_`ywZd?swlD7y})Zv_yLrq8K9;ldUnhZ^+=FBi?U;gT9!a{(>KLg$w4Ht5UD za_Yp{@J1zJ@B+p&(AKesjG2XTqlD*^Tl3MaqG`(SMh_o;sDfw}A?_Oa>A>>yRvnvYvtJ_V&IBk)#4jsn|0;CkyXqqP4#ML0Tt_OAl z7*<&GL*{n>n)o@@Q5X+dVx)6bc*WU!wm`>G{_2woUA#<07%)u{(6~N#;g!|3N_7>u z2xzlO+=Ot*FhOl^C&!w$sF#cAD(d`|sP%Jk=L}teay$nH*>2j*)$O%(ER~(kq}OOY zFl_1Y%$9S7s`h~mh)fN11Zud-Hjahejrx_8Iviv!u}2^B+sRk6yD=mW8Us&OxcueE4Ea#T+8a{i*cKR!}OfVX=J-7oSFQu5R3 zy!>JMNEU?OuR+I@`({e{o@SPIo>ph3_JKzm6!D5A;9WAawCAKsS7R}0QiRmULyx>Y z`&MU&J-re3Wkb)d-|s{qlR7oqR8SL&^Th;%N@NGMCz&C3_6*`yU?B`;fHIKwp&0|4 z0d~u$u398pO4V(hNpBE(rIbOQ&K^@+L669(+w3|~!$3SldK@!oH)99Nk%io>ypx?? z#*rq{sB1L)MIx$L*w`e2C45Vf0yDzGF>y;LF26r`q%xp73G`KFC_q}(dT{1-;(3osW+<=~o1rrP&ZpQV**A~D!Ht5h0N_FI=(quOePwbIjkIi<^7XLUXKb+m) z87f6}MAxK6Wp$f4p&+15a6ju4II~`@R@TmfrfwuV6e$(QR$r6s%IR2^TDBJwpd4(q zVN%k` zM2?~`QA5%gEqPP4>$nqIB+yKc@8MJCJOUSyswzOvF&CdRaVcr^LF@)Tbgm=^L~}5% z6w7fbSMMLkwAV>n0gxY z`OsV}-bT#es!gUNQ|BfTvD5O|m2XCrWBKRG%7_wud8~3i`tn9)uA`3NsCpwQQpZv- zv|R^ru2hl{+!ff7xHjyHi)EL<$6*9*id(u(pn;d`iOH-$i%a6&QA?eTzGRM&0fTGSojngM0d_GC;0=D@+lVx@w|vG&-X1oUQ( z!det?V`g!LeVpCR*hGM?yNt=LZ<$iS3@)bRp)+@gmvbt(Xy$blhF-`?#j{k014Mhf{sH76UVtiF`qV_r*%qBW}7QfXN z!<)71nB2ZPB{5hTPEWQ}$tKPZ{r?vmf;#t_T)08i(QzF=pG)E7a(X)W2pUL+VaP(w THGjPRbMoZi*J=Kl-Ff8~{1?*P -- 2.39.2