Mercurial > emacs
annotate lisp/vc-rcs.el @ 45072:42c1cb1a6fdf
*** empty log message ***
author | Kim F. Storm <storm@cua.dk> |
---|---|
date | Wed, 01 May 2002 21:59:53 +0000 |
parents | 68d54bdba97c |
children | 7fa004ccd462 |
rev | line source |
---|---|
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1 ;;; vc-rcs.el --- support for RCS version-control |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
2 |
35830 | 3 ;; Copyright (C) 1992,93,94,95,96,97,98,99,2000,2001 Free Software Foundation, Inc. |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
4 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
5 ;; Author: FSF (see vc.el for full credits) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
6 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
7 |
44004
68d54bdba97c
(vc-rcs-register): Fix handling of vc-[rcs-]register-switches.
André Spiegel <spiegel@gnu.org>
parents:
43534
diff
changeset
|
8 ;; $Id: vc-rcs.el,v 1.23 2002/02/25 22:04:29 spiegel Exp $ |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
9 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
10 ;; This file is part of GNU Emacs. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
11 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
12 ;; GNU Emacs is free software; you can redistribute it and/or modify |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
13 ;; it under the terms of the GNU General Public License as published by |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
14 ;; the Free Software Foundation; either version 2, or (at your option) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
15 ;; any later version. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
16 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
17 ;; GNU Emacs is distributed in the hope that it will be useful, |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
20 ;; GNU General Public License for more details. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
21 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
22 ;; You should have received a copy of the GNU General Public License |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
23 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
24 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
25 ;; Boston, MA 02111-1307, USA. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
26 |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36712
diff
changeset
|
27 ;;; Commentary: |
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36712
diff
changeset
|
28 |
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36712
diff
changeset
|
29 ;; See vc.el |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
30 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
31 ;;; Code: |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
32 |
33560 | 33 ;;; |
34 ;;; Customization options | |
35 ;;; | |
36 | |
31840
a05558c54226
(toplevel): Require `vc' when compiling.
Gerd Moellmann <gerd@gnu.org>
parents:
31835
diff
changeset
|
37 (eval-when-compile |
35822
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
38 (require 'cl) |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
39 (require 'vc)) |
31840
a05558c54226
(toplevel): Require `vc' when compiling.
Gerd Moellmann <gerd@gnu.org>
parents:
31835
diff
changeset
|
40 |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
41 (defcustom vc-rcs-release nil |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
42 "*The release number of your RCS installation, as a string. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
43 If nil, VC itself computes this value when it is first needed." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
44 :type '(choice (const :tag "Auto" nil) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
45 (string :tag "Specified") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
46 (const :tag "Unknown" unknown)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
47 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
48 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
49 (defcustom vc-rcs-register-switches nil |
31476 | 50 "*Extra switches for registering a file in RCS. |
51 A string or list of strings. These are passed to the checkin program | |
52 by \\[vc-rcs-register]." | |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
53 :type '(choice (const :tag "None" nil) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
54 (string :tag "Argument String") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
55 (repeat :tag "Argument List" |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
56 :value ("") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
57 string)) |
31476 | 58 :version "21.1" |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
59 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
60 |
35822
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
61 (defcustom vc-rcs-diff-switches nil |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
62 "*A string or list of strings specifying extra switches for rcsdiff under VC." |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
63 :type '(choice (const :tag "None" nil) |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
64 (string :tag "Argument String") |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
65 (repeat :tag "Argument List" |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
66 :value ("") |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
67 string)) |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
68 :version "21.1" |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
69 :group 'vc) |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
70 |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
71 (defcustom vc-rcs-header (or (cdr (assoc 'RCS vc-header-alist)) '("\$Id\$")) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
72 "*Header keywords to be inserted by `vc-insert-headers'." |
35178 | 73 :type '(repeat string) |
31476 | 74 :version "21.1" |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
75 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
76 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
77 (defcustom vc-rcsdiff-knows-brief nil |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
78 "*Indicates whether rcsdiff understands the --brief option. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
79 The value is either `yes', `no', or nil. If it is nil, VC tries |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
80 to use --brief and sets this variable to remember whether it worked." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
81 :type '(choice (const :tag "Work out" nil) (const yes) (const no)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
82 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
83 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
84 ;;;###autoload |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
85 (defcustom vc-rcs-master-templates |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
86 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
87 "*Where to look for RCS master files. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
88 For a description of possible values, see `vc-check-master-templates'." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
89 :type '(choice (const :tag "Use standard RCS file names" |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
90 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
91 (repeat :tag "User-specified" |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
92 (choice string |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
93 function))) |
31476 | 94 :version "21.1" |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
95 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
96 |
33560 | 97 |
98 ;;; | |
99 ;;; State-querying functions | |
100 ;;; | |
101 | |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
102 ;;;###autoload |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
103 (progn (defun vc-rcs-registered (f) (vc-default-registered 'RCS f))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
104 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
105 (defun vc-rcs-state (file) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
106 "Implementation of `vc-state' for RCS." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
107 (or (boundp 'vc-rcs-headers-result) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
108 (and vc-consult-headers |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
109 (vc-rcs-consult-headers file))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
110 (let ((state |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
111 ;; vc-workfile-version might not be known; in that case the |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
112 ;; property is nil. vc-rcs-fetch-master-state knows how to |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
113 ;; handle that. |
31476 | 114 (vc-rcs-fetch-master-state file |
115 (vc-file-getprop file | |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
116 'vc-workfile-version)))) |
33636
2c1708b98891
(vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.
André Spiegel <spiegel@gnu.org>
parents:
33610
diff
changeset
|
117 (if (not (eq state 'up-to-date)) |
2c1708b98891
(vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.
André Spiegel <spiegel@gnu.org>
parents:
33610
diff
changeset
|
118 state |
2c1708b98891
(vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.
André Spiegel <spiegel@gnu.org>
parents:
33610
diff
changeset
|
119 (require 'vc) |
2c1708b98891
(vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.
André Spiegel <spiegel@gnu.org>
parents:
33610
diff
changeset
|
120 (if (vc-workfile-unchanged-p file) |
2c1708b98891
(vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.
André Spiegel <spiegel@gnu.org>
parents:
33610
diff
changeset
|
121 'up-to-date |
2c1708b98891
(vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.
André Spiegel <spiegel@gnu.org>
parents:
33610
diff
changeset
|
122 (if (eq (vc-checkout-model file) 'locking) |
2c1708b98891
(vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.
André Spiegel <spiegel@gnu.org>
parents:
33610
diff
changeset
|
123 'unlocked-changes |
2c1708b98891
(vc-rcs-state): Before calling vc-workfile-unchanged-p, require vc.
André Spiegel <spiegel@gnu.org>
parents:
33610
diff
changeset
|
124 'edited))))) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
125 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
126 (defun vc-rcs-state-heuristic (file) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
127 "State heuristic for RCS." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
128 (let (vc-rcs-headers-result) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
129 (if (and vc-consult-headers |
31476 | 130 (setq vc-rcs-headers-result |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
131 (vc-rcs-consult-headers file)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
132 (eq vc-rcs-headers-result 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
133 (let ((state (vc-file-getprop file 'vc-state))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
134 ;; If the headers say that the file is not locked, the |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
135 ;; permissions can tell us whether locking is used for |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
136 ;; the file or not. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
137 (if (and (eq state 'up-to-date) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
138 (not (vc-mistrust-permissions file))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
139 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
140 ((string-match ".rw..-..-." (nth 8 (file-attributes file))) |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
141 (vc-file-setprop file 'vc-checkout-model 'implicit) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
142 (setq state |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
143 (if (vc-rcs-workfile-is-newer file) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
144 'edited |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
145 'up-to-date))) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
146 ((string-match ".r-..-..-." (nth 8 (file-attributes file))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
147 (vc-file-setprop file 'vc-checkout-model 'locking)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
148 state) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
149 (if (not (vc-mistrust-permissions file)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
150 (let* ((attributes (file-attributes file)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
151 (owner-uid (nth 2 attributes)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
152 (permissions (nth 8 attributes))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
153 (cond ((string-match ".r-..-..-." permissions) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
154 (vc-file-setprop file 'vc-checkout-model 'locking) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
155 'up-to-date) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
156 ((string-match ".rw..-..-." permissions) |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
157 (if (eq (vc-checkout-model file) 'locking) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
158 (if (file-ownership-preserved-p file) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
159 'edited |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
160 (vc-user-login-name owner-uid)) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
161 (if (vc-rcs-workfile-is-newer file) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
162 'edited |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
163 'up-to-date))) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
164 (t |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
165 ;; Strange permissions. Fall through to |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
166 ;; expensive state computation. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
167 (vc-rcs-state file)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
168 (vc-rcs-state file))))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
169 |
33560 | 170 (defun vc-rcs-workfile-version (file) |
171 "RCS-specific version of `vc-workfile-version'." | |
172 (or (and vc-consult-headers | |
173 (vc-rcs-consult-headers file) | |
174 (vc-file-getprop file 'vc-workfile-version)) | |
175 (progn | |
176 (vc-rcs-fetch-master-state file) | |
177 (vc-file-getprop file 'vc-workfile-version)))) | |
178 | |
179 (defun vc-rcs-latest-on-branch-p (file &optional version) | |
180 "Return non-nil if workfile version of FILE is the latest on its branch. | |
181 When VERSION is given, perform check for that version." | |
182 (unless version (setq version (vc-workfile-version file))) | |
183 (with-temp-buffer | |
184 (string= version | |
42549
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
185 (if (vc-trunk-p version) |
33560 | 186 (progn |
187 ;; Compare VERSION to the head version number. | |
188 (vc-insert-file (vc-name file) "^[0-9]") | |
189 (vc-parse-buffer "^head[ \t\n]+\\([^;]+\\);" 1)) | |
190 ;; If we are not on the trunk, we need to examine the | |
191 ;; whole current branch. | |
192 (vc-insert-file (vc-name file) "^desc") | |
42549
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
193 (vc-rcs-find-most-recent-rev (vc-branch-part version)))))) |
33560 | 194 |
195 (defun vc-rcs-checkout-model (file) | |
196 "RCS-specific version of `vc-checkout-model'." | |
197 (vc-rcs-consult-headers file) | |
198 (or (vc-file-getprop file 'vc-checkout-model) | |
199 (progn (vc-rcs-fetch-master-state file) | |
200 (vc-file-getprop file 'vc-checkout-model)))) | |
201 | |
202 (defun vc-rcs-workfile-unchanged-p (file) | |
203 "RCS-specific implementation of vc-workfile-unchanged-p." | |
204 ;; Try to use rcsdiff --brief. If rcsdiff does not understand that, | |
205 ;; do a double take and remember the fact for the future | |
206 (let* ((version (concat "-r" (vc-workfile-version file))) | |
207 (status (if (eq vc-rcsdiff-knows-brief 'no) | |
208 (vc-do-command nil 1 "rcsdiff" file version) | |
209 (vc-do-command nil 2 "rcsdiff" file "--brief" version)))) | |
210 (if (eq status 2) | |
211 (if (not vc-rcsdiff-knows-brief) | |
212 (setq vc-rcsdiff-knows-brief 'no | |
213 status (vc-do-command nil 1 "rcsdiff" file version)) | |
214 (error "rcsdiff failed")) | |
215 (if (not vc-rcsdiff-knows-brief) (setq vc-rcsdiff-knows-brief 'yes))) | |
216 ;; The workfile is unchanged if rcsdiff found no differences. | |
217 (zerop status))) | |
218 | |
219 | |
220 ;;; | |
221 ;;; State-changing functions | |
222 ;;; | |
223 | |
224 (defun vc-rcs-register (file &optional rev comment) | |
225 "Register FILE into the RCS version-control system. | |
226 REV is the optional revision number for the file. COMMENT can be used | |
227 to provide an initial description of FILE. | |
228 | |
229 `vc-register-switches' and `vc-rcs-register-switches' are passed to | |
230 the RCS command (in that order). | |
231 | |
232 Automatically retrieve a read-only version of the file with keywords | |
233 expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." | |
234 (let ((subdir (expand-file-name "RCS" (file-name-directory file))) | |
44004
68d54bdba97c
(vc-rcs-register): Fix handling of vc-[rcs-]register-switches.
André Spiegel <spiegel@gnu.org>
parents:
43534
diff
changeset
|
235 (switches (append |
33560 | 236 (if (stringp vc-register-switches) |
237 (list vc-register-switches) | |
238 vc-register-switches) | |
239 (if (stringp vc-rcs-register-switches) | |
240 (list vc-rcs-register-switches) | |
241 vc-rcs-register-switches)))) | |
242 | |
243 (and (not (file-exists-p subdir)) | |
244 (not (directory-files (file-name-directory file) | |
245 nil ".*,v$" t)) | |
246 (yes-or-no-p "Create RCS subdirectory? ") | |
247 (make-directory subdir)) | |
248 (apply 'vc-do-command nil 0 "ci" file | |
249 ;; if available, use the secure registering option | |
250 (and (vc-rcs-release-p "5.6.4") "-i") | |
251 (concat (if vc-keep-workfiles "-u" "-r") rev) | |
252 (and comment (concat "-t-" comment)) | |
253 switches) | |
254 ;; parse output to find master file name and workfile version | |
255 (with-current-buffer "*vc*" | |
256 (goto-char (point-min)) | |
257 (let ((name (if (looking-at (concat "^\\(.*\\) <-- " | |
258 (file-name-nondirectory file))) | |
259 (match-string 1)))) | |
260 (if (not name) | |
261 ;; if we couldn't find the master name, | |
262 ;; run vc-rcs-registered to get it | |
263 ;; (will be stored into the vc-name property) | |
264 (vc-rcs-registered file) | |
265 (vc-file-setprop file 'vc-name | |
266 (if (file-name-absolute-p name) | |
267 name | |
268 (expand-file-name | |
269 name | |
270 (file-name-directory file)))))) | |
271 (vc-file-setprop file 'vc-workfile-version | |
272 (if (re-search-forward | |
273 "^initial revision: \\([0-9.]+\\).*\n" | |
274 nil t) | |
275 (match-string 1)))))) | |
276 | |
277 (defun vc-rcs-responsible-p (file) | |
278 "Return non-nil if RCS thinks it would be responsible for registering FILE." | |
279 ;; TODO: check for all the patterns in vc-rcs-master-templates | |
280 (file-directory-p (expand-file-name "RCS" (file-name-directory file)))) | |
281 | |
282 (defun vc-rcs-receive-file (file rev) | |
283 "Implementation of receive-file for RCS." | |
284 (let ((checkout-model (vc-checkout-model file))) | |
285 (vc-rcs-register file rev "") | |
286 (when (eq checkout-model 'implicit) | |
287 (vc-rcs-set-non-strict-locking file)) | |
288 (vc-rcs-set-default-branch file (concat rev ".1")))) | |
289 | |
290 (defun vc-rcs-unregister (file) | |
291 "Unregister FILE from RCS. | |
292 If this leaves the RCS subdirectory empty, ask the user | |
293 whether to remove it." | |
294 (let* ((master (vc-name file)) | |
295 (dir (file-name-directory master)) | |
296 (backup-info (find-backup-file-name master))) | |
297 (if (not backup-info) | |
298 (delete-file master) | |
299 (rename-file master (car backup-info) 'ok-if-already-exists) | |
300 (dolist (f (cdr backup-info)) (ignore-errors (delete-file f)))) | |
301 (and (string= (file-name-nondirectory (directory-file-name dir)) "RCS") | |
302 ;; check whether RCS dir is empty, i.e. it does not | |
303 ;; contain any files except "." and ".." | |
304 (not (directory-files dir nil | |
305 "^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*")) | |
306 (yes-or-no-p (format "Directory %s is empty; remove it? " dir)) | |
307 (delete-directory dir)))) | |
308 | |
309 (defun vc-rcs-checkin (file rev comment) | |
310 "RCS-specific version of `vc-backend-checkin'." | |
311 (let ((switches (if (stringp vc-checkin-switches) | |
312 (list vc-checkin-switches) | |
313 vc-checkin-switches))) | |
314 (let ((old-version (vc-workfile-version file)) new-version | |
315 (default-branch (vc-file-getprop file 'vc-rcs-default-branch))) | |
316 ;; Force branch creation if an appropriate | |
317 ;; default branch has been set. | |
318 (and (not rev) | |
319 default-branch | |
320 (string-match (concat "^" (regexp-quote old-version) "\\.") | |
321 default-branch) | |
322 (setq rev default-branch) | |
323 (setq switches (cons "-f" switches))) | |
324 (apply 'vc-do-command nil 0 "ci" (vc-name file) | |
325 ;; if available, use the secure check-in option | |
326 (and (vc-rcs-release-p "5.6.4") "-j") | |
327 (concat (if vc-keep-workfiles "-u" "-r") rev) | |
328 (concat "-m" comment) | |
329 switches) | |
330 (vc-file-setprop file 'vc-workfile-version nil) | |
331 | |
332 ;; determine the new workfile version | |
333 (set-buffer "*vc*") | |
334 (goto-char (point-min)) | |
335 (when (or (re-search-forward | |
336 "new revision: \\([0-9.]+\\);" nil t) | |
337 (re-search-forward | |
338 "reverting to previous revision \\([0-9.]+\\)" nil t)) | |
339 (setq new-version (match-string 1)) | |
340 (vc-file-setprop file 'vc-workfile-version new-version)) | |
341 | |
342 ;; if we got to a different branch, adjust the default | |
343 ;; branch accordingly | |
344 (cond | |
345 ((and old-version new-version | |
42549
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
346 (not (string= (vc-branch-part old-version) |
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
347 (vc-branch-part new-version)))) |
33560 | 348 (vc-rcs-set-default-branch file |
42549
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
349 (if (vc-trunk-p new-version) nil |
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
350 (vc-branch-part new-version))) |
33560 | 351 ;; If this is an old RCS release, we might have |
352 ;; to remove a remaining lock. | |
353 (if (not (vc-rcs-release-p "5.6.2")) | |
354 ;; exit status of 1 is also accepted. | |
355 ;; It means that the lock was removed before. | |
356 (vc-do-command nil 1 "rcs" (vc-name file) | |
357 (concat "-u" old-version)))))))) | |
358 | |
35133
1b45907ef7a8
(vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE.
André Spiegel <spiegel@gnu.org>
parents:
33636
diff
changeset
|
359 (defun vc-rcs-checkout (file &optional editable rev workfile) |
33560 | 360 "Retrieve a copy of a saved version of FILE into a workfile." |
361 (let ((filename (or workfile file)) | |
362 (file-buffer (get-file-buffer file)) | |
363 switches) | |
364 (message "Checking out %s..." filename) | |
365 (save-excursion | |
366 ;; Change buffers to get local value of vc-checkout-switches. | |
367 (if file-buffer (set-buffer file-buffer)) | |
368 (setq switches (if (stringp vc-checkout-switches) | |
369 (list vc-checkout-switches) | |
370 vc-checkout-switches)) | |
371 ;; Save this buffer's default-directory | |
372 ;; and use save-excursion to make sure it is restored | |
373 ;; in the same buffer it was saved in. | |
374 (let ((default-directory default-directory)) | |
375 (save-excursion | |
376 ;; Adjust the default-directory so that the check-out creates | |
377 ;; the file in the right place. | |
378 (setq default-directory (file-name-directory filename)) | |
379 (if workfile ;; RCS | |
380 ;; RCS can't check out into arbitrary file names directly. | |
381 ;; Use `co -p' and make stdout point to the correct file. | |
382 (let ((vc-modes (logior (file-modes (vc-name file)) | |
35133
1b45907ef7a8
(vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE.
André Spiegel <spiegel@gnu.org>
parents:
33636
diff
changeset
|
383 (if editable 128 0))) |
33560 | 384 (failed t)) |
385 (unwind-protect | |
386 (progn | |
387 (let ((coding-system-for-read 'no-conversion) | |
388 (coding-system-for-write 'no-conversion)) | |
389 (with-temp-file filename | |
390 (apply 'vc-do-command | |
391 (current-buffer) 0 "co" (vc-name file) | |
392 "-q" ;; suppress diagnostic output | |
35133
1b45907ef7a8
(vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE.
André Spiegel <spiegel@gnu.org>
parents:
33636
diff
changeset
|
393 (if editable "-l") |
33560 | 394 (concat "-p" rev) |
395 switches))) | |
396 (set-file-modes filename | |
397 (logior (file-modes (vc-name file)) | |
35133
1b45907ef7a8
(vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE.
André Spiegel <spiegel@gnu.org>
parents:
33636
diff
changeset
|
398 (if editable 128 0))) |
33560 | 399 (setq failed nil)) |
400 (and failed (file-exists-p filename) | |
401 (delete-file filename)))) | |
402 (let (new-version) | |
403 ;; if we should go to the head of the trunk, | |
404 ;; clear the default branch first | |
405 (and rev (string= rev "") | |
406 (vc-rcs-set-default-branch file nil)) | |
407 ;; now do the checkout | |
408 (apply 'vc-do-command | |
409 nil 0 "co" (vc-name file) | |
410 ;; If locking is not strict, force to overwrite | |
411 ;; the writable workfile. | |
412 (if (eq (vc-checkout-model file) 'implicit) "-f") | |
35133
1b45907ef7a8
(vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE.
André Spiegel <spiegel@gnu.org>
parents:
33636
diff
changeset
|
413 (if editable "-l") |
33560 | 414 (if rev (concat "-r" rev) |
415 ;; if no explicit revision was specified, | |
416 ;; check out that of the working file | |
417 (let ((workrev (vc-workfile-version file))) | |
418 (if workrev (concat "-r" workrev) | |
419 nil))) | |
420 switches) | |
421 ;; determine the new workfile version | |
422 (with-current-buffer "*vc*" | |
423 (setq new-version | |
424 (vc-parse-buffer "^revision \\([0-9.]+\\).*\n" 1))) | |
425 (vc-file-setprop file 'vc-workfile-version new-version) | |
426 ;; if necessary, adjust the default branch | |
427 (and rev (not (string= rev "")) | |
428 (vc-rcs-set-default-branch | |
429 file | |
430 (if (vc-rcs-latest-on-branch-p file new-version) | |
42549
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
431 (if (vc-trunk-p new-version) nil |
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
432 (vc-branch-part new-version)) |
33560 | 433 new-version)))))) |
434 (message "Checking out %s...done" filename))))) | |
435 | |
39001
d13c2139752b
(vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents:
38436
diff
changeset
|
436 (defun vc-rcs-revert (file &optional contents-done) |
33560 | 437 "Revert FILE to the version it was based on." |
438 (vc-do-command nil 0 "co" (vc-name file) "-f" | |
439 (concat "-u" (vc-workfile-version file)))) | |
440 | |
35133
1b45907ef7a8
(vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE.
André Spiegel <spiegel@gnu.org>
parents:
33636
diff
changeset
|
441 (defun vc-rcs-cancel-version (file editable) |
33560 | 442 "Undo the most recent checkin of FILE. |
35133
1b45907ef7a8
(vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE.
André Spiegel <spiegel@gnu.org>
parents:
33636
diff
changeset
|
443 EDITABLE non-nil means previous version should be locked." |
33560 | 444 (let* ((target (vc-workfile-version file)) |
445 (previous (if (vc-trunk-p target) "" (vc-branch-part target))) | |
446 (config (current-window-configuration)) | |
447 (done nil)) | |
448 (vc-do-command nil 0 "rcs" (vc-name file) (concat "-o" target)) | |
449 ;; Check out the most recent remaining version. If it fails, because | |
450 ;; the whole branch got deleted, do a double-take and check out the | |
451 ;; version where the branch started. | |
452 (while (not done) | |
453 (condition-case err | |
454 (progn | |
455 (vc-do-command nil 0 "co" (vc-name file) "-f" | |
35133
1b45907ef7a8
(vc-rcs-checkout, vc-rcs-cancel-version): Renamed arg WRITABLE to EDITABLE.
André Spiegel <spiegel@gnu.org>
parents:
33636
diff
changeset
|
456 (concat (if editable "-l" "-u") previous)) |
33560 | 457 (setq done t)) |
458 (error (set-buffer "*vc*") | |
459 (goto-char (point-min)) | |
460 (if (search-forward "no side branches present for" nil t) | |
461 (progn (setq previous (vc-branch-part previous)) | |
462 (vc-rcs-set-default-branch file previous) | |
463 ;; vc-do-command popped up a window with | |
464 ;; the error message. Get rid of it, by | |
465 ;; restoring the old window configuration. | |
466 (set-window-configuration config)) | |
467 ;; No, it was some other error: re-signal it. | |
468 (signal (car err) (cdr err)))))))) | |
469 | |
470 (defun vc-rcs-merge (file first-version &optional second-version) | |
471 "Merge changes into current working copy of FILE. | |
472 The changes are between FIRST-VERSION and SECOND-VERSION." | |
473 (vc-do-command nil 1 "rcsmerge" (vc-name file) | |
474 "-kk" ; ignore keyword conflicts | |
475 (concat "-r" first-version) | |
476 (if second-version (concat "-r" second-version)))) | |
477 | |
478 (defun vc-rcs-steal-lock (file &optional rev) | |
479 "Steal the lock on the current workfile for FILE and revision REV. | |
480 Needs RCS 5.6.2 or later for -M." | |
42549
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
481 (vc-do-command nil 0 "rcs" (vc-name file) "-M" (concat "-u" rev)) |
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
482 ;; Do a real checkout after stealing the lock, so that we see |
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
483 ;; expanded headers. |
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
484 (vc-do-command nil 0 "co" (vc-name file) "-f" (concat "-l" rev))) |
33560 | 485 |
486 | |
487 | |
488 ;;; | |
489 ;;; History functions | |
490 ;;; | |
491 | |
492 (defun vc-rcs-print-log (file) | |
493 "Get change log associated with FILE." | |
36712
551ff6f7ef12
(vc-rcs-print-log): Output to buffer *vc*, not the current buffer.
André Spiegel <spiegel@gnu.org>
parents:
35830
diff
changeset
|
494 (vc-do-command nil 0 "rlog" (vc-name file))) |
33560 | 495 |
496 (defun vc-rcs-show-log-entry (version) | |
497 (when (re-search-forward | |
498 ;; also match some context, for safety | |
499 (concat "----\nrevision " version | |
500 "\\(\tlocked by:.*\n\\|\n\\)date: ") nil t) | |
501 ;; set the display window so that | |
502 ;; the whole log entry is displayed | |
503 (let (start end lines) | |
504 (beginning-of-line) (forward-line -1) (setq start (point)) | |
505 (if (not (re-search-forward "^----*\nrevision" nil t)) | |
506 (setq end (point-max)) | |
507 (beginning-of-line) (forward-line -1) (setq end (point))) | |
508 (setq lines (count-lines start end)) | |
509 (cond | |
510 ;; if the global information and this log entry fit | |
511 ;; into the window, display from the beginning | |
512 ((< (count-lines (point-min) end) (window-height)) | |
513 (goto-char (point-min)) | |
514 (recenter 0) | |
515 (goto-char start)) | |
516 ;; if the whole entry fits into the window, | |
517 ;; display it centered | |
518 ((< (1+ lines) (window-height)) | |
519 (goto-char start) | |
520 (recenter (1- (- (/ (window-height) 2) (/ lines 2))))) | |
521 ;; otherwise (the entry is too large for the window), | |
522 ;; display from the start | |
523 (t | |
524 (goto-char start) | |
525 (recenter 0)))))) | |
526 | |
527 (defun vc-rcs-diff (file &optional oldvers newvers) | |
528 "Get a difference report using RCS between two versions of FILE." | |
529 (if (not oldvers) (setq oldvers (vc-workfile-version file))) | |
36712
551ff6f7ef12
(vc-rcs-print-log): Output to buffer *vc*, not the current buffer.
André Spiegel <spiegel@gnu.org>
parents:
35830
diff
changeset
|
530 (apply 'vc-do-command "*vc-diff*" 1 "rcsdiff" file |
35822
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
531 (append (list "-q" |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
532 (concat "-r" oldvers) |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
533 (and newvers (concat "-r" newvers))) |
43534
5a78c5fa41a1
(vc-rcs-diff): Use consistent parameter format for
André Spiegel <spiegel@gnu.org>
parents:
42549
diff
changeset
|
534 (vc-diff-switches-list 'RCS)))) |
33560 | 535 |
536 | |
537 ;;; | |
538 ;;; Snapshot system | |
539 ;;; | |
540 | |
541 (defun vc-rcs-assign-name (file name) | |
542 "Assign to FILE's latest version a given NAME." | |
543 (vc-do-command nil 0 "rcs" (vc-name file) (concat "-n" name ":"))) | |
544 | |
545 | |
546 ;;; | |
547 ;;; Miscellaneous | |
548 ;;; | |
549 | |
550 (defun vc-rcs-check-headers () | |
551 "Check if the current file has any headers in it." | |
552 (save-excursion | |
553 (goto-char (point-min)) | |
554 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\ | |
555 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t))) | |
556 | |
557 (defun vc-rcs-clear-headers () | |
558 "Implementation of vc-clear-headers for RCS." | |
559 (let ((case-fold-search nil)) | |
560 (goto-char (point-min)) | |
561 (while (re-search-forward | |
562 (concat "\\$\\(Author\\|Date\\|Header\\|Id\\|Locker\\|Name\\|" | |
563 "RCSfile\\|Revision\\|Source\\|State\\): [^$\n]+\\$") | |
564 nil t) | |
565 (replace-match "$\\1$")))) | |
566 | |
567 (defun vc-rcs-rename-file (old new) | |
568 ;; Just move the master file (using vc-rcs-master-templates). | |
569 (vc-rename-master (vc-name old) new vc-rcs-master-templates)) | |
570 | |
571 | |
572 ;;; | |
573 ;;; Internal functions | |
574 ;;; | |
575 | |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
576 (defun vc-rcs-workfile-is-newer (file) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
577 "Return non-nil if FILE is newer than its RCS master. |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
578 This likely means that FILE has been changed with respect |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
579 to its master version." |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
580 (let ((file-time (nth 5 (file-attributes file))) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
581 (master-time (nth 5 (file-attributes (vc-name file))))) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
582 (or (> (nth 0 file-time) (nth 0 master-time)) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
583 (and (= (nth 0 file-time) (nth 0 master-time)) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
584 (> (nth 1 file-time) (nth 1 master-time)))))) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
585 |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
586 (defun vc-rcs-find-most-recent-rev (branch) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
587 "Find most recent revision on BRANCH." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
588 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
589 (let ((latest-rev -1) value) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
590 (while (re-search-forward (concat "^\\(" (regexp-quote branch) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
591 "\\.\\([0-9]+\\)\\)\ndate[ \t]+[0-9.]+;") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
592 nil t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
593 (let ((rev (string-to-number (match-string 2)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
594 (when (< latest-rev rev) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
595 (setq latest-rev rev) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
596 (setq value (match-string 1))))) |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
597 (or value |
42549
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
598 (vc-branch-part branch)))) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
599 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
600 (defun vc-rcs-fetch-master-state (file &optional workfile-version) |
31476 | 601 "Compute the master file's idea of the state of FILE. |
602 If a WORKFILE-VERSION is given, compute the state of that version, | |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
603 otherwise determine the workfile version based on the master file. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
604 This function sets the properties `vc-workfile-version' and |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
605 `vc-checkout-model' to their correct values, based on the master |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
606 file." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
607 (with-temp-buffer |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
608 (vc-insert-file (vc-name file) "^[0-9]") |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
609 (let ((workfile-is-latest nil) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
610 (default-branch (vc-parse-buffer "^branch[ \t\n]+\\([^;]*\\);" 1))) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
611 (vc-file-setprop file 'vc-rcs-default-branch default-branch) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
612 (unless workfile-version |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
613 ;; Workfile version not known yet. Determine that first. It |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
614 ;; is either the head of the trunk, the head of the default |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
615 ;; branch, or the "default branch" itself, if that is a full |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
616 ;; revision number. |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
617 (cond |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
618 ;; no default branch |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
619 ((or (not default-branch) (string= "" default-branch)) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
620 (setq workfile-version |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
621 (vc-parse-buffer "^head[ \t\n]+\\([^;]+\\);" 1)) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
622 (setq workfile-is-latest t)) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
623 ;; default branch is actually a revision |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
624 ((string-match "^[0-9]+\\.[0-9]+\\(\\.[0-9]+\\.[0-9]+\\)*$" |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
625 default-branch) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
626 (setq workfile-version default-branch)) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
627 ;; else, search for the head of the default branch |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
628 (t (vc-insert-file (vc-name file) "^desc") |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
629 (setq workfile-version |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
630 (vc-rcs-find-most-recent-rev default-branch)) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
631 (setq workfile-is-latest t))) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
632 (vc-file-setprop file 'vc-workfile-version workfile-version)) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
633 ;; Check strict locking |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
634 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
635 (vc-file-setprop file 'vc-checkout-model |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
636 (if (re-search-forward ";[ \t\n]*strict;" nil t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
637 'locking 'implicit)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
638 ;; Compute state of workfile version |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
639 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
640 (let ((locking-user |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
641 (vc-parse-buffer (concat "^locks[ \t\n]+[^;]*[ \t\n]+\\([^:]+\\):" |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
642 (regexp-quote workfile-version) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
643 "[^0-9.]") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
644 1))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
645 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
646 ;; not locked |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
647 ((not locking-user) |
31476 | 648 (if (or workfile-is-latest |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
649 (vc-rcs-latest-on-branch-p file workfile-version)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
650 ;; workfile version is latest on branch |
33610
32bcc6e27e02
(vc-rcs-state): Call vc-workfile-unchanged-p only here, and
André Spiegel <spiegel@gnu.org>
parents:
33560
diff
changeset
|
651 'up-to-date |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
652 ;; workfile version is not latest on branch |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
653 'needs-patch)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
654 ;; locked by the calling user |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
655 ((and (stringp locking-user) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
656 (string= locking-user (vc-user-login-name))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
657 (if (or (eq (vc-checkout-model file) 'locking) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
658 workfile-is-latest |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
659 (vc-rcs-latest-on-branch-p file workfile-version)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
660 'edited |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
661 ;; Locking is not used for the file, but the owner does |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
662 ;; have a lock, and there is a higher version on the current |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
663 ;; branch. Not sure if this can occur, and if it is right |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
664 ;; to use `needs-merge' in this case. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
665 'needs-merge)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
666 ;; locked by somebody else |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
667 ((stringp locking-user) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
668 locking-user) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
669 (t |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
670 (error "Error getting state of RCS file"))))))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
671 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
672 (defun vc-rcs-consult-headers (file) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
673 "Search for RCS headers in FILE, and set properties accordingly. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
674 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
675 Returns: nil if no headers were found |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
676 'rev if a workfile revision was found |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
677 'rev-and-lock if revision and lock info was found" |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
678 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
679 ((not (get-file-buffer file)) nil) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
680 ((let (status version locking-user) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
681 (save-excursion |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
682 (set-buffer (get-file-buffer file)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
683 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
684 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
685 ;; search for $Id or $Header |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
686 ;; ------------------------- |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
687 ;; The `\ 's below avoid an RCS 5.7 bug when checking in this file. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
688 ((or (and (search-forward "$Id\ : " nil t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
689 (looking-at "[^ ]+ \\([0-9.]+\\) ")) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
690 (and (progn (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
691 (search-forward "$Header\ : " nil t)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
692 (looking-at "[^ ]+ \\([0-9.]+\\) "))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
693 (goto-char (match-end 0)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
694 ;; if found, store the revision number ... |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
695 (setq version (match-string-no-properties 1)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
696 ;; ... and check for the locking state |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
697 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
698 ((looking-at |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
699 (concat "[0-9]+[/-][01][0-9][/-][0-3][0-9] " ; date |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
700 "[0-2][0-9]:[0-5][0-9]+:[0-6][0-9]+\\([+-][0-9:]+\\)? " ; time |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
701 "[^ ]+ [^ ]+ ")) ; author & state |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
702 (goto-char (match-end 0)) ; [0-6] in regexp handles leap seconds |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
703 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
704 ;; unlocked revision |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
705 ((looking-at "\\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
706 (setq locking-user 'none) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
707 (setq status 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
708 ;; revision is locked by some user |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
709 ((looking-at "\\([^ ]+\\) \\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
710 (setq locking-user (match-string-no-properties 1)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
711 (setq status 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
712 ;; everything else: false |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
713 (nil))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
714 ;; unexpected information in |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
715 ;; keyword string --> quit |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
716 (nil))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
717 ;; search for $Revision |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
718 ;; -------------------- |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
719 ((re-search-forward (concat "\\$" |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
720 "Revision: \\([0-9.]+\\) \\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
721 nil t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
722 ;; if found, store the revision number ... |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
723 (setq version (match-string-no-properties 1)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
724 ;; and see if there's any lock information |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
725 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
726 (if (re-search-forward (concat "\\$" "Locker:") nil t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
727 (cond ((looking-at " \\([^ ]+\\) \\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
728 (setq locking-user (match-string-no-properties 1)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
729 (setq status 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
730 ((looking-at " *\\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
731 (setq locking-user 'none) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
732 (setq status 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
733 (t |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
734 (setq locking-user 'none) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
735 (setq status 'rev-and-lock))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
736 (setq status 'rev))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
737 ;; else: nothing found |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
738 ;; ------------------- |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
739 (t nil))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
740 (if status (vc-file-setprop file 'vc-workfile-version version)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
741 (and (eq status 'rev-and-lock) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
742 (vc-file-setprop file 'vc-state |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
743 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
744 ((eq locking-user 'none) 'up-to-date) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
745 ((string= locking-user (vc-user-login-name)) 'edited) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
746 (t locking-user))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
747 ;; If the file has headers, we don't want to query the |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
748 ;; master file, because that would eliminate all the |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
749 ;; performance gain the headers brought us. We therefore |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
750 ;; use a heuristic now to find out whether locking is used |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
751 ;; for this file. If we trust the file permissions, and the |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
752 ;; file is not locked, then if the file is read-only we |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
753 ;; assume that locking is used for the file, otherwise |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
754 ;; locking is not used. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
755 (not (vc-mistrust-permissions file)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
756 (vc-up-to-date-p file) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
757 (if (string-match ".r-..-..-." (nth 8 (file-attributes file))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
758 (vc-file-setprop file 'vc-checkout-model 'locking) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
759 (vc-file-setprop file 'vc-checkout-model 'implicit))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
760 status)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
761 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
762 (defun vc-release-greater-or-equal (r1 r2) |
31476 | 763 "Compare release numbers, represented as strings. |
764 Release components are assumed cardinal numbers, not decimal fractions | |
765 \(5.10 is a higher release than 5.9\). Omitted fields are considered | |
766 lower \(5.6.7 is earlier than 5.6.7.1\). Comparison runs till the end | |
767 of the string is found, or a non-numeric component shows up \(5.6.7 is | |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
768 earlier than \"5.6.7 beta\", which is probably not what you want in |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
769 some cases\). This code is suitable for existing RCS release numbers. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
770 CVS releases are handled reasonably, too \(1.3 < 1.4* < 1.5\)." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
771 (let (v1 v2 i1 i2) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
772 (catch 'done |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
773 (or (and (string-match "^\\.?\\([0-9]+\\)" r1) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
774 (setq i1 (match-end 0)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
775 (setq v1 (string-to-number (match-string 1 r1))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
776 (or (and (string-match "^\\.?\\([0-9]+\\)" r2) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
777 (setq i2 (match-end 0)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
778 (setq v2 (string-to-number (match-string 1 r2))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
779 (if (> v1 v2) (throw 'done t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
780 (if (< v1 v2) (throw 'done nil) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
781 (throw 'done |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
782 (vc-release-greater-or-equal |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
783 (substring r1 i1) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
784 (substring r2 i2))))))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
785 (throw 'done t))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
786 (or (and (string-match "^\\.?\\([0-9]+\\)" r2) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
787 (throw 'done nil)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
788 (throw 'done t))))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
789 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
790 (defun vc-rcs-release-p (release) |
31476 | 791 "Return t if we have RELEASE or better." |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
792 (let ((installation (vc-rcs-system-release))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
793 (if (and installation |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
794 (not (eq installation 'unknown))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
795 (vc-release-greater-or-equal installation release)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
796 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
797 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
798 (defun vc-rcs-system-release () |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
799 "Return the RCS release installed on this system, as a string. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
800 Return symbol UNKNOWN if the release cannot be deducted. The user can |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
801 override this using variable `vc-rcs-release'. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
802 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
803 If the user has not set variable `vc-rcs-release' and it is nil, |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
804 variable `vc-rcs-release' is set to the returned value." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
805 (or vc-rcs-release |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
806 (setq vc-rcs-release |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
807 (or (and (zerop (vc-do-command nil nil "rcs" nil "-V")) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
808 (with-current-buffer (get-buffer "*vc*") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
809 (vc-parse-buffer "^RCS version \\([0-9.]+ *.*\\)" 1))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
810 'unknown)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
811 |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
812 (defun vc-rcs-set-non-strict-locking (file) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
813 (vc-do-command nil 0 "rcs" file "-U") |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
814 (vc-file-setprop file 'vc-checkout-model 'implicit) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
815 (set-file-modes file (logior (file-modes file) 128))) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
816 |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
817 (defun vc-rcs-set-default-branch (file branch) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
818 (vc-do-command nil 0 "rcs" (vc-name file) (concat "-b" branch)) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
819 (vc-file-setprop file 'vc-rcs-default-branch branch)) |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
820 |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
821 (provide 'vc-rcs) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
822 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
823 ;;; vc-rcs.el ends here |