Mercurial > emacs
comparison lisp/vc-svn.el @ 50820:fc3f65557bc8
(vc-svn-registered): Missing paren.
(vc-svn-diff-tree): Missing renaming.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Mon, 05 May 2003 15:49:23 +0000 |
parents | d3acfb11487e |
children | 33e415a24bb5 |
comparison
equal
deleted
inserted
replaced
50819:ef6de283f568 | 50820:fc3f65557bc8 |
---|---|
129 (with-temp-buffer | 129 (with-temp-buffer |
130 (cd (file-name-directory file)) | 130 (cd (file-name-directory file)) |
131 (condition-case nil | 131 (condition-case nil |
132 (vc-svn-command t 0 file "status" "-v") | 132 (vc-svn-command t 0 file "status" "-v") |
133 ;; We can't find an `svn' executable. We could also deregister SVN. | 133 ;; We can't find an `svn' executable. We could also deregister SVN. |
134 (file-error nil) | 134 (file-error nil)) |
135 (vc-svn-parse-status t) | 135 (vc-svn-parse-status t) |
136 (eq 'SVN (vc-file-getprop file 'vc-backend))))) | 136 (eq 'SVN (vc-file-getprop file 'vc-backend))))) |
137 | 137 |
138 (defun vc-svn-state (file &optional localp) | 138 (defun vc-svn-state (file &optional localp) |
139 "SVN-specific version of `vc-state'." | 139 "SVN-specific version of `vc-state'." |
452 ;; svn diff: use a single call for the entire tree | 452 ;; svn diff: use a single call for the entire tree |
453 (let ((coding-system-for-read (or coding-system-for-read 'undecided)) | 453 (let ((coding-system-for-read (or coding-system-for-read 'undecided)) |
454 (diff-switches-list (vc-diff-switches-list 'SVN))) | 454 (diff-switches-list (vc-diff-switches-list 'SVN))) |
455 (apply 'vc-svn-command "*vc-diff*" 1 nil "diff" | 455 (apply 'vc-svn-command "*vc-diff*" 1 nil "diff" |
456 (append | 456 (append |
457 (when oldvers | 457 (when rev1 |
458 (list "-r" | 458 (list "-r" |
459 (if rev2 (concat rev1 ":" rev2) rev1))) | 459 (if rev2 (concat rev1 ":" rev2) rev1))) |
460 (when diff-switches-list | 460 (when diff-switches-list |
461 (list "-x" (mapconcat 'identity diff-switches-list " "))))))))) | 461 (list "-x" (mapconcat 'identity diff-switches-list " "))))))))) |
462 | 462 |