[Emacs-diffs] Changes to emacs/lisp/vc-svn.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/vc-svn.el
diff -c emacs/lisp/vc-svn.el:1.11.2.1 emacs/lisp/vc-svn.el:1.11.2.2
*** emacs/lisp/vc-svn.el:1.11.2.1       Fri Apr 16 12:50:10 2004
--- emacs/lisp/vc-svn.el        Mon Jun 28 07:28:47 2004
***************
*** 195,202 ****
  
  (defun vc-svn-checkin (file rev comment)
    "SVN-specific version of `vc-backend-checkin'."
!   (let ((status (apply 'vc-svn-command nil 1 file
!                      "ci" (list* "-m" comment (vc-switches 'SVN 'checkin)))))
      (set-buffer "*vc*")
      (goto-char (point-min))
      (unless (equal status 0)
--- 195,203 ----
  
  (defun vc-svn-checkin (file rev comment)
    "SVN-specific version of `vc-backend-checkin'."
!   (let ((status (apply
!                  'vc-svn-command nil 1 file "ci"
!                  (nconc (list "-m" comment) (vc-switches 'SVN 'checkin)))))
      (set-buffer "*vc*")
      (goto-char (point-min))
      (unless (equal status 0)
***************
*** 334,354 ****
  ;;; History functions
  ;;;
  
! (defun vc-svn-print-log (file)
    "Get change log associated with FILE."
    (save-current-buffer
!     (vc-setup-buffer nil)
      (let ((inhibit-read-only t))
        (goto-char (point-min))
        ;; Add a line to tell log-view-mode what file this is.
        (insert "Working file: " (file-relative-name file) "\n"))
      (vc-svn-command
!      t
       (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
       file "log")))
  
! (defun vc-svn-diff (file &optional oldvers newvers)
    "Get a difference report using SVN between two versions of FILE."
    (if (string= (vc-workfile-version file) "0")
        ;; This file is added but not yet committed; there is no master file.
        (if (or oldvers newvers)
--- 335,356 ----
  ;;; History functions
  ;;;
  
! (defun vc-svn-print-log (file &optional buffer)
    "Get change log associated with FILE."
    (save-current-buffer
!     (vc-setup-buffer buffer)
      (let ((inhibit-read-only t))
        (goto-char (point-min))
        ;; Add a line to tell log-view-mode what file this is.
        (insert "Working file: " (file-relative-name file) "\n"))
      (vc-svn-command
!      buffer
       (if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
       file "log")))
  
! (defun vc-svn-diff (file &optional oldvers newvers buffer)
    "Get a difference report using SVN between two versions of FILE."
+   (unless buffer (setq buffer "*vc-diff*"))
    (if (string= (vc-workfile-version file) "0")
        ;; This file is added but not yet committed; there is no master file.
        (if (or oldvers newvers)
***************
*** 356,362 ****
        ;; We regard this as "changed".
        ;; Diff it against /dev/null.
        ;; Note: this is NOT a "svn diff".
!       (apply 'vc-do-command "*vc-diff*"
               1 "diff" file
               (append (vc-switches nil 'diff) '("/dev/null")))
        ;; Even if it's empty, it's locally modified.
--- 358,364 ----
        ;; We regard this as "changed".
        ;; Diff it against /dev/null.
        ;; Note: this is NOT a "svn diff".
!       (apply 'vc-do-command buffer
               1 "diff" file
               (append (vc-switches nil 'diff) '("/dev/null")))
        ;; Even if it's empty, it's locally modified.
***************
*** 365,371 ****
           (async (and (vc-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
--- 367,373 ----
           (async (and (vc-stay-local-p file)
                       (or oldvers newvers) ; Svn diffs those locally.
                       (fboundp 'start-process))))
!       (apply 'vc-svn-command buffer
             (if async 'async 0)
             file "diff"
             (append
***************
*** 377,383 ****
        (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.
!       (buffer-size (get-buffer "*vc-diff*"))))))
  
  (defun vc-svn-diff-tree (dir &optional rev1 rev2)
    "Diff all files at and below DIR."
--- 379,385 ----
        (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.
!       (buffer-size (get-buffer buffer))))))
  
  (defun vc-svn-diff-tree (dir &optional rev1 rev2)
    "Diff all files at and below DIR."