mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-29 19:48:19 +00:00
Code Issues Releases Activity

(vc-bzr-sha1, vc-bzr-command-discarding-stderr)

Browse Source 
(vc-bzr-revision-completion-table): Use process-file.
(vc-bzr-working-revision): Pass relative file names.
This commit is contained in:
Stefan Monnier 2008-05-11 21:59:45 +00:00
parent 365bdf633b
commit 07c4b87ce2
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lisp/ChangeLog
View File

@ -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>

8
lisp/vc-bzr.el
View File

@ -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))