Commit 04094290 authored by Richard M. Stallman's avatar Richard M. Stallman
Browse files

(vc-fetch-master-properties): Use path-separator

for path to "cvs status" command.
parent 76869384
...@@ -281,7 +281,8 @@ value of this flag.") ...@@ -281,7 +281,8 @@ value of this flag.")
;; Add vc-path to PATH for the execution of this command. ;; Add vc-path to PATH for the execution of this command.
(process-environment (process-environment
(cons (concat "PATH=" (getenv "PATH") (cons (concat "PATH=" (getenv "PATH")
":" (mapconcat 'identity vc-path ":")) path-separator
(mapconcat 'identity vc-path path-separator))
process-environment))) process-environment)))
(apply 'call-process "cvs" nil "*vc-info*" nil (apply 'call-process "cvs" nil "*vc-info*" nil
(list "status" (file-name-nondirectory file)))) (list "status" (file-name-nondirectory file))))
...@@ -336,6 +337,7 @@ value of this flag.") ...@@ -336,6 +337,7 @@ value of this flag.")
(and (progn (goto-char (point-min)) (and (progn (goto-char (point-min))
(search-forward "$Header: " nil t)) (search-forward "$Header: " nil t))
(looking-at "[^ ]+ \\([0-9.]+\\) "))) (looking-at "[^ ]+ \\([0-9.]+\\) ")))
(goto-char (match-end 0))
;; if found, store the revision number ... ;; if found, store the revision number ...
(let ((rev (buffer-substring (match-beginning 1) (let ((rev (buffer-substring (match-beginning 1)
(match-end 1)))) (match-end 1))))
...@@ -567,24 +569,19 @@ value of this flag.") ...@@ -567,24 +569,19 @@ value of this flag.")
(defun vc-fetch-properties (file) (defun vc-fetch-properties (file)
;; Fetch vc-latest-version and vc-your-latest-version ;; Fetch vc-latest-version and vc-your-latest-version
;; if that wasn't already done. ;; if that wasn't already done.
(vc-backend-dispatch (cond
file ((eq (vc-backend file) 'RCS)
;; SCCS (set-buffer (get-buffer-create "*vc-info*"))
(vc-fetch-master-properties file) (vc-insert-file (vc-name file) "^desc")
;; RCS (vc-parse-buffer
(progn (list '("^\\([0-9]+\\.[0-9.]+\\)\ndate[ \t]+\\([0-9.]+\\);" 1 2)
(set-buffer (get-buffer-create "*vc-info*")) (list (concat "^\\([0-9]+\\.[0-9.]+\\)\n"
(vc-insert-file (vc-name file) "^desc") "date[ \t]+\\([0-9.]+\\);[ \t]+"
(vc-parse-buffer "author[ \t]+"
(list '("^\\([0-9]+\\.[0-9.]+\\)\ndate[ \t]+\\([0-9.]+\\);" 1 2) (regexp-quote (user-login-name)) ";") 1 2))
(list (concat "^\\([0-9]+\\.[0-9.]+\\)\n" file
"date[ \t]+\\([0-9.]+\\);[ \t]+" '(vc-latest-version vc-your-latest-version)))
"author[ \t]+" (t (vc-fetch-master-properties file))
(regexp-quote (user-login-name)) ";") 1 2))
file
'(vc-latest-version vc-your-latest-version)))
;; CVS
(vc-fetch-master-properties file)
)) ))
(defun vc-workfile-version (file) (defun vc-workfile-version (file)
...@@ -652,7 +649,8 @@ value of this flag.") ...@@ -652,7 +649,8 @@ value of this flag.")
;; checks for this condition. This function returns nil if ;; checks for this condition. This function returns nil if
;; DIRNAME/BASENAME is not handled by CVS. ;; DIRNAME/BASENAME is not handled by CVS.
(if (and (file-directory-p (concat dirname "CVS/")) (if (and (file-directory-p (concat dirname "CVS/"))
(file-readable-p (concat dirname "CVS/Entries"))) (file-readable-p (concat dirname "CVS/Entries"))
(file-readable-p (concat dirname "CVS/Repository")))
(let ((bufs nil) (fold case-fold-search)) (let ((bufs nil) (fold case-fold-search))
(unwind-protect (unwind-protect
(save-excursion (save-excursion
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment