Mercurial > emacs
changeset 33554:8cc4c4ff3f88
(vc-cvs-print-log, vc-cvs-diff): Use asynchronous mode only for remote
repositories.
| author | André Spiegel <spiegel@gnu.org> |
|---|---|
| date | Thu, 16 Nov 2000 16:42:10 +0000 |
| parents | 840460ecad6f |
| children | a77843a1f4e4 |
| files | lisp/vc-cvs.el |
| diffstat | 1 files changed, 16 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/vc-cvs.el Thu Nov 16 16:40:59 2000 +0000 +++ b/lisp/vc-cvs.el Thu Nov 16 16:42:10 2000 +0000 @@ -5,7 +5,7 @@ ;; Author: FSF (see vc.el for full credits) ;; Maintainer: Andre Spiegel <spiegel@gnu.org> -;; $Id: vc-cvs.el,v 1.9 2000/11/16 13:38:03 spiegel Exp $ +;; $Id: vc-cvs.el,v 1.10 2000/11/16 15:29:40 spiegel Exp $ ;; This file is part of GNU Emacs. @@ -314,7 +314,8 @@ (defun vc-cvs-print-log (file) "Get change log associated with FILE." - (vc-do-command t 'async "cvs" file "log")) + (vc-do-command t (if (vc-cvs-stay-local-p file) 'async 0) + "cvs" file "log")) (defun vc-cvs-show-log-entry (version) (when (re-search-forward @@ -488,16 +489,19 @@ (error "No revisions of %s exist" file) ;; we regard this as "changed". ;; diff it against /dev/null. - (apply 'vc-do-command t - 'async "diff" file - (append diff-switches-list '("/dev/null")))) - (apply 'vc-do-command t - 'async "cvs" file "diff" - (and oldvers (concat "-r" oldvers)) - (and newvers (concat "-r" newvers)) - diff-switches-list)) - ;; We can't know yet, so we assume there'll be a difference - 1)) + (apply 'vc-do-command t + 1 "diff" file + (append diff-switches-list '("/dev/null")))) + (setq status + (apply 'vc-do-command t + (if (vc-cvs-stay-local-p file) 'async 1) + "cvs" file "diff" + (and oldvers (concat "-r" oldvers)) + (and newvers (concat "-r" newvers)) + diff-switches-list)) + (if (vc-cvs-stay-local-p file) + 1 ;; async diff, pessimistic assumption + status)))) (defun vc-cvs-latest-on-branch-p (file) "Return t iff current workfile version of FILE is the latest on its branch."