[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-svn.el |
Date: |
Fri, 09 May 2003 10:13:41 -0400 |
Index: emacs/lisp/vc-svn.el
diff -c emacs/lisp/vc-svn.el:1.6 emacs/lisp/vc-svn.el:1.7
*** emacs/lisp/vc-svn.el:1.6 Thu May 8 14:31:21 2003
--- emacs/lisp/vc-svn.el Fri May 9 10:13:40 2003
***************
*** 291,296 ****
--- 291,299 ----
(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,411 ****
(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)))))))
(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.
--- 398,413 ----
(let* ((switches (vc-switches 'SVN 'diff))
(async (and (vc-svn-stay-local-p file)
(or oldvers newvers) ; Svn diffs those locally.
! (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.
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/05
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/05
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/05
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/05
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/05
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/08
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/09
- [Emacs-diffs] Changes to emacs/lisp/vc-svn.el, Stefan Monnier, 2003/05/14