diff options
| author | Stefan Monnier | 2008-05-11 21:59:45 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2008-05-11 21:59:45 +0000 |
| commit | 07c4b87ce26e8bf6c3e613505fb4cab91c958a48 (patch) | |
| tree | 4c1e7685fa9ee92c409de779c6f41b527f331803 | |
| parent | 365bdf633bfdea972e63d42bff7e503f80716e69 (diff) | |
| download | emacs-07c4b87ce26e8bf6c3e613505fb4cab91c958a48.tar.gz emacs-07c4b87ce26e8bf6c3e613505fb4cab91c958a48.zip | |
(vc-bzr-sha1, vc-bzr-command-discarding-stderr)
(vc-bzr-revision-completion-table): Use process-file.
(vc-bzr-working-revision): Pass relative file names.
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/vc-bzr.el | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 88c4e96202f..a3981bc9d03 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2008-05-11 Stefan Monnier <monnier@iro.umontreal.ca> | 1 | 2008-05-11 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 2 | ||
| 3 | * vc-bzr.el (vc-bzr-sha1, vc-bzr-command-discarding-stderr) | ||
| 4 | (vc-bzr-revision-completion-table): Use process-file. | ||
| 5 | (vc-bzr-working-revision): Pass relative file names. | ||
| 6 | |||
| 3 | * diff-mode.el (diff-hunk-header-re): Refine the regexp. | 7 | * diff-mode.el (diff-hunk-header-re): Refine the regexp. |
| 4 | 8 | ||
| 5 | 2008-05-11 Juri Linkov <juri@jurta.org> | 9 | 2008-05-11 Juri Linkov <juri@jurta.org> |
| @@ -18,7 +22,7 @@ | |||
| 18 | 22 | ||
| 19 | 2008-05-11 Eric S. Raymond <esr@snark.thyrsus.com> | 23 | 2008-05-11 Eric S. Raymond <esr@snark.thyrsus.com> |
| 20 | 24 | ||
| 21 | * vc-hooks.el (vc-recompute-state): Removed (dead code). | 25 | * vc-hooks.el (vc-recompute-state): Remove (dead code). |
| 22 | 26 | ||
| 23 | 2008-05-10 Dan Nicolaescu <dann@ics.uci.edu> | 27 | 2008-05-10 Dan Nicolaescu <dann@ics.uci.edu> |
| 24 | 28 | ||
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el index c0da7c836b6..fe3f9954827 100644 --- a/lisp/vc-bzr.el +++ b/lisp/vc-bzr.el | |||
| @@ -134,7 +134,7 @@ Invoke the bzr command adding `BZR_PROGRESS_BAR=none' and | |||
| 134 | (when (consp prog) | 134 | (when (consp prog) |
| 135 | (setq args (cdr prog)) | 135 | (setq args (cdr prog)) |
| 136 | (setq prog (car prog))) | 136 | (setq prog (car prog))) |
| 137 | (apply 'call-process prog file t nil args) | 137 | (apply 'process-file prog (file-relative-name file) t nil args) |
| 138 | (buffer-substring (point-min) (+ (point-min) 40))))) | 138 | (buffer-substring (point-min) (+ (point-min) 40))))) |
| 139 | 139 | ||
| 140 | (defun vc-bzr-state-heuristic (file) | 140 | (defun vc-bzr-state-heuristic (file) |
| @@ -342,7 +342,7 @@ If any error occurred in running `bzr status', then return nil." | |||
| 342 | ;; fallback to calling "bzr revno" | 342 | ;; fallback to calling "bzr revno" |
| 343 | (lexical-let* | 343 | (lexical-let* |
| 344 | ((result (vc-bzr-command-discarding-stderr | 344 | ((result (vc-bzr-command-discarding-stderr |
| 345 | vc-bzr-program "revno" file)) | 345 | vc-bzr-program "revno" (file-relative-name file))) |
| 346 | (exitcode (car result)) | 346 | (exitcode (car result)) |
| 347 | (output (cdr result))) | 347 | (output (cdr result))) |
| 348 | (cond | 348 | (cond |
| @@ -561,7 +561,7 @@ containing whatever the process sent to its standard output | |||
| 561 | stream. Standard error output is discarded." | 561 | stream. Standard error output is discarded." |
| 562 | (with-temp-buffer | 562 | (with-temp-buffer |
| 563 | (cons | 563 | (cons |
| 564 | (apply #'call-process command nil (list (current-buffer) nil) nil args) | 564 | (apply #'process-file command nil (list (current-buffer) nil) nil args) |
| 565 | (buffer-substring (point-min) (point-max))))) | 565 | (buffer-substring (point-min) (point-max))))) |
| 566 | 566 | ||
| 567 | (defun vc-bzr-prettify-state-info (file) | 567 | (defun vc-bzr-prettify-state-info (file) |
| @@ -645,7 +645,7 @@ stream. Standard error output is discarded." | |||
| 645 | (table nil)) | 645 | (table nil)) |
| 646 | (with-temp-buffer | 646 | (with-temp-buffer |
| 647 | ;; "bzr-1.2 tags" is much faster with --show-ids. | 647 | ;; "bzr-1.2 tags" is much faster with --show-ids. |
| 648 | (call-process vc-bzr-program nil '(t) nil "tags" "--show-ids") | 648 | (process-file vc-bzr-program nil '(t) nil "tags" "--show-ids") |
| 649 | ;; The output is ambiguous, unless we assume that revids do not | 649 | ;; The output is ambiguous, unless we assume that revids do not |
| 650 | ;; contain spaces. | 650 | ;; contain spaces. |
| 651 | (goto-char (point-min)) | 651 | (goto-char (point-min)) |