comparison lisp/vc-cvs.el @ 36711:22fd463447c3

(vc-cvs-checkin): When removing the sticky tag, make output go to buffer *vc*, not the current buffer. (vc-cvs-print-log): Output to buffer *vc*, not the current buffer. (vc-cvs-diff): Output to buffer *vc-diff*, not the current buffer.
author André Spiegel <spiegel@gnu.org>
date Sat, 10 Mar 2001 10:49:05 +0000
parents 7349d241e60b
children ae55f4048b3b
comparison
equal deleted inserted replaced
36710:66e9d0506b71 36711:22fd463447c3
3 ;; Copyright (C) 1995,98,99,2000,2001 Free Software Foundation, Inc. 3 ;; Copyright (C) 1995,98,99,2000,2001 Free Software Foundation, Inc.
4 4
5 ;; Author: FSF (see vc.el for full credits) 5 ;; Author: FSF (see vc.el for full credits)
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> 6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
7 7
8 ;; $Id: vc-cvs.el,v 1.19 2001/02/01 15:10:16 spiegel Exp $ 8 ;; $Id: vc-cvs.el,v 1.20 2001/02/02 07:21:21 spiegel Exp $
9 9
10 ;; This file is part of GNU Emacs. 10 ;; This file is part of GNU Emacs.
11 11
12 ;; GNU Emacs is free software; you can redistribute it and/or modify 12 ;; GNU Emacs is free software; you can redistribute it and/or modify
13 ;; it under the terms of the GNU General Public License as published by 13 ;; it under the terms of the GNU General Public License as published by
294 ;; guessed wrong when we found the file. After commit, we can 294 ;; guessed wrong when we found the file. After commit, we can
295 ;; tell it from the permissions of the file (see 295 ;; tell it from the permissions of the file (see
296 ;; vc-cvs-checkout-model). 296 ;; vc-cvs-checkout-model).
297 (vc-file-setprop file 'vc-checkout-model nil) 297 (vc-file-setprop file 'vc-checkout-model nil)
298 ;; if this was an explicit check-in, remove the sticky tag 298 ;; if this was an explicit check-in, remove the sticky tag
299 (if rev (vc-do-command t 0 "cvs" file "update" "-A")))) 299 (if rev (vc-do-command nil 0 "cvs" file "update" "-A"))))
300 300
301 (defun vc-cvs-checkout (file &optional editable rev workfile) 301 (defun vc-cvs-checkout (file &optional editable rev workfile)
302 "Retrieve a revision of FILE into a WORKFILE. 302 "Retrieve a revision of FILE into a WORKFILE.
303 EDITABLE non-nil means that the file should be writable. 303 EDITABLE non-nil means that the file should be writable.
304 REV is the revision to check out into WORKFILE." 304 REV is the revision to check out into WORKFILE."
459 ;;; History functions 459 ;;; History functions
460 ;;; 460 ;;;
461 461
462 (defun vc-cvs-print-log (file) 462 (defun vc-cvs-print-log (file)
463 "Get change log associated with FILE." 463 "Get change log associated with FILE."
464 (vc-do-command t (if (vc-cvs-stay-local-p file) 'async 0) 464 (vc-do-command nil (if (vc-cvs-stay-local-p file) 'async 0)
465 "cvs" file "log")) 465 "cvs" file "log"))
466 466
467 (defun vc-cvs-show-log-entry (version) 467 (defun vc-cvs-show-log-entry (version)
468 (when (re-search-forward 468 (when (re-search-forward
469 ;; also match some context, for safety 469 ;; also match some context, for safety
502 ;; This file is added but not yet committed; there is no master file. 502 ;; This file is added but not yet committed; there is no master file.
503 (if (or oldvers newvers) 503 (if (or oldvers newvers)
504 (error "No revisions of %s exist" file) 504 (error "No revisions of %s exist" file)
505 ;; we regard this as "changed". 505 ;; we regard this as "changed".
506 ;; diff it against /dev/null. 506 ;; diff it against /dev/null.
507 (apply 'vc-do-command t 507 (apply 'vc-do-command "*vc-diff*"
508 1 "diff" file 508 1 "diff" file
509 (append diff-switches-list '("/dev/null")))) 509 (append diff-switches-list '("/dev/null"))))
510 (setq status 510 (setq status
511 (apply 'vc-do-command t 511 (apply 'vc-do-command "*vc-diff*"
512 (if (vc-cvs-stay-local-p file) 'async 1) 512 (if (vc-cvs-stay-local-p file) 'async 1)
513 "cvs" file "diff" 513 "cvs" file "diff"
514 (and oldvers (concat "-r" oldvers)) 514 (and oldvers (concat "-r" oldvers))
515 (and newvers (concat "-r" newvers)) 515 (and newvers (concat "-r" newvers))
516 diff-switches-list)) 516 diff-switches-list))