diff options
| author | Stefan Monnier | 2007-08-06 21:17:34 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2007-08-06 21:17:34 +0000 |
| commit | b6e6e09ac1bc4fb22843d9ba8920dffa88f8ce37 (patch) | |
| tree | 85b6d7054651124550c16e2eec2924d178c99d99 | |
| parent | dfbd373dfb9de125e016bb7d11b46d05fdf992c4 (diff) | |
| download | emacs-b6e6e09ac1bc4fb22843d9ba8920dffa88f8ce37.tar.gz emacs-b6e6e09ac1bc4fb22843d9ba8920dffa88f8ce37.zip | |
(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.
| -rw-r--r-- | lisp/ChangeLog | 26 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | bin | 21032 -> 23605 bytes |
2 files changed, 26 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 790bb74d2d9..2f77c64fa41 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,29 @@ | |||
| 1 | 2007-08-06 Riccardo Murri <riccardo.murri@gmail.com> | ||
| 2 | |||
| 3 | * vc-bzr.el (vc-bzr-registered): Gracefully handle missing "bzr" | ||
| 4 | program, and return nil | ||
| 5 | (vc-bzr-state): Gracefully handle missing "bzr" program, and return nil. | ||
| 6 | (vc-bzr-state): Look for path names relative to the repository | ||
| 7 | root after status keyword. | ||
| 8 | (vc-bzr-file-name-relative): New function. | ||
| 9 | (vc-bzr-admin-dirname): Reinstate, as other vc-bzr-admin-... paths | ||
| 10 | depend on it. | ||
| 11 | (vc-bzr-admin-dirname, ...-checkout-format-file) | ||
| 12 | (...-branch-format-file, ...-revhistory): Paths to some Bzr internal | ||
| 13 | files that we now parse directly for speed. | ||
| 14 | (vc-bzr-root-dir): Use `vc-bzr-admin-checkout-format-file' as witness. | ||
| 15 | (vc-bzr-registered): Only parse vc-bzr-admin-dirstate file if it exists. | ||
| 16 | (vc-bzr-state): "bzr status" successful only if exitcode is 0 | ||
| 17 | (vc-bzr-root): Use `vc-bzr-shell-command'. Stderr may contain | ||
| 18 | Bzr warnings, so we must discard it. | ||
| 19 | (vc-bzr-workfile-version): Speedup counting lines from | ||
| 20 | `vc-bzr-admin-revhistory' file, but fallback to spawning "bzr revno" | ||
| 21 | if that file doesn't exist. | ||
| 22 | (vc-bzr-responsible-p): Use `vc-bzr-root' instead of | ||
| 23 | `vc-bzr-root-dir' for speed. | ||
| 24 | add `vc-bzr-admin-dirname' (not ".bzr"!) to `vc-directory-exclusion-list' | ||
| 25 | (vc-bzr-shell-command): New function. | ||
| 26 | |||
| 1 | 2007-08-06 Tom Tromey <tromey@redhat.com> | 27 | 2007-08-06 Tom Tromey <tromey@redhat.com> |
| 2 | 28 | ||
| 3 | * diff-mode.el (diff-unified->context, diff-reverse-direction) | 29 | * diff-mode.el (diff-unified->context, diff-reverse-direction) |
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index c2128de90c9..907bcc5200c 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el | |||
| Binary files differ | |||