Mercurial > emacs
annotate lisp/vc-rcs.el @ 94540:55cb4c49dc98
The day wehen vc-toggle-ready-only was a good idea is long gone.
author | Eric S. Raymond <esr@snark.thyrsus.com> |
---|---|
date | Fri, 02 May 2008 07:12:59 +0000 |
parents | e158200330c2 |
children | a0bb8ca25a33 |
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 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64091
diff
changeset
|
3 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
79721 | 4 ;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
5 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
6 ;; Author: FSF (see vc.el for full credits) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org> |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
8 |
56953 | 9 ;; $Id$ |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
10 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
11 ;; This file is part of GNU Emacs. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
12 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
13 ;; 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
|
14 ;; it under the terms of the GNU General Public License as published by |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
76694
diff
changeset
|
15 ;; the Free Software Foundation; either version 3, or (at your option) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
16 ;; any later version. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
17 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
18 ;; 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
|
19 ;; 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
|
20 ;; 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
|
21 ;; GNU General Public License for more details. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
22 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
23 ;; 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
|
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
64091 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
26 ;; Boston, MA 02110-1301, USA. | |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
27 |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36712
diff
changeset
|
28 ;;; Commentary: |
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36712
diff
changeset
|
29 |
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36712
diff
changeset
|
30 ;; See vc.el |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
31 |
81989 | 32 ;; TODO: |
33 ;; - remove call to vc-expand-dirs by implementing our own (which can just | |
34 ;; list the RCS subdir instead). | |
35 | |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
36 ;;; Code: |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
37 |
33560 | 38 ;;; |
39 ;;; Customization options | |
40 ;;; | |
41 | |
31840
a05558c54226
(toplevel): Require `vc' when compiling.
Gerd Moellmann <gerd@gnu.org>
parents:
31835
diff
changeset
|
42 (eval-when-compile |
35822
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
43 (require 'cl) |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
44 (require 'vc)) |
31840
a05558c54226
(toplevel): Require `vc' when compiling.
Gerd Moellmann <gerd@gnu.org>
parents:
31835
diff
changeset
|
45 |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
46 (defcustom vc-rcs-release nil |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
47 "*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
|
48 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
|
49 :type '(choice (const :tag "Auto" nil) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
50 (string :tag "Specified") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
51 (const :tag "Unknown" unknown)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
52 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
53 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
54 (defcustom vc-rcs-register-switches nil |
31476 | 55 "*Extra switches for registering a file in RCS. |
56 A string or list of strings. These are passed to the checkin program | |
57 by \\[vc-rcs-register]." | |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
58 :type '(choice (const :tag "None" nil) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
59 (string :tag "Argument String") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
60 (repeat :tag "Argument List" |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
61 :value ("") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
62 string)) |
31476 | 63 :version "21.1" |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
64 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
65 |
35822
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
66 (defcustom vc-rcs-diff-switches nil |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
67 "*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
|
68 :type '(choice (const :tag "None" nil) |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
69 (string :tag "Argument String") |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
70 (repeat :tag "Argument List" |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
71 :value ("") |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
72 string)) |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
73 :version "21.1" |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
74 :group 'vc) |
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
75 |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
76 (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
|
77 "*Header keywords to be inserted by `vc-insert-headers'." |
35178 | 78 :type '(repeat string) |
31476 | 79 :version "21.1" |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
80 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
81 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
82 (defcustom vc-rcsdiff-knows-brief nil |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
83 "*Indicates whether rcsdiff understands the --brief option. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
84 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
|
85 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
|
86 :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
|
87 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
88 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
89 ;;;###autoload |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
90 (defcustom vc-rcs-master-templates |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
91 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
92 "*Where to look for RCS master files. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
93 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
|
94 :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
|
95 '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
96 (repeat :tag "User-specified" |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
97 (choice string |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
98 function))) |
31476 | 99 :version "21.1" |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
100 :group 'vc) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
101 |
33560 | 102 |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
103 ;;; Properties of the backend |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
104 |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
105 (defun vc-rcs-revision-granularity () |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
106 'file) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
107 |
33560 | 108 ;;; |
109 ;;; State-querying functions | |
110 ;;; | |
111 | |
94481
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
112 ;; The autoload cookie below places vc-rcs-registered directly into |
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
113 ;; loaddefs.el, so that vc-rcs.el does not need to be loaded for |
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
114 ;; every file that is visited. |
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
115 ;;;###autoload |
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
116 (progn |
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
117 (defun vc-rcs-registered (f) (vc-default-registered 'RCS f))) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
118 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
119 (defun vc-rcs-state (file) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
120 "Implementation of `vc-state' for RCS." |
94537
e158200330c2
(vc-rcs-state): Fix typos.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94522
diff
changeset
|
121 (if (not (vc-rcs-registered file)) |
94521
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
122 'unregistered |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
123 (or (boundp 'vc-rcs-headers-result) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
124 (and vc-consult-headers |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
125 (vc-rcs-consult-headers file))) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
126 (let ((state |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
127 ;; vc-working-revision might not be known; in that case the |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
128 ;; property is nil. vc-rcs-fetch-master-state knows how to |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
129 ;; handle that. |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
130 (vc-rcs-fetch-master-state file |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
131 (vc-file-getprop file |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
132 'vc-working-revision)))) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
133 (if (not (eq state 'up-to-date)) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
134 state |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
135 (if (vc-workfile-unchanged-p file) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
136 'up-to-date |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
137 (if (eq (vc-rcs-checkout-model file) 'locking) |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
138 'unlocked-changes |
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
139 'edited)))))) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
140 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
141 (defun vc-rcs-state-heuristic (file) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
142 "State heuristic for RCS." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
143 (let (vc-rcs-headers-result) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
144 (if (and vc-consult-headers |
31476 | 145 (setq vc-rcs-headers-result |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
146 (vc-rcs-consult-headers file)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
147 (eq vc-rcs-headers-result 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
148 (let ((state (vc-file-getprop file 'vc-state))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
149 ;; 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
|
150 ;; 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
|
151 ;; the file or not. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
152 (if (and (eq state 'up-to-date) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
153 (not (vc-mistrust-permissions file))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
154 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
155 ((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
|
156 (vc-file-setprop file 'vc-checkout-model 'implicit) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49092
diff
changeset
|
157 (setq state |
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49092
diff
changeset
|
158 (if (vc-rcs-workfile-is-newer file) |
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49092
diff
changeset
|
159 'edited |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
160 'up-to-date))) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
161 ((string-match ".r-..-..-." (nth 8 (file-attributes file))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
162 (vc-file-setprop file 'vc-checkout-model 'locking)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
163 state) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
164 (if (not (vc-mistrust-permissions file)) |
68332
a6ef676caa6d
(vc-rcs-state-heuristic): Use file-attributes with ID-FORMAT
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
165 (let* ((attributes (file-attributes file 'string)) |
a6ef676caa6d
(vc-rcs-state-heuristic): Use file-attributes with ID-FORMAT
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
166 (owner-name (nth 2 attributes)) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
167 (permissions (nth 8 attributes))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
168 (cond ((string-match ".r-..-..-." permissions) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
169 (vc-file-setprop file 'vc-checkout-model 'locking) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
170 'up-to-date) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
171 ((string-match ".rw..-..-." permissions) |
94481
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
172 (if (eq (vc-rcs-checkout-model file) 'locking) |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
173 (if (file-ownership-preserved-p file) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
174 'edited |
68332
a6ef676caa6d
(vc-rcs-state-heuristic): Use file-attributes with ID-FORMAT
André Spiegel <spiegel@gnu.org>
parents:
64762
diff
changeset
|
175 owner-name) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49092
diff
changeset
|
176 (if (vc-rcs-workfile-is-newer file) |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
177 'edited |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
178 'up-to-date))) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
179 (t |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
180 ;; Strange permissions. Fall through to |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
181 ;; expensive state computation. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
182 (vc-rcs-state file)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
183 (vc-rcs-state file))))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
184 |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93867
diff
changeset
|
185 (defun vc-rcs-dir-status (dir update-function) |
94522
a69dcc2c42ae
Remove some XXX comments no longer needed.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94521
diff
changeset
|
186 ;; Doing individual vc-state calls is painful but tgere |
a69dcc2c42ae
Remove some XXX comments no longer needed.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94521
diff
changeset
|
187 ;; is no better way in RCS-land. |
93677
112903000f93
* vc-rcs.el (vc-rcs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92165
diff
changeset
|
188 (let ((flist (vc-expand-dirs (list dir))) |
112903000f93
* vc-rcs.el (vc-rcs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92165
diff
changeset
|
189 (result nil)) |
112903000f93
* vc-rcs.el (vc-rcs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92165
diff
changeset
|
190 (dolist (file flist) |
112903000f93
* vc-rcs.el (vc-rcs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92165
diff
changeset
|
191 (let ((state (vc-state file)) |
112903000f93
* vc-rcs.el (vc-rcs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92165
diff
changeset
|
192 (frel (file-relative-name file))) |
112903000f93
* vc-rcs.el (vc-rcs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92165
diff
changeset
|
193 (push (list frel state) result))) |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93867
diff
changeset
|
194 (funcall update-function result))) |
93677
112903000f93
* vc-rcs.el (vc-rcs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92165
diff
changeset
|
195 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
196 (defun vc-rcs-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
197 "RCS-specific version of `vc-working-revision'." |
33560 | 198 (or (and vc-consult-headers |
199 (vc-rcs-consult-headers file) | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
200 (vc-file-getprop file 'vc-working-revision)) |
33560 | 201 (progn |
202 (vc-rcs-fetch-master-state file) | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
203 (vc-file-getprop file 'vc-working-revision)))) |
33560 | 204 |
205 (defun vc-rcs-latest-on-branch-p (file &optional version) | |
206 "Return non-nil if workfile version of FILE is the latest on its branch. | |
207 When VERSION is given, perform check for that version." | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
208 (unless version (setq version (vc-working-revision file))) |
33560 | 209 (with-temp-buffer |
210 (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
|
211 (if (vc-trunk-p version) |
33560 | 212 (progn |
213 ;; Compare VERSION to the head version number. | |
214 (vc-insert-file (vc-name file) "^[0-9]") | |
215 (vc-parse-buffer "^head[ \t\n]+\\([^;]+\\);" 1)) | |
216 ;; If we are not on the trunk, we need to examine the | |
217 ;; whole current branch. | |
218 (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
|
219 (vc-rcs-find-most-recent-rev (vc-branch-part version)))))) |
33560 | 220 |
94481
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
221 (defun vc-rcs-checkout-model (files) |
33560 | 222 "RCS-specific version of `vc-checkout-model'." |
94481
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
223 (let ((file (if (consp files) (car files) files)) |
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
224 result) |
56318
b9c0ed2a46bd
(vc-rcs-checkout-model): Look at the version headers only if
André Spiegel <spiegel@gnu.org>
parents:
54466
diff
changeset
|
225 (when vc-consult-headers |
b9c0ed2a46bd
(vc-rcs-checkout-model): Look at the version headers only if
André Spiegel <spiegel@gnu.org>
parents:
54466
diff
changeset
|
226 (vc-file-setprop file 'vc-checkout-model nil) |
b9c0ed2a46bd
(vc-rcs-checkout-model): Look at the version headers only if
André Spiegel <spiegel@gnu.org>
parents:
54466
diff
changeset
|
227 (vc-rcs-consult-headers file) |
b9c0ed2a46bd
(vc-rcs-checkout-model): Look at the version headers only if
André Spiegel <spiegel@gnu.org>
parents:
54466
diff
changeset
|
228 (setq result (vc-file-getprop file 'vc-checkout-model))) |
b9c0ed2a46bd
(vc-rcs-checkout-model): Look at the version headers only if
André Spiegel <spiegel@gnu.org>
parents:
54466
diff
changeset
|
229 (or result |
b9c0ed2a46bd
(vc-rcs-checkout-model): Look at the version headers only if
André Spiegel <spiegel@gnu.org>
parents:
54466
diff
changeset
|
230 (progn (vc-rcs-fetch-master-state file) |
b9c0ed2a46bd
(vc-rcs-checkout-model): Look at the version headers only if
André Spiegel <spiegel@gnu.org>
parents:
54466
diff
changeset
|
231 (vc-file-getprop file 'vc-checkout-model))))) |
33560 | 232 |
233 (defun vc-rcs-workfile-unchanged-p (file) | |
56953 | 234 "RCS-specific implementation of `vc-workfile-unchanged-p'." |
33560 | 235 ;; Try to use rcsdiff --brief. If rcsdiff does not understand that, |
236 ;; do a double take and remember the fact for the future | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
237 (let* ((version (concat "-r" (vc-working-revision file))) |
33560 | 238 (status (if (eq vc-rcsdiff-knows-brief 'no) |
239 (vc-do-command nil 1 "rcsdiff" file version) | |
240 (vc-do-command nil 2 "rcsdiff" file "--brief" version)))) | |
241 (if (eq status 2) | |
242 (if (not vc-rcsdiff-knows-brief) | |
243 (setq vc-rcsdiff-knows-brief 'no | |
244 status (vc-do-command nil 1 "rcsdiff" file version)) | |
245 (error "rcsdiff failed")) | |
246 (if (not vc-rcsdiff-knows-brief) (setq vc-rcsdiff-knows-brief 'yes))) | |
247 ;; The workfile is unchanged if rcsdiff found no differences. | |
248 (zerop status))) | |
249 | |
78519
b2a41f8ce78a
(vc-rcs-find-file-not-found-hook):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
250 (defun vc-rcs-find-file-not-found-hook () |
b2a41f8ce78a
(vc-rcs-find-file-not-found-hook):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
251 (if (yes-or-no-p |
b2a41f8ce78a
(vc-rcs-find-file-not-found-hook):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
252 (format "File %s was lost; check out from version control? " |
b2a41f8ce78a
(vc-rcs-find-file-not-found-hook):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
253 (file-name-nondirectory buffer-file-name))) |
b2a41f8ce78a
(vc-rcs-find-file-not-found-hook):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
254 (save-excursion |
b2a41f8ce78a
(vc-rcs-find-file-not-found-hook):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
255 (require 'vc) |
b2a41f8ce78a
(vc-rcs-find-file-not-found-hook):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
256 (let ((default-directory (file-name-directory buffer-file-name))) |
b2a41f8ce78a
(vc-rcs-find-file-not-found-hook):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
257 (not (vc-error-occurred (vc-checkout buffer-file-name))))))) |
33560 | 258 |
259 ;;; | |
260 ;;; State-changing functions | |
261 ;;; | |
262 | |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
263 (defun vc-rcs-create-repo () |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
264 "Create a new RCS repository." |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
265 ;; RCS is totally file-oriented, so all we have to do is make the directory |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
266 (make-directory "RCS")) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
267 |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
268 (defun vc-rcs-register (files &optional rev comment) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
269 "Register FILES into the RCS version-control system. |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
270 REV is the optional revision number for the files. COMMENT can be used |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
271 to provide an initial description for each FILES. |
33560 | 272 |
273 `vc-register-switches' and `vc-rcs-register-switches' are passed to | |
274 the RCS command (in that order). | |
275 | |
276 Automatically retrieve a read-only version of the file with keywords | |
277 expanded if `vc-keep-workfiles' is non-nil, otherwise, delete the workfile." | |
92165
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
278 (let (subdir name) |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
279 (dolist (file files) |
92165
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
280 (and (not (file-exists-p |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
281 (setq subdir (expand-file-name "RCS" |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
282 (file-name-directory file))))) |
33560 | 283 (not (directory-files (file-name-directory file) |
284 nil ".*,v$" t)) | |
285 (yes-or-no-p "Create RCS subdirectory? ") | |
286 (make-directory subdir)) | |
287 (apply 'vc-do-command nil 0 "ci" file | |
288 ;; if available, use the secure registering option | |
289 (and (vc-rcs-release-p "5.6.4") "-i") | |
290 (concat (if vc-keep-workfiles "-u" "-r") rev) | |
291 (and comment (concat "-t-" comment)) | |
50903
c03b80e1bacd
(vc-rcs-register, vc-rcs-checkin, vc-rcs-checkout)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49597
diff
changeset
|
292 (vc-switches 'RCS 'register)) |
33560 | 293 ;; parse output to find master file name and workfile version |
294 (with-current-buffer "*vc*" | |
92165
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
295 (goto-char (point-min)) |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
296 (if (not (setq name |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
297 (if (looking-at (concat "^\\(.*\\) <-- " |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
298 (file-name-nondirectory file))) |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
299 (match-string 1)))) |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
300 ;; if we couldn't find the master name, |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
301 ;; run vc-rcs-registered to get it |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
302 ;; (will be stored into the vc-name property) |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
303 (vc-rcs-registered file) |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
304 (vc-file-setprop file 'vc-name |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
305 (if (file-name-absolute-p name) |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
306 name |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
307 (expand-file-name |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
308 name |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
309 (file-name-directory file)))))) |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
310 (vc-file-setprop file 'vc-working-revision |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
311 (if (re-search-forward |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
312 "^initial revision: \\([0-9.]+\\).*\n" |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
313 nil t) |
6bb6b2500e35
(vc-rcs-register): Fix treatment of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents:
91956
diff
changeset
|
314 (match-string 1)))))) |
33560 | 315 |
316 (defun vc-rcs-responsible-p (file) | |
317 "Return non-nil if RCS thinks it would be responsible for registering FILE." | |
318 ;; TODO: check for all the patterns in vc-rcs-master-templates | |
319 (file-directory-p (expand-file-name "RCS" (file-name-directory file)))) | |
320 | |
321 (defun vc-rcs-receive-file (file rev) | |
322 "Implementation of receive-file for RCS." | |
94481
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
323 (let ((checkout-model (vc-rcs-checkout-model file))) |
33560 | 324 (vc-rcs-register file rev "") |
325 (when (eq checkout-model 'implicit) | |
326 (vc-rcs-set-non-strict-locking file)) | |
327 (vc-rcs-set-default-branch file (concat rev ".1")))) | |
328 | |
329 (defun vc-rcs-unregister (file) | |
330 "Unregister FILE from RCS. | |
331 If this leaves the RCS subdirectory empty, ask the user | |
332 whether to remove it." | |
333 (let* ((master (vc-name file)) | |
334 (dir (file-name-directory master)) | |
335 (backup-info (find-backup-file-name master))) | |
336 (if (not backup-info) | |
337 (delete-file master) | |
338 (rename-file master (car backup-info) 'ok-if-already-exists) | |
339 (dolist (f (cdr backup-info)) (ignore-errors (delete-file f)))) | |
340 (and (string= (file-name-nondirectory (directory-file-name dir)) "RCS") | |
341 ;; check whether RCS dir is empty, i.e. it does not | |
342 ;; contain any files except "." and ".." | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49092
diff
changeset
|
343 (not (directory-files dir nil |
33560 | 344 "^\\([^.]\\|\\.[^.]\\|\\.\\.[^.]\\).*")) |
345 (yes-or-no-p (format "Directory %s is empty; remove it? " dir)) | |
346 (delete-directory dir)))) | |
347 | |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
348 (defun vc-rcs-checkin (files rev comment) |
33560 | 349 "RCS-specific version of `vc-backend-checkin'." |
50903
c03b80e1bacd
(vc-rcs-register, vc-rcs-checkin, vc-rcs-checkout)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49597
diff
changeset
|
350 (let ((switches (vc-switches 'RCS 'checkin))) |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
351 ;; Now operate on the files |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
352 (dolist (file files) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
353 (let ((old-version (vc-working-revision file)) new-version |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
354 (default-branch (vc-file-getprop file 'vc-rcs-default-branch))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
355 ;; Force branch creation if an appropriate |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
356 ;; default branch has been set. |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
357 (and (not rev) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
358 default-branch |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
359 (string-match (concat "^" (regexp-quote old-version) "\\.") |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
360 default-branch) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
361 (setq rev default-branch) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
362 (setq switches (cons "-f" switches))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
363 (if (and (not rev) old-version) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
364 (setq rev (vc-branch-part old-version))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
365 (apply 'vc-do-command nil 0 "ci" (vc-name file) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
366 ;; if available, use the secure check-in option |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
367 (and (vc-rcs-release-p "5.6.4") "-j") |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
368 (concat (if vc-keep-workfiles "-u" "-r") rev) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
369 (concat "-m" comment) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
370 switches) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
371 (vc-file-setprop file 'vc-working-revision nil) |
33560 | 372 |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
373 ;; determine the new workfile version |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
374 (set-buffer "*vc*") |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
375 (goto-char (point-min)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
376 (when (or (re-search-forward |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
377 "new revision: \\([0-9.]+\\);" nil t) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
378 (re-search-forward |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
379 "reverting to previous revision \\([0-9.]+\\)" nil t)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
380 (setq new-version (match-string 1)) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
381 (vc-file-setprop file 'vc-working-revision new-version)) |
33560 | 382 |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
383 ;; if we got to a different branch, adjust the default |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
384 ;; branch accordingly |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
385 (cond |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
386 ((and old-version new-version |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
387 (not (string= (vc-branch-part old-version) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
388 (vc-branch-part new-version)))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
389 (vc-rcs-set-default-branch file |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
390 (if (vc-trunk-p new-version) nil |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
391 (vc-branch-part new-version))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
392 ;; If this is an old RCS release, we might have |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
393 ;; to remove a remaining lock. |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
394 (if (not (vc-rcs-release-p "5.6.2")) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
395 ;; exit status of 1 is also accepted. |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
396 ;; It means that the lock was removed before. |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
397 (vc-do-command nil 1 "rcs" (vc-name file) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
398 (concat "-u" old-version))))))))) |
33560 | 399 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
400 (defun vc-rcs-find-revision (file rev buffer) |
47797
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
401 (apply 'vc-do-command |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
402 buffer 0 "co" (vc-name file) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
403 "-q" ;; suppress diagnostic output |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
404 (concat "-p" rev) |
50903
c03b80e1bacd
(vc-rcs-register, vc-rcs-checkin, vc-rcs-checkout)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49597
diff
changeset
|
405 (vc-switches 'RCS 'checkout))) |
47797
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
406 |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
407 (defun vc-rcs-checkout (file &optional editable rev) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
408 "Retrieve a copy of a saved version of FILE." |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
409 (let ((file-buffer (get-file-buffer file)) |
33560 | 410 switches) |
47797
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
411 (message "Checking out %s..." file) |
33560 | 412 (save-excursion |
413 ;; Change buffers to get local value of vc-checkout-switches. | |
414 (if file-buffer (set-buffer file-buffer)) | |
50903
c03b80e1bacd
(vc-rcs-register, vc-rcs-checkin, vc-rcs-checkout)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49597
diff
changeset
|
415 (setq switches (vc-switches 'RCS 'checkout)) |
33560 | 416 ;; Save this buffer's default-directory |
417 ;; and use save-excursion to make sure it is restored | |
418 ;; in the same buffer it was saved in. | |
419 (let ((default-directory default-directory)) | |
420 (save-excursion | |
421 ;; Adjust the default-directory so that the check-out creates | |
422 ;; the file in the right place. | |
47797
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
423 (setq default-directory (file-name-directory file)) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
424 (let (new-version) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
425 ;; if we should go to the head of the trunk, |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
426 ;; clear the default branch first |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
427 (and rev (string= rev "") |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
428 (vc-rcs-set-default-branch file nil)) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
429 ;; now do the checkout |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
430 (apply 'vc-do-command |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
431 nil 0 "co" (vc-name file) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
432 ;; If locking is not strict, force to overwrite |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
433 ;; the writable workfile. |
94481
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
434 (if (eq (vc-rcs-checkout-model file) 'implicit) "-f") |
47797
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
435 (if editable "-l") |
48966
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
436 (if (stringp rev) |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
437 ;; a literal revision was specified |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
438 (concat "-r" rev) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
439 (let ((workrev (vc-working-revision file))) |
48966
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
440 (if workrev |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49092
diff
changeset
|
441 (concat "-r" |
48966
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
442 (if (not rev) |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
443 ;; no revision specified: |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
444 ;; use current workfile version |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
445 workrev |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
446 ;; REV is t ... |
49092
da6da3a685c2
(vc-rcs-checkout): Fix the check whether we are on a branch.
André Spiegel <spiegel@gnu.org>
parents:
49021
diff
changeset
|
447 (if (not (vc-trunk-p workrev)) |
48966
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
448 ;; ... go to head of current branch |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
449 (vc-branch-part workrev) |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
450 ;; ... go to head of trunk |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
451 (vc-rcs-set-default-branch file |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
452 nil) |
a327c58de610
(vc-rcs-checkout): Handle t argument for REV.
André Spiegel <spiegel@gnu.org>
parents:
48282
diff
changeset
|
453 "")))))) |
47797
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
454 switches) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
455 ;; determine the new workfile version |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
456 (with-current-buffer "*vc*" |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
457 (setq new-version |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
458 (vc-parse-buffer "^revision \\([0-9.]+\\).*\n" 1))) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
459 (vc-file-setprop file 'vc-working-revision new-version) |
47797
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
460 ;; if necessary, adjust the default branch |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
461 (and rev (not (string= rev "")) |
58320
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
462 (vc-rcs-set-default-branch |
47797
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
463 file |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
464 (if (vc-rcs-latest-on-branch-p file new-version) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
465 (if (vc-trunk-p new-version) nil |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
466 (vc-branch-part new-version)) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
467 new-version))))) |
d0555af982c8
(vc-rcs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47757
diff
changeset
|
468 (message "Checking out %s...done" file))))) |
33560 | 469 |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
470 (defun vc-rcs-rollback (files) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
471 "Roll back, undoing the most recent checkins of FILES." |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
472 (if (not files) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
473 (error "RCS backend doesn't support directory-level rollback.")) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
474 (dolist (file files) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
475 (let* ((discard (vc-working-revision file)) |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
476 (previous (if (vc-trunk-p discard) "" (vc-branch-part discard))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
477 (config (current-window-configuration)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
478 (done nil)) |
91955
e3aedad81f5f
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
479 (if (null (yes-or-no-p (format "Remove version %s from %s history? " |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
480 discard file))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
481 (error "Aborted")) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
482 (message "Removing revision %s from %s." discard file) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
483 (vc-do-command nil 0 "rcs" (vc-name file) (concat "-o" discard)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
484 ;; Check out the most recent remaining version. If it |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
485 ;; fails, because the whole branch got deleted, do a |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
486 ;; double-take and check out the version where the branch |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
487 ;; started. |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
488 (while (not done) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
489 (condition-case err |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
490 (progn |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
491 (vc-do-command nil 0 "co" (vc-name file) "-f" |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
492 (concat "-u" previous)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
493 (setq done t)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
494 (error (set-buffer "*vc*") |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
495 (goto-char (point-min)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
496 (if (search-forward "no side branches present for" nil t) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
497 (progn (setq previous (vc-branch-part previous)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
498 (vc-rcs-set-default-branch file previous) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
499 ;; vc-do-command popped up a window with |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
500 ;; the error message. Get rid of it, by |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
501 ;; restoring the old window configuration. |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
502 (set-window-configuration config)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
503 ;; No, it was some other error: re-signal it. |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
504 (signal (car err) (cdr err))))))))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
505 |
39001
d13c2139752b
(vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents:
38436
diff
changeset
|
506 (defun vc-rcs-revert (file &optional contents-done) |
33560 | 507 "Revert FILE to the version it was based on." |
508 (vc-do-command nil 0 "co" (vc-name file) "-f" | |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49092
diff
changeset
|
509 (concat (if (eq (vc-state file) 'edited) "-u" "-r") |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
510 (vc-working-revision file)))) |
33560 | 511 |
512 (defun vc-rcs-merge (file first-version &optional second-version) | |
513 "Merge changes into current working copy of FILE. | |
514 The changes are between FIRST-VERSION and SECOND-VERSION." | |
515 (vc-do-command nil 1 "rcsmerge" (vc-name file) | |
516 "-kk" ; ignore keyword conflicts | |
517 (concat "-r" first-version) | |
518 (if second-version (concat "-r" second-version)))) | |
519 | |
520 (defun vc-rcs-steal-lock (file &optional rev) | |
521 "Steal the lock on the current workfile for FILE and revision REV. | |
522 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
|
523 (vc-do-command nil 0 "rcs" (vc-name file) "-M" (concat "-u" rev)) |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49092
diff
changeset
|
524 ;; Do a real checkout after stealing the lock, so that we see |
42549
6301bb6ec388
(vc-rcs-steal-lock): Do a real checkout after stealing the lock, so
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
525 ;; 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
|
526 (vc-do-command nil 0 "co" (vc-name file) "-f" (concat "-l" rev))) |
33560 | 527 |
87432
315124ffb889
* (vc.el, vc-sccs.el, vc-rcs.el, vc-cs.el, vc-mcvs.el): Put
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
528 (defun vc-rcs-modify-change-comment (files rev comment) |
315124ffb889
* (vc.el, vc-sccs.el, vc-rcs.el, vc-cs.el, vc-mcvs.el): Put
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
529 "Modify the change comments change on FILES on a specified REV." |
315124ffb889
* (vc.el, vc-sccs.el, vc-rcs.el, vc-cs.el, vc-mcvs.el): Put
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85139
diff
changeset
|
530 (dolist (file files) |
91955
e3aedad81f5f
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
531 (vc-do-command nil 0 "rcs" (vc-name file) |
93867
520490ae1b9a
* vc-rcs.el (vc-rcs-modify-change-comment):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93677
diff
changeset
|
532 (concat "-m" rev ":" comment)))) |
33560 | 533 |
534 | |
535 ;;; | |
536 ;;; History functions | |
537 ;;; | |
538 | |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
539 (defun vc-rcs-print-log (files &optional buffer) |
33560 | 540 "Get change log associated with FILE." |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
541 (vc-do-command buffer 0 "rlog" (mapcar 'vc-name files))) |
33560 | 542 |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
543 (defun vc-rcs-diff (files &optional oldvers newvers buffer) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
544 "Get a difference report using RCS between two sets of files." |
91955
e3aedad81f5f
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
87649
diff
changeset
|
545 (apply 'vc-do-command (or buffer "*vc-diff*") |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
546 1 ;; Always go synchronous, the repo is local |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
547 "rcsdiff" (vc-expand-dirs files) |
35822
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
548 (append (list "-q" |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
549 (and oldvers (concat "-r" oldvers)) |
35822
cd59c63d4aac
(vc-rcs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents:
35178
diff
changeset
|
550 (and newvers (concat "-r" newvers))) |
50903
c03b80e1bacd
(vc-rcs-register, vc-rcs-checkin, vc-rcs-checkout)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
49597
diff
changeset
|
551 (vc-switches 'RCS 'diff)))) |
33560 | 552 |
81966
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
553 (defun vc-rcs-wash-log () |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
554 "Remove all non-comment information from log output." |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
555 (let ((separator (concat "^-+\nrevision [0-9.]+\ndate: .*\n" |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
556 "\\(branches: .*;\n\\)?" |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
557 "\\(\\*\\*\\* empty log message \\*\\*\\*\n\\)?"))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
558 (goto-char (point-max)) (forward-line -1) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
559 (while (looking-at "=*\n") |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
560 (delete-char (- (match-end 0) (match-beginning 0))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
561 (forward-line -1)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
562 (goto-char (point-min)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
563 (if (looking-at "[\b\t\n\v\f\r ]+") |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
564 (delete-char (- (match-end 0) (match-beginning 0)))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
565 (goto-char (point-min)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
566 (re-search-forward separator nil t) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
567 (delete-region (point-min) (point)) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
568 (while (re-search-forward separator nil t) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
569 (delete-region (match-beginning 0) (match-end 0))))) |
cedd5b77aae4
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
76694
diff
changeset
|
570 |
58320
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
571 (defun vc-rcs-annotate-command (file buffer &optional revision) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
572 "Annotate FILE, inserting the results in BUFFER. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
573 Optional arg REVISION is a revision to annotate from." |
59181
a22da8bff83f
(vc-rcs-annotate-command):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
58320
diff
changeset
|
574 (vc-setup-buffer buffer) |
58320
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
575 ;; Aside from the "head revision on the trunk", the instructions for |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
576 ;; each revision on the trunk are an ordered list of kill and insert |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
577 ;; commands necessary to go from the chronologically-following |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
578 ;; revision to this one. That is, associated with revision N are |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
579 ;; edits that applied to revision N+1 would result in revision N. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
580 ;; |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
581 ;; On a branch, however, (some) things are inverted: the commands |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
582 ;; listed are those necessary to go from the chronologically-preceding |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
583 ;; revision to this one. That is, associated with revision N are |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
584 ;; edits that applied to revision N-1 would result in revision N. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
585 ;; |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
586 ;; So, to get per-line history info, we apply reverse-chronological |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
587 ;; edits, starting with the head revision on the trunk, all the way |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
588 ;; back through the initial revision (typically "1.1" or similar), |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
589 ;; then apply forward-chronological edits -- keeping track of which |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
590 ;; revision is associated with each inserted line -- until we reach |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
591 ;; the desired revision for display (which may be either on the trunk |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
592 ;; or on a branch). |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
593 (let* ((tree (with-temp-buffer |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
594 (insert-file-contents (vc-rcs-registered file)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
595 (vc-rcs-parse))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
596 (revisions (cdr (assq 'revisions tree))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
597 ;; The revision N whose instructions we currently are processing. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
598 (cur (cdr (assq 'head (cdr (assq 'headers tree))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
599 ;; Alist from the parse tree for N. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
600 (meta (cdr (assoc cur revisions))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
601 ;; Point and temporary string, respectively. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
602 p s |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
603 ;; "Next-branch list". Nil means the desired revision to |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
604 ;; display lives on the trunk. Non-nil means it lives on a |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
605 ;; branch, in which case the value is a list of revision pairs |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
606 ;; (PARENT . CHILD), the first PARENT being on the trunk, that |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
607 ;; links each series of revisions in the path from the initial |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
608 ;; revision to the desired revision to display. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
609 nbls |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
610 ;; "Path-accumulate-predicate plus revision/date/author". |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
611 ;; Until set, forward-chronological edits are not accumulated. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
612 ;; Once set, its value (updated every revision) is used for |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
613 ;; the text property `:vc-rcs-r/d/a' for inserts during |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
614 ;; processing of forward-chronological instructions for N. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
615 ;; See internal func `r/d/a'. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
616 prda |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
617 ;; List of forward-chronological instructions, each of the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
618 ;; form: (POS . ACTION), where POS is a buffer position. If |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
619 ;; ACTION is a string, it is inserted, otherwise it is taken as |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
620 ;; the number of characters to be deleted. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
621 path |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
622 ;; N+1. When `cur' is "", this is the initial revision. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
623 pre) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
624 (unless revision |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
625 (setq revision cur)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
626 (unless (assoc revision revisions) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
627 (error "No such revision: %s" revision)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
628 ;; Find which branches (if any) must be included in the edits. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
629 (let ((par revision) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
630 bpt kids) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
631 (while (setq bpt (vc-branch-part par) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
632 par (vc-branch-part bpt)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
633 (setq kids (cdr (assq 'branches (cdr (assoc par revisions))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
634 ;; A branchpoint may have multiple children. Find the right one. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
635 (while (not (string= bpt (vc-branch-part (car kids)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
636 (setq kids (cdr kids))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
637 (push (cons par (car kids)) nbls))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
638 ;; Start with the full text. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
639 (set-buffer buffer) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
640 (insert (cdr (assq 'text meta))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
641 ;; Apply reverse-chronological edits on the trunk, computing and |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
642 ;; accumulating forward-chronological edits after some point, for |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
643 ;; later. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
644 (flet ((r/d/a () (vector pre |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
645 (cdr (assq 'date meta)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
646 (cdr (assq 'author meta))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
647 (while (when (setq pre cur cur (cdr (assq 'next meta))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
648 (not (string= "" cur))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
649 (setq |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
650 ;; Start accumulating the forward-chronological edits when N+1 |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
651 ;; on the trunk is either the desired revision to display, or |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
652 ;; the appropriate branchpoint for it. Do this before |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
653 ;; updating `meta' since `r/d/a' uses N+1's `meta' value. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
654 prda (when (or prda (string= (if nbls (caar nbls) revision) pre)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
655 (r/d/a)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
656 meta (cdr (assoc cur revisions))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
657 ;; Edits in the parse tree specify a line number (in the buffer |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
658 ;; *BEFORE* editing occurs) to start from, but line numbers |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
659 ;; change as a result of edits. To DTRT, we apply edits in |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
660 ;; order of descending buffer position so that edits further |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
661 ;; down in the buffer occur first w/o corrupting specified |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
662 ;; buffer positions of edits occurring towards the beginning of |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
663 ;; the buffer. In this way we avoid using markers. A pleasant |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
664 ;; property of this approach is ability to push instructions |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
665 ;; onto `path' directly, w/o need to maintain rev boundaries. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
666 (dolist (insn (cdr (assq :insn meta))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
667 (goto-line (pop insn)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
668 (setq p (point)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
669 (case (pop insn) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
670 (k (setq s (buffer-substring-no-properties |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
671 p (progn (forward-line (car insn)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
672 (point)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
673 (when prda |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
674 (push `(,p . ,(propertize s :vc-rcs-r/d/a prda)) path)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
675 (delete-region p (point))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
676 (i (setq s (car insn)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
677 (when prda |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
678 (push `(,p . ,(length s)) path)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
679 (insert s))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
680 ;; For the initial revision, setting `:vc-rcs-r/d/a' directly is |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
681 ;; equivalent to pushing an insert instruction (of the entire buffer |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
682 ;; contents) onto `path' then erasing the buffer, but less wasteful. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
683 (put-text-property (point-min) (point-max) :vc-rcs-r/d/a (r/d/a)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
684 ;; Now apply the forward-chronological edits for the trunk. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
685 (dolist (insn path) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
686 (goto-char (pop insn)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
687 (if (stringp insn) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
688 (insert insn) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
689 (delete-char insn))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
690 ;; Now apply the forward-chronological edits (directly from the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
691 ;; parse-tree) for the branch(es), if necessary. We re-use vars |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
692 ;; `pre' and `meta' for the sake of internal func `r/d/a'. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
693 (while nbls |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
694 (setq pre (cdr (pop nbls))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
695 (while (progn |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
696 (setq meta (cdr (assoc pre revisions)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
697 prda nil) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
698 (dolist (insn (cdr (assq :insn meta))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
699 (goto-line (pop insn)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
700 (case (pop insn) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
701 (k (delete-region |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
702 (point) (progn (forward-line (car insn)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
703 (point)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
704 (i (insert (propertize |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
705 (car insn) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
706 :vc-rcs-r/d/a |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
707 (or prda (setq prda (r/d/a)))))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
708 (prog1 (not (string= (if nbls (caar nbls) revision) pre)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
709 (setq pre (cdr (assq 'next meta))))))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
710 ;; Lastly, for each line, insert at bol nicely-formatted history info. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
711 ;; We do two passes to collect summary information used to minimize |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
712 ;; the annotation's usage of screen real-estate: (1) Consider rendered |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
713 ;; width of revision plus author together as a unit; and (2) Omit |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
714 ;; author entirely if all authors are the same as the user. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
715 (let ((ht (make-hash-table :test 'eq)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
716 (me (user-login-name)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
717 (maxw 0) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
718 (all-me t) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
719 rda w a) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
720 (goto-char (point-max)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
721 (while (not (bobp)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
722 (forward-line -1) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
723 (setq rda (get-text-property (point) :vc-rcs-r/d/a)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
724 (unless (gethash rda ht) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
725 (setq a (aref rda 2) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
726 all-me (and all-me (string= a me))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
727 (puthash rda (setq w (+ (length (aref rda 0)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
728 (length a))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
729 ht) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
730 (setq maxw (max w maxw)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
731 (let ((padding (make-string maxw 32))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
732 (flet ((pad (w) (substring-no-properties padding w)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
733 (render (rda &rest ls) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
734 (propertize |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
735 (apply 'concat |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
736 (format-time-string "%Y-%m-%d" (aref rda 1)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
737 " " |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
738 (aref rda 0) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
739 ls) |
76694
f35ed3fecce9
(vc-rcs-annotate-command):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
75347
diff
changeset
|
740 :vc-annotate-prefix t |
58320
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
741 :vc-rcs-r/d/a rda))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
742 (maphash |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
743 (if all-me |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
744 (lambda (rda w) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
745 (puthash rda (render rda (pad w) ": ") ht)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
746 (lambda (rda w) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
747 (puthash rda (render rda " " (pad w) " " (aref rda 2) ": ") ht))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
748 ht))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
749 (while (not (eobp)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
750 (insert (gethash (get-text-property (point) :vc-rcs-r/d/a) ht)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
751 (forward-line 1)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
752 |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
753 (defun vc-rcs-annotate-current-time () |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
754 "Return the current time, based at midnight of the current day, and |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
755 encoded as fractional days." |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
756 (vc-annotate-convert-time |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
757 (apply 'encode-time 0 0 0 (nthcdr 3 (decode-time (current-time)))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
758 |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
759 (defun vc-rcs-annotate-time () |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
760 "Return the time of the next annotation (as fraction of days) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
761 systime, or nil if there is none. Also, reposition point." |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
762 (unless (eobp) |
76694
f35ed3fecce9
(vc-rcs-annotate-command):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
75347
diff
changeset
|
763 (prog1 (vc-annotate-convert-time |
f35ed3fecce9
(vc-rcs-annotate-command):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
75347
diff
changeset
|
764 (aref (get-text-property (point) :vc-rcs-r/d/a) 1)) |
f35ed3fecce9
(vc-rcs-annotate-command):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
75347
diff
changeset
|
765 (goto-char (next-single-property-change (point) :vc-annotate-prefix))))) |
58320
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
766 |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
767 (defun vc-rcs-annotate-extract-revision-at-line () |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
768 (aref (get-text-property (point) :vc-rcs-r/d/a) 0)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
769 |
33560 | 770 |
771 ;;; | |
772 ;;; Snapshot system | |
773 ;;; | |
774 | |
775 (defun vc-rcs-assign-name (file name) | |
776 "Assign to FILE's latest version a given NAME." | |
777 (vc-do-command nil 0 "rcs" (vc-name file) (concat "-n" name ":"))) | |
778 | |
779 | |
780 ;;; | |
781 ;;; Miscellaneous | |
782 ;;; | |
783 | |
784 (defun vc-rcs-check-headers () | |
785 "Check if the current file has any headers in it." | |
786 (save-excursion | |
787 (goto-char (point-min)) | |
788 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\ | |
789 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t))) | |
790 | |
791 (defun vc-rcs-clear-headers () | |
792 "Implementation of vc-clear-headers for RCS." | |
793 (let ((case-fold-search nil)) | |
794 (goto-char (point-min)) | |
795 (while (re-search-forward | |
796 (concat "\\$\\(Author\\|Date\\|Header\\|Id\\|Locker\\|Name\\|" | |
797 "RCSfile\\|Revision\\|Source\\|State\\): [^$\n]+\\$") | |
798 nil t) | |
799 (replace-match "$\\1$")))) | |
800 | |
801 (defun vc-rcs-rename-file (old new) | |
802 ;; Just move the master file (using vc-rcs-master-templates). | |
803 (vc-rename-master (vc-name old) new vc-rcs-master-templates)) | |
804 | |
805 | |
806 ;;; | |
807 ;;; Internal functions | |
808 ;;; | |
809 | |
91956
7bc22dad5f9a
Make sure all backends support vc-BACKEND-root.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91955
diff
changeset
|
810 (defun vc-rcs-root (dir) |
7bc22dad5f9a
Make sure all backends support vc-BACKEND-root.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91955
diff
changeset
|
811 (vc-find-root dir "RCS" t)) |
7bc22dad5f9a
Make sure all backends support vc-BACKEND-root.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91955
diff
changeset
|
812 |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
813 (defun vc-rcs-workfile-is-newer (file) |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
814 "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
|
815 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
|
816 to its master version." |
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
817 (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
|
818 (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
|
819 (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
|
820 (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
|
821 (> (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
|
822 |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
823 (defun vc-rcs-find-most-recent-rev (branch) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
824 "Find most recent revision on BRANCH." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
825 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
826 (let ((latest-rev -1) value) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
827 (while (re-search-forward (concat "^\\(" (regexp-quote branch) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
828 "\\.\\([0-9]+\\)\\)\ndate[ \t]+[0-9.]+;") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
829 nil t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
830 (let ((rev (string-to-number (match-string 2)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
831 (when (< latest-rev rev) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
832 (setq latest-rev rev) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
833 (setq value (match-string 1))))) |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
834 (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
|
835 (vc-branch-part branch)))) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
836 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
837 (defun vc-rcs-fetch-master-state (file &optional working-revision) |
31476 | 838 "Compute the master file's idea of the state of FILE. |
839 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
|
840 otherwise determine the workfile version based on the master file. |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
841 This function sets the properties `vc-working-revision' and |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
842 `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
|
843 file." |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
844 (with-temp-buffer |
46543
7fa004ccd462
(vc-rcs-fetch-master-state): Be more careful to check
André Spiegel <spiegel@gnu.org>
parents:
44004
diff
changeset
|
845 (if (or (not (vc-insert-file (vc-name file) "^[0-9]")) |
7fa004ccd462
(vc-rcs-fetch-master-state): Be more careful to check
André Spiegel <spiegel@gnu.org>
parents:
44004
diff
changeset
|
846 (progn (goto-char (point-min)) |
7fa004ccd462
(vc-rcs-fetch-master-state): Be more careful to check
André Spiegel <spiegel@gnu.org>
parents:
44004
diff
changeset
|
847 (not (looking-at "^head[ \t\n]+[^;]+;$")))) |
7fa004ccd462
(vc-rcs-fetch-master-state): Be more careful to check
André Spiegel <spiegel@gnu.org>
parents:
44004
diff
changeset
|
848 (error "File %s is not an RCS master file" (vc-name file))) |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
849 (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
|
850 (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
|
851 (vc-file-setprop file 'vc-rcs-default-branch default-branch) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
852 (unless working-revision |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
853 ;; 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
|
854 ;; 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
|
855 ;; 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
|
856 ;; revision number. |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
857 (cond |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
858 ;; no default branch |
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
859 ((or (not default-branch) (string= "" default-branch)) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
860 (setq working-revision |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
861 (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
|
862 (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
|
863 ;; 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
|
864 ((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
|
865 default-branch) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
866 (setq working-revision default-branch)) |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
867 ;; 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
|
868 (t (vc-insert-file (vc-name file) "^desc") |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
869 (setq working-revision |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
870 (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
|
871 (setq workfile-is-latest t))) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
872 (vc-file-setprop file 'vc-working-revision working-revision)) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
873 ;; Check strict locking |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
874 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
875 (vc-file-setprop file 'vc-checkout-model |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
876 (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
|
877 'locking 'implicit)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
878 ;; Compute state of workfile version |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
879 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
880 (let ((locking-user |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
881 (vc-parse-buffer (concat "^locks[ \t\n]+[^;]*[ \t\n]+\\([^:]+\\):" |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
882 (regexp-quote working-revision) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
883 "[^0-9.]") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
884 1))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
885 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
886 ;; not locked |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
887 ((not locking-user) |
31476 | 888 (if (or workfile-is-latest |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
889 (vc-rcs-latest-on-branch-p file working-revision)) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
890 ;; 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
|
891 'up-to-date |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
892 ;; workfile version is not latest on branch |
94521
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94481
diff
changeset
|
893 'needs-update)) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
894 ;; locked by the calling user |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
895 ((and (stringp locking-user) |
68415
469f8d551600
(vc-rcs-fetch-master-state, vc-rcs-consult-headers): Pass FILE to
André Spiegel <spiegel@gnu.org>
parents:
68332
diff
changeset
|
896 (string= locking-user (vc-user-login-name file))) |
94481
ad6c174910db
Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
897 (if (or (eq (vc-rcs-checkout-model file) 'locking) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
898 workfile-is-latest |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
899 (vc-rcs-latest-on-branch-p file working-revision)) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
900 'edited |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
901 ;; 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
|
902 ;; 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
|
903 ;; 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
|
904 ;; to use `needs-merge' in this case. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
905 'needs-merge)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
906 ;; locked by somebody else |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
907 ((stringp locking-user) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
908 locking-user) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
909 (t |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
910 (error "Error getting state of RCS file"))))))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
911 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
912 (defun vc-rcs-consult-headers (file) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
913 "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
|
914 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
915 Returns: nil if no headers were found |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
916 'rev if a workfile revision was found |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
917 '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
|
918 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
919 ((not (get-file-buffer file)) nil) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
920 ((let (status version locking-user) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
921 (save-excursion |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
922 (set-buffer (get-file-buffer file)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
923 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
924 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
925 ;; search for $Id or $Header |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
926 ;; ------------------------- |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
927 ;; 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
|
928 ((or (and (search-forward "$Id\ : " nil t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
929 (looking-at "[^ ]+ \\([0-9.]+\\) ")) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
930 (and (progn (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
931 (search-forward "$Header\ : " nil t)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
932 (looking-at "[^ ]+ \\([0-9.]+\\) "))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
933 (goto-char (match-end 0)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
934 ;; if found, store the revision number ... |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
935 (setq version (match-string-no-properties 1)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
936 ;; ... and check for the locking state |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
937 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
938 ((looking-at |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
939 (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
|
940 "[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
|
941 "[^ ]+ [^ ]+ ")) ; author & state |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
942 (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
|
943 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
944 ;; unlocked revision |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
945 ((looking-at "\\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
946 (setq locking-user 'none) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
947 (setq status 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
948 ;; revision is locked by some user |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
949 ((looking-at "\\([^ ]+\\) \\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
950 (setq locking-user (match-string-no-properties 1)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
951 (setq status 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
952 ;; everything else: false |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
953 (nil))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
954 ;; unexpected information in |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
955 ;; keyword string --> quit |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
956 (nil))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
957 ;; search for $Revision |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
958 ;; -------------------- |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
959 ((re-search-forward (concat "\\$" |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
960 "Revision: \\([0-9.]+\\) \\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
961 nil t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
962 ;; if found, store the revision number ... |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
963 (setq version (match-string-no-properties 1)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
964 ;; and see if there's any lock information |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
965 (goto-char (point-min)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
966 (if (re-search-forward (concat "\\$" "Locker:") nil t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
967 (cond ((looking-at " \\([^ ]+\\) \\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
968 (setq locking-user (match-string-no-properties 1)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
969 (setq status 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
970 ((looking-at " *\\$") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
971 (setq locking-user 'none) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
972 (setq status 'rev-and-lock)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
973 (t |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
974 (setq locking-user 'none) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
975 (setq status 'rev-and-lock))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
976 (setq status 'rev))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
977 ;; else: nothing found |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
978 ;; ------------------- |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
979 (t nil))) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
82482
diff
changeset
|
980 (if status (vc-file-setprop file 'vc-working-revision version)) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
981 (and (eq status 'rev-and-lock) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
982 (vc-file-setprop file 'vc-state |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
983 (cond |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
984 ((eq locking-user 'none) 'up-to-date) |
76694
f35ed3fecce9
(vc-rcs-annotate-command):
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
75347
diff
changeset
|
985 ((string= locking-user (vc-user-login-name file)) |
68415
469f8d551600
(vc-rcs-fetch-master-state, vc-rcs-consult-headers): Pass FILE to
André Spiegel <spiegel@gnu.org>
parents:
68332
diff
changeset
|
986 'edited) |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
987 (t locking-user))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
988 ;; 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
|
989 ;; master file, because that would eliminate all the |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
990 ;; performance gain the headers brought us. We therefore |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
991 ;; 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
|
992 ;; 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
|
993 ;; 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
|
994 ;; 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
|
995 ;; locking is not used. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
996 (not (vc-mistrust-permissions file)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
997 (vc-up-to-date-p file) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
998 (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
|
999 (vc-file-setprop file 'vc-checkout-model 'locking) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1000 (vc-file-setprop file 'vc-checkout-model 'implicit))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1001 status)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1002 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1003 (defun vc-release-greater-or-equal (r1 r2) |
31476 | 1004 "Compare release numbers, represented as strings. |
1005 Release components are assumed cardinal numbers, not decimal fractions | |
1006 \(5.10 is a higher release than 5.9\). Omitted fields are considered | |
1007 lower \(5.6.7 is earlier than 5.6.7.1\). Comparison runs till the end | |
1008 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
|
1009 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
|
1010 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
|
1011 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
|
1012 (let (v1 v2 i1 i2) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1013 (catch 'done |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1014 (or (and (string-match "^\\.?\\([0-9]+\\)" r1) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1015 (setq i1 (match-end 0)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1016 (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
|
1017 (or (and (string-match "^\\.?\\([0-9]+\\)" r2) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1018 (setq i2 (match-end 0)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1019 (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
|
1020 (if (> v1 v2) (throw 'done t) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1021 (if (< v1 v2) (throw 'done nil) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1022 (throw 'done |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1023 (vc-release-greater-or-equal |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1024 (substring r1 i1) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1025 (substring r2 i2))))))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1026 (throw 'done t))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1027 (or (and (string-match "^\\.?\\([0-9]+\\)" r2) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1028 (throw 'done nil)) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1029 (throw 'done t))))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1030 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1031 (defun vc-rcs-release-p (release) |
31476 | 1032 "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
|
1033 (let ((installation (vc-rcs-system-release))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1034 (if (and installation |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1035 (not (eq installation 'unknown))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1036 (vc-release-greater-or-equal installation release)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1037 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1038 (defun vc-rcs-system-release () |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1039 "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
|
1040 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
|
1041 override this using variable `vc-rcs-release'. |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1042 |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1043 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
|
1044 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
|
1045 (or vc-rcs-release |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1046 (setq vc-rcs-release |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1047 (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
|
1048 (with-current-buffer (get-buffer "*vc*") |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1049 (vc-parse-buffer "^RCS version \\([0-9.]+ *.*\\)" 1))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1050 'unknown)))) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1051 |
31809
a2c432c6b343
(vc-rcs-workfile-is-newer): New function.
André Spiegel <spiegel@gnu.org>
parents:
31520
diff
changeset
|
1052 (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
|
1053 (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
|
1054 (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
|
1055 (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
|
1056 |
32094
027fb880735d
(vc-rcs-fetch-master-state): Parse and remember default branch
André Spiegel <spiegel@gnu.org>
parents:
32058
diff
changeset
|
1057 (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
|
1058 (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
|
1059 (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
|
1060 |
58320
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1061 (defun vc-rcs-parse (&optional buffer) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1062 "Parse current buffer, presumed to be in RCS-style masterfile format. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1063 Optional arg BUFFER specifies another buffer to parse. Return an alist |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1064 of two elements, w/ keys `headers' and `revisions' and values in turn |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1065 sub-alists. For `headers', the values unless otherwise specified are |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1066 strings and the keys are: |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1067 |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1068 desc -- description |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1069 head -- latest revision |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1070 branch -- the branch the \"head revision\" lies on; |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1071 absent if the head revision lies on the trunk |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1072 access -- ??? |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1073 symbols -- sub-alist of (SYMBOL . REVISION) elements |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1074 locks -- if file is checked out, something like \"ttn:1.7\" |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1075 strict -- t if \"strict locking\" is in effect, otherwise nil |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1076 comment -- may be absent; typically something like \"# \" or \"; \" |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1077 expand -- may be absent; ??? |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1078 |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1079 For `revisions', the car is REVISION (string), the cdr a sub-alist, |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1080 with string values (unless otherwise specified) and keys: |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1081 |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1082 date -- a time value (like that returned by `encode-time'); as a |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1083 special case, a year value less than 100 is augmented by 1900 |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1084 author -- username |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1085 state -- typically \"Exp\" or \"Rel\" |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1086 branches -- list of revisions that begin branches from this revision |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1087 next -- on the trunk: the chronologically-preceding revision, or \"\"; |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1088 on a branch: the chronologically-following revision, or \"\" |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1089 log -- change log entry |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1090 text -- for the head revision on the trunk, the body of the file; |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1091 other revisions have `:insn' instead |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1092 :insn -- for non-head revisions, a list of parsed instructions |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1093 in one of two forms, in both cases START meaning \"first |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1094 go to line START\": |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1095 - `(START k COUNT)' -- kill COUNT lines |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1096 - `(START i TEXT)' -- insert TEXT (a string) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1097 The list is in descending order by START. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1098 |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1099 The `:insn' key is a keyword to distinguish it as a vc-rcs.el extension." |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1100 (setq buffer (get-buffer (or buffer (current-buffer)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1101 (set-buffer buffer) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1102 ;; An RCS masterfile can be viewed as containing four regular (for the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1103 ;; most part) sections: (a) the "headers", (b) the "rev headers", (c) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1104 ;; the "description" and (d) the "rev bodies", in that order. In the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1105 ;; returned alist (see docstring), elements from (b) and (d) are |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1106 ;; combined pairwise to form the "revisions", while those from (a) and |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1107 ;; (c) are simply combined to form the "headers". |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1108 ;; |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1109 ;; Loosely speaking, each section contains a series of alternating |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1110 ;; "tags" and "printed representations". In the (b) and (d), many |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1111 ;; such series can appear, and a revision number on a line by itself |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1112 ;; precedes the series of tags and printed representations associated |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1113 ;; with it. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1114 ;; |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1115 ;; In (a) and (b), the printed representations (with the exception of |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1116 ;; the `comment' tag in the headers) terminate with a semicolon, which |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1117 ;; is NOT part of the "value" finally associated with the tag. All |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1118 ;; other printed representations are in "@@-format"; there is an "@", |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1119 ;; the middle part (to be translated into the value), another "@" and |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1120 ;; a newline. Each "@@" in the middle part indicates the position of |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1121 ;; a single "@" (and consequently the requirement of an additional |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1122 ;; initial step when translating to the value). |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1123 ;; |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1124 ;; Parser state includes vars that collect parts of the return value... |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1125 (let ((desc nil) (headers nil) (revs nil) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1126 ;; ... as well as vars that support a single-pass, tag-assisted, |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1127 ;; minimal-data-copying scan. Basically -- skirting around the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1128 ;; grouping by revision required in (b) and (d) -- we repeatedly |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1129 ;; and context-sensitively read a tag (that MUST be present), |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1130 ;; determine the bounds of the printed representation, translate |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1131 ;; it into a value, and push the tag plus value onto one of the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1132 ;; collection vars. Finally, we return the parse tree |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1133 ;; incorporating the values of the collection vars (see "rv"). |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1134 ;; |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1135 ;; A symbol or string to keep track of context (for error messages). |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1136 context |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1137 ;; A symbol, the current tag. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1138 tok |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1139 ;; Region (begin and end buffer positions) of the printed |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1140 ;; representation for the current tag. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1141 b e |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1142 ;; A list of buffer positions where "@@" can be found within the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1143 ;; printed representation region. For each location, we push two |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1144 ;; elements onto the list, 1+ and 2+ the location, respectively, |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1145 ;; with the 2+ appearing at the head. In this way, the expression |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1146 ;; `(,e ,@@-holes ,b) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1147 ;; describes regions that can be concatenated (in reverse order) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1148 ;; to "de-@@-format" the printed representation as the first step |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1149 ;; to translating it into some value. See internal func `gather'. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1150 @-holes) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1151 (flet ((sw () (skip-chars-forward " \t\n")) ; i.e., `[:space:]' |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1152 (at (tag) (save-excursion (eq tag (read buffer)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1153 (to-eol () (buffer-substring-no-properties |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1154 (point) (progn (forward-line 1) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1155 (1- (point))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1156 (to-semi () (setq b (point) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1157 e (progn (search-forward ";") |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1158 (1- (point))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1159 (to-one@ () (setq @-holes nil |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1160 b (progn (search-forward "@") (point)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1161 e (progn (while (and (search-forward "@") |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1162 (= ?@ (char-after)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1163 (progn |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1164 (push (point) @-holes) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1165 (forward-char 1) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1166 (push (point) @-holes)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1167 (1- (point))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1168 (tok+val (set-b+e name &optional proc) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1169 (unless (eq name (setq tok (read buffer))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1170 (error "Missing `%s' while parsing %s" name context)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1171 (sw) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1172 (funcall set-b+e) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1173 (cons tok (if proc |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1174 (funcall proc) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1175 (buffer-substring-no-properties b e)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1176 (k-semi (name &optional proc) (tok+val 'to-semi name proc)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1177 (gather () (let ((pairs `(,e ,@@-holes ,b)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1178 acc) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1179 (while pairs |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1180 (push (buffer-substring-no-properties |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1181 (cadr pairs) (car pairs)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1182 acc) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1183 (setq pairs (cddr pairs))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1184 (apply 'concat acc))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1185 (k-one@ (name &optional later) (tok+val 'to-one@ name |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1186 (if later |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1187 (lambda () t) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1188 'gather)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1189 (save-excursion |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1190 (goto-char (point-min)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1191 ;; headers |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1192 (setq context 'headers) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1193 (flet ((hpush (name &optional proc) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1194 (push (k-semi name proc) headers))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1195 (hpush 'head) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1196 (when (at 'branch) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1197 (hpush 'branch)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1198 (hpush 'access) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1199 (hpush 'symbols |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1200 (lambda () |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1201 (mapcar (lambda (together) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1202 (let ((two (split-string together ":"))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1203 (setcar two (intern (car two))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1204 (setcdr two (cadr two)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1205 two)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1206 (split-string |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1207 (buffer-substring-no-properties b e))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1208 (hpush 'locks)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1209 (push `(strict . ,(when (at 'strict) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1210 (search-forward ";") |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1211 t)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1212 headers) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1213 (when (at 'comment) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1214 (push (k-one@ 'comment) headers) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1215 (search-forward ";")) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1216 (when (at 'expand) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1217 (push (k-one@ 'expand) headers) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1218 (search-forward ";")) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1219 (setq headers (nreverse headers)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1220 ;; rev headers |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1221 (sw) (setq context 'rev-headers) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1222 (while (looking-at "[0-9]") |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1223 (push `(,(to-eol) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1224 ,(k-semi 'date |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1225 (lambda () |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1226 (let ((ls (mapcar 'string-to-number |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1227 (split-string |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1228 (buffer-substring-no-properties |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1229 b e) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1230 "\\.")))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1231 ;; Hack the year -- verified to be the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1232 ;; same algorithm used in RCS 5.7. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1233 (when (< (car ls) 100) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1234 (setcar ls (+ 1900 (car ls)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1235 (apply 'encode-time (nreverse ls))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1236 ,@(mapcar 'k-semi '(author state)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1237 ,(k-semi 'branches |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1238 (lambda () |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1239 (split-string |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1240 (buffer-substring-no-properties b e)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1241 ,(k-semi 'next)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1242 revs) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1243 (sw)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1244 (setq revs (nreverse revs)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1245 ;; desc |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1246 (sw) (setq context 'desc |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1247 desc (k-one@ 'desc)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1248 ;; rev bodies |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1249 (let (acc |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1250 ;; Element of `revs' that initially holds only header info. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1251 ;; "Pairwise combination" occurs when we add body info. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1252 rev |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1253 ;; Components of the editing commands (aside from the actual |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1254 ;; text) that comprise the `text' printed representations |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1255 ;; (not including the "head" revision). |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1256 cmd start act |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1257 ;; Ascending (reversed) `@-holes' which the internal func |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1258 ;; `incg' pops to effect incremental gathering. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1259 asc |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1260 ;; Function to extract text (for the `a' command), either |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1261 ;; `incg' or `buffer-substring-no-properties'. (This is |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1262 ;; for speed; strictly speaking, it is sufficient to use |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1263 ;; only the former since it behaves identically to the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1264 ;; latter in the absense of "@@".) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1265 sub) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1266 (flet ((incg (beg end) (let ((b beg) (e end) @-holes) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1267 (while (and asc (< (car asc) e)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1268 (push (pop asc) @-holes)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1269 ;; Self-deprecate when work is done. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1270 ;; Folding many dimensions into one. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1271 ;; Thanks B.Mandelbrot, for complex sum. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1272 ;; O beauteous math! --the Unvexed Bum |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1273 (unless asc |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1274 (setq sub 'buffer-substring-no-properties)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1275 (gather)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1276 (while (and (sw) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1277 (not (eobp)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1278 (setq context (to-eol) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1279 rev (or (assoc context revs) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1280 (error "Rev `%s' has body but no head" |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1281 context)))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1282 (push (k-one@ 'log) (cdr rev)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1283 ;; For rev body `text' tags, delay translation slightly... |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1284 (push (k-one@ 'text t) (cdr rev)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1285 ;; ... until we decide which tag and value is appropriate to |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1286 ;; collect. For the "head" revision, compute the value of the |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1287 ;; `text' printed representation by simple `gather'. For all |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1288 ;; other revisions, replace the `text' tag+value with `:insn' |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1289 ;; plus value, always scanning in-place. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1290 (if (string= context (cdr (assq 'head headers))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1291 (setcdr (cadr rev) (gather)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1292 (if @-holes |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1293 (setq asc (nreverse @-holes) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1294 sub 'incg) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1295 (setq sub 'buffer-substring-no-properties)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1296 (goto-char b) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1297 (setq acc nil) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1298 (while (< (point) e) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1299 (forward-char 1) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1300 (setq cmd (char-before) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1301 start (read (current-buffer)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1302 act (read (current-buffer))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1303 (forward-char 1) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1304 (push (case cmd |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1305 (?d |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1306 ;; `d' means "delete lines". |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1307 ;; For Emacs spirit, we use `k' for "kill". |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1308 `(,start k ,act)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1309 (?a |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1310 ;; `a' means "append after this line" but |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1311 ;; internally we normalize it so that START |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1312 ;; specifies the actual line for insert, thus |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1313 ;; requiring less hair in the realization algs. |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1314 ;; For Emacs spirit, we use `i' for "insert". |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1315 `(,(1+ start) i |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1316 ,(funcall sub (point) (progn (forward-line act) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1317 (point))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1318 (t (error "Bad command `%c' in `text' for rev `%s'" |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1319 cmd context))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1320 acc)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1321 (goto-char (1+ e)) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1322 (setcar (cdr rev) (cons :insn acc))))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1323 ;; rv |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1324 `((headers ,desc ,@headers) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1325 (revisions ,@revs))))) |
dee7926ded40
(vc-rcs-parse): New function.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
56953
diff
changeset
|
1326 |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1327 (provide 'vc-rcs) |
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1328 |
56953 | 1329 ;; arch-tag: 759b4916-5b0d-431d-b647-b185b8c652cf |
31383
860d7ac182e3
(vc-rcs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1330 ;;; vc-rcs.el ends here |