/[emacs]/emacs/lisp/vc-svn.el
ViewVC logotype

Diff of /emacs/lisp/vc-svn.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.11.2.2 by miles, Mon Jun 28 07:28:47 2004 UTC revision 1.11.2.3 by miles, Fri Aug 27 07:00:26 2004 UTC
# Line 1  Line 1 
1  ;;; vc-svn.el --- non-resident support for Subversion version-control  ;;; vc-svn.el --- non-resident support for Subversion version-control
2    
3  ;; Copyright (C) 1995,98,99,2000,2001,02,2003  Free Software Foundation, Inc.  ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004
4    ;;           Free Software Foundation, Inc.
5    
6  ;; Author:      FSF (see vc.el for full credits)  ;; Author:      FSF (see vc.el for full credits)
7  ;; Maintainer:  Stefan Monnier <monnier@gnu.org>  ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
# Line 363  The changes are between FIRST-VERSION an Line 364  The changes are between FIRST-VERSION an
364                 (append (vc-switches nil 'diff) '("/dev/null")))                 (append (vc-switches nil 'diff) '("/dev/null")))
365          ;; Even if it's empty, it's locally modified.          ;; Even if it's empty, it's locally modified.
366          1)          1)
367      (let* ((switches (vc-switches 'SVN 'diff))      (let* ((switches
368                (if vc-svn-diff-switches
369                    (vc-switches 'SVN 'diff)
370                  (list "-x" (mapconcat 'identity (vc-switches nil 'diff) " "))))
371             (async (and (vc-stay-local-p file)             (async (and (vc-stay-local-p file)
372                         (or oldvers newvers) ; Svn diffs those locally.                         (or oldvers newvers) ; Svn diffs those locally.
373                         (fboundp 'start-process))))                         (fboundp 'start-process))))
# Line 371  The changes are between FIRST-VERSION an Line 375  The changes are between FIRST-VERSION an
375               (if async 'async 0)               (if async 'async 0)
376               file "diff"               file "diff"
377               (append               (append
378                (when switches                switches
                 (list "-x" (mapconcat 'identity switches " ")))  
379                (when oldvers                (when oldvers
380                  (list "-r" (if newvers (concat oldvers ":" newvers)                  (list "-r" (if newvers (concat oldvers ":" newvers)
381                               oldvers)))))                               oldvers)))))
# Line 504  essential information." Line 507  essential information."
507    
508  (provide 'vc-svn)  (provide 'vc-svn)
509    
510  ;;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d  ;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d
511  ;;; vc-svn.el ends here  ;;; vc-svn.el ends here

Legend:
Removed from v.1.11.2.2  
changed lines
  Added in v.1.11.2.3

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26