From 07c4b87ce26e8bf6c3e613505fb4cab91c958a48 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Sun, 11 May 2008 21:59:45 +0000 Subject: [PATCH] (vc-bzr-sha1, vc-bzr-command-discarding-stderr) (vc-bzr-revision-completion-table): Use process-file. (vc-bzr-working-revision): Pass relative file names. --- lisp/ChangeLog | 6 +++++- 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 @@ 2008-05-11 Stefan Monnier + * vc-bzr.el (vc-bzr-sha1, vc-bzr-command-discarding-stderr) + (vc-bzr-revision-completion-table): Use process-file. + (vc-bzr-working-revision): Pass relative file names. + * diff-mode.el (diff-hunk-header-re): Refine the regexp. 2008-05-11 Juri Linkov @@ -18,7 +22,7 @@ 2008-05-11 Eric S. Raymond - * vc-hooks.el (vc-recompute-state): Removed (dead code). + * vc-hooks.el (vc-recompute-state): Remove (dead code). 2008-05-10 Dan Nicolaescu 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 (when (consp prog) (setq args (cdr prog)) (setq prog (car prog))) - (apply 'call-process prog file t nil args) + (apply 'process-file prog (file-relative-name file) t nil args) (buffer-substring (point-min) (+ (point-min) 40))))) (defun vc-bzr-state-heuristic (file) @@ -342,7 +342,7 @@ If any error occurred in running `bzr status', then return nil." ;; fallback to calling "bzr revno" (lexical-let* ((result (vc-bzr-command-discarding-stderr - vc-bzr-program "revno" file)) + vc-bzr-program "revno" (file-relative-name file))) (exitcode (car result)) (output (cdr result))) (cond @@ -561,7 +561,7 @@ containing whatever the process sent to its standard output stream. Standard error output is discarded." (with-temp-buffer (cons - (apply #'call-process command nil (list (current-buffer) nil) nil args) + (apply #'process-file command nil (list (current-buffer) nil) nil args) (buffer-substring (point-min) (point-max))))) (defun vc-bzr-prettify-state-info (file) @@ -645,7 +645,7 @@ stream. Standard error output is discarded." (table nil)) (with-temp-buffer ;; "bzr-1.2 tags" is much faster with --show-ids. - (call-process vc-bzr-program nil '(t) nil "tags" "--show-ids") + (process-file vc-bzr-program nil '(t) nil "tags" "--show-ids") ;; The output is ambiguous, unless we assume that revids do not ;; contain spaces. (goto-char (point-min)) -- 2.39.5