Mercurial > emacs
changeset 50922:bdc62a6694f7
(vc-svn-rename-file): New fun.
(vc-svn-diff): Correctly check svn's return status.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 09 May 2003 14:13:40 +0000 |
| parents | 0c19fe613e38 |
| children | 3eab629b1239 |
| files | lisp/vc-svn.el |
| diffstat | 1 files changed, 13 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-svn.el Fri May 09 14:03:51 2003 +0000 +++ b/lisp/vc-svn.el Fri May 09 14:13:40 2003 +0000 @@ -291,6 +291,9 @@ (concat "-r" rev)) switches))) +(defun vc-svn-rename-file (old new) + (vc-svn-command nil 0 new "move" (file-relative-name old))) + (defun vc-svn-revert (file &optional contents-done) "Revert FILE to the version it was based on." (unless contents-done @@ -395,17 +398,16 @@ (let* ((switches (vc-switches 'SVN 'diff)) (async (and (vc-svn-stay-local-p file) (or oldvers newvers) ; Svn diffs those locally. - (fboundp 'start-process))) - (status - (apply 'vc-svn-command "*vc-diff*" - (if async 'async 1) - file "diff" - (append - (when switches - (list "-x" (mapconcat 'identity switches " "))) - (when oldvers - (list "-r" (if newvers (concat oldvers ":" newvers) - oldvers))))))) + (fboundp 'start-process)))) + (apply 'vc-svn-command "*vc-diff*" + (if async 'async 0) + file "diff" + (append + (when switches + (list "-x" (mapconcat 'identity switches " "))) + (when oldvers + (list "-r" (if newvers (concat oldvers ":" newvers) + oldvers))))) (if async 1 ; async diff => pessimistic assumption ;; For some reason `svn diff' does not return a useful ;; status w.r.t whether the diff was empty or not.