Mercurial > emacs
changeset 94873:66788c63a40a
(vc-bzr-sha1, vc-bzr-command-discarding-stderr)
(vc-bzr-revision-completion-table): Use process-file.
(vc-bzr-working-revision): Pass relative file names.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Sun, 11 May 2008 21:59:45 +0000 |
| parents | c5a53051fe83 |
| children | b612fb200b3d |
| files | lisp/ChangeLog lisp/vc-bzr.el |
| diffstat | 2 files changed, 9 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun May 11 21:57:27 2008 +0000 +++ b/lisp/ChangeLog Sun May 11 21:59:45 2008 +0000 @@ -1,5 +1,9 @@ 2008-05-11 Stefan Monnier <monnier@iro.umontreal.ca> + * 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 <juri@jurta.org> @@ -18,7 +22,7 @@ 2008-05-11 Eric S. Raymond <esr@snark.thyrsus.com> - * vc-hooks.el (vc-recompute-state): Removed (dead code). + * vc-hooks.el (vc-recompute-state): Remove (dead code). 2008-05-10 Dan Nicolaescu <dann@ics.uci.edu>
--- a/lisp/vc-bzr.el Sun May 11 21:57:27 2008 +0000 +++ b/lisp/vc-bzr.el Sun May 11 21:59:45 2008 +0000 @@ -134,7 +134,7 @@ (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 @@ ;; 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 @@ 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 @@ (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))