comparison lisp/pcl-cvs/pcl-cvs.el @ 114:8619ce7e4c50 r20-1b9

Import from CVS: tag r20-1b9
author cvs
date Mon, 13 Aug 2007 09:21:54 +0200
parents c0c698873ce1
children 1856695b1fa9
comparison
equal deleted inserted replaced
113:2ec2fe4a4c89 114:8619ce7e4c50
1 ;;; 1 ;;;
2 ;;;#ident "@(#)OrigId: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp " 2 ;;;#ident "@(#)OrigId: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp "
3 ;;; 3 ;;;
4 ;;;#ident "@(#)cvs/contrib/pcl-cvs:$Name: r20-0b33 $:$Id: pcl-cvs.el,v 1.2 1996/12/28 21:03:03 steve Exp $" 4 ;;;#ident "@(#)cvs/contrib/pcl-cvs:$Name: r20-1b9 $:$Id: pcl-cvs.el,v 1.3 1997/03/22 06:02:36 steve Exp $"
5 ;;; 5 ;;;
6 ;;; pcl-cvs.el -- A Front-end to CVS 1.3 or later. 6 ;;; pcl-cvs.el -- A Front-end to CVS 1.3 or later.
7 ;;; Release 1.05-CVS-$Name: r20-0b33 $. 7 ;;; Release 1.05-CVS-$Name: r20-1b9 $.
8 ;;; Copyright (C) 1991, 1992, 1993 Per Cederqvist 8 ;;; Copyright (C) 1991, 1992, 1993 Per Cederqvist
9 9
10 ;;; This program is free software; you can redistribute it and/or modify 10 ;;; This program is free software; you can redistribute it and/or modify
11 ;;; it under the terms of the GNU General Public License as published by 11 ;;; it under the terms of the GNU General Public License as published by
12 ;;; the Free Software Foundation; either version 2 of the License, or 12 ;;; the Free Software Foundation; either version 2 of the License, or
124 ;; delete-exited-processes is t. 124 ;; delete-exited-processes is t.
125 125
126 ;;; END OF THINGS TO CHECK WHEN INSTALLING 126 ;;; END OF THINGS TO CHECK WHEN INSTALLING
127 ;;; -------------------------------------------------------- 127 ;;; --------------------------------------------------------
128 128
129 (defconst pcl-cvs-version "1.05-CVS-$Name: r20-0b33 $" 129 (defconst pcl-cvs-version "1.05-CVS-$Name: r20-1b9 $"
130 "A string denoting the current release version of pcl-cvs.") 130 "A string denoting the current release version of pcl-cvs.")
131 131
132 ;; You are NOT allowed to disable this message by default. However, you 132 ;; You are NOT allowed to disable this message by default. However, you
133 ;; are encouraged to inform your users that by adding 133 ;; are encouraged to inform your users that by adding
134 ;; (setq cvs-inhibit-copyright-message t) 134 ;; (setq cvs-inhibit-copyright-message t)
137 (defvar cvs-inhibit-copyright-message nil 137 (defvar cvs-inhibit-copyright-message nil
138 "*Non-nil means don't display a Copyright message in the ``*cvs*'' buffer.") 138 "*Non-nil means don't display a Copyright message in the ``*cvs*'' buffer.")
139 139
140 (defconst cvs-startup-message 140 (defconst cvs-startup-message
141 (if cvs-inhibit-copyright-message 141 (if cvs-inhibit-copyright-message
142 "PCL-CVS release 1.05-CVS-$Name: r20-0b33 $" 142 "PCL-CVS release 1.05-CVS-$Name: r20-1b9 $"
143 "PCL-CVS release 1.05 from CVS release $Name: r20-0b33 $. 143 "PCL-CVS release 1.05 from CVS release $Name: r20-1b9 $.
144 Copyright (C) 1992, 1993 Per Cederqvist 144 Copyright (C) 1992, 1993 Per Cederqvist
145 Pcl-cvs comes with absolutely no warranty; for details consult the manual. 145 Pcl-cvs comes with absolutely no warranty; for details consult the manual.
146 This is free software, and you are welcome to redistribute it under certain 146 This is free software, and you are welcome to redistribute it under certain
147 conditions; again, consult the TeXinfo manual for details.") 147 conditions; again, consult the TeXinfo manual for details.")
148 "*Startup message for CVS.") 148 "*Startup message for CVS.")
722 \\[cvs-mode-tag] Run ``cvs tag''. \\[cvs-mode-rtag] Run ``cvs rtag''. 722 \\[cvs-mode-tag] Run ``cvs tag''. \\[cvs-mode-rtag] Run ``cvs rtag''.
723 \\[cvs-mode-changelog-commit] Like \\[cvs-mode-commit], but get default log text from ChangeLog. 723 \\[cvs-mode-changelog-commit] Like \\[cvs-mode-commit], but get default log text from ChangeLog.
724 \\[cvs-mode-undo-local-changes] Revert the last checked in version - discard your changes to the file. 724 \\[cvs-mode-undo-local-changes] Revert the last checked in version - discard your changes to the file.
725 725
726 Entry to this mode runs cvs-mode-hook. 726 Entry to this mode runs cvs-mode-hook.
727 This description is updated for release 1.05-CVS-$Name: r20-0b33 $ of pcl-cvs. 727 This description is updated for release 1.05-CVS-$Name: r20-1b9 $ of pcl-cvs.
728 728
729 All bindings: 729 All bindings:
730 \\{cvs-mode-map}" 730 \\{cvs-mode-map}"
731 731
732 (interactive) 732 (interactive)
1011 (insert "Optional args: \"" indicator "\".\n")) 1011 (insert "Optional args: \"" indicator "\".\n"))
1012 (insert "\nEmacs-version: " (emacs-version) "\n") 1012 (insert "\nEmacs-version: " (emacs-version) "\n")
1013 (insert "Pcl-cvs Version: " 1013 (insert "Pcl-cvs Version: "
1014 "@(#)OrigId: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp\n") 1014 "@(#)OrigId: pcl-cvs.el,v 1.93 1993/05/31 22:44:00 ceder Exp\n")
1015 (insert "CVS Version: " 1015 (insert "CVS Version: "
1016 "@(#)lisp/pcl-cvs:$Name: r20-0b33 $:$Id: pcl-cvs.el,v 1.2 1996/12/28 21:03:03 steve Exp $\n\n") 1016 "@(#)lisp/pcl-cvs:$Name: r20-1b9 $:$Id: pcl-cvs.el,v 1.3 1997/03/22 06:02:36 steve Exp $\n\n")
1017 (insert (format "--- Contents of stdout buffer (%d chars) ---\n" 1017 (insert (format "--- Contents of stdout buffer (%d chars) ---\n"
1018 (length stdout))) 1018 (length stdout)))
1019 (insert stdout) 1019 (insert stdout)
1020 (insert "--- End of stdout buffer ---\n") 1020 (insert "--- End of stdout buffer ---\n")
1021 (insert (format "--- Contents of stderr buffer (%d chars) ---\n" 1021 (insert (format "--- Contents of stderr buffer (%d chars) ---\n"
1407 (cvs-set-fileinfo->head-revision fileinfo head-revision) 1407 (cvs-set-fileinfo->head-revision fileinfo head-revision)
1408 (cvs-set-fileinfo->backup-revision fileinfo backup-revision) 1408 (cvs-set-fileinfo->backup-revision fileinfo backup-revision)
1409 (cvs-set-fileinfo->backup-file fileinfo backup-file) 1409 (cvs-set-fileinfo->backup-file fileinfo backup-file)
1410 (setcdr head (list fileinfo)) 1410 (setcdr head (list fileinfo))
1411 (setq head (cdr head))))))) 1411 (setq head (cdr head)))))))
1412
1413 ;; Patch failure message with CVS client.
1414 ;; Ignore, since a failed patch implies that the file proper
1415 ;; subsequently will be fetched from the server.
1416 ((looking-at
1417 "^[0-9]+ out of [0-9]+ hunks failed--saving rejects to ")
1418 (forward-line 1))
1412 1419
1413 ;; Error messages from CVS (incomplete) 1420 ;; Error messages from CVS (incomplete)
1414 1421
1415 ((looking-at 1422 ((looking-at
1416 "^cvs \\(update\\|server\\): \\(invalid option .*\\)$") 1423 "^cvs \\(update\\|server\\): \\(invalid option .*\\)$")
1531 ;; Skip by any output the program may generate to stdout. 1538 ;; Skip by any output the program may generate to stdout.
1532 ;; Note that pcl-cvs will get seriously confused if the 1539 ;; Note that pcl-cvs will get seriously confused if the
1533 ;; program prints anything to stderr. 1540 ;; program prints anything to stderr.
1534 (re-search-forward cvs-update-prog-output-skip-regexp) 1541 (re-search-forward cvs-update-prog-output-skip-regexp)
1535 (forward-line 1)) 1542 (forward-line 1))
1543
1544 ;; Patch informational message with CVS client.
1545 ;; Ignore, since this simply tells us that the patch in question
1546 ;; already has been applied to the file.
1547 ((looking-at
1548 "^.* already contains the differences between .* and ")
1549 (forward-line 1))
1536 1550
1537 (t 1551 (t
1538 (cvs-parse-error stdout-buffer stderr-buffer 'STDOUT (point) 1552 (cvs-parse-error stdout-buffer stderr-buffer 'STDOUT (point)
1539 "cvs-parse-stdout")))))) 1553 "cvs-parse-stdout"))))))
1540 1554
3299 user-full-name)) 3313 user-full-name))
3300 " <" 3314 " <"
3301 (regexp-quote (if (and (boundp 'add-log-mailing-address) 3315 (regexp-quote (if (and (boundp 'add-log-mailing-address)
3302 add-log-mailing-address) 3316 add-log-mailing-address)
3303 add-log-mailing-address 3317 add-log-mailing-address
3304 user-mail-address))))) 3318 (user-mail-address))))))
3305 3319
3306 (defun cvs-relative-path (base child) 3320 (defun cvs-relative-path (base child)
3307 "Return a directory path relative to BASE for CHILD. 3321 "Return a directory path relative to BASE for CHILD.
3308 If CHILD doesn't seem to be in a subdirectory of BASE, just return 3322 If CHILD doesn't seem to be in a subdirectory of BASE, just return
3309 the full path to CHILD." 3323 the full path to CHILD."