annotate lisp/vc-cvs.el @ 102023:a92cde59fabc

Handle editing of header fields. (rmail-old-headers): New variable. (rmail-edit-current-message): Set it, recording current headers. (rmail-cease-edit): Compute new headers and diff against old ones. Update the mbox buffer with the changes that were made. (rmail-edit-headers-alist): New function. (rmail-edit-diff-headers, rmail-edit-update-headers): New functions.
author Richard M. Stallman <rms@gnu.org>
date Sat, 14 Feb 2009 04:00:08 +0000
parents a9dc0e7c3f2b
children af4ee0cb7fb7
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1 ;;; vc-cvs.el --- non-resident support for CVS version-control
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
2
100186
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
3 ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
100908
a9dc0e7c3f2b Add 2009 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 100214
diff changeset
4 ;; 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
5
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
6 ;; Author: FSF (see vc.el for full credits)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
7 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
8
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
9 ;; This file is part of GNU Emacs.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
10
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
12 ;; it under the terms of the GNU General Public License as published by
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
13 ;; the Free Software Foundation, either version 3 of the License, or
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
14 ;; (at your option) any later version.
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
15
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
19 ;; GNU General Public License for more details.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
20
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
21 ;; You should have received a copy of the GNU General Public License
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
23
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
24 ;;; Commentary:
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
25
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
26 ;;; Code:
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
27
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
28 (eval-when-compile (require 'cl) (require 'vc))
35584
498bcc1e7c00 require vc
Sam Steingold <sds@gnu.org>
parents: 35569
diff changeset
29
81820
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
30 ;; Clear up the cache to force vc-call to check again and discover
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
31 ;; new functions when we reload this file.
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
32 (put 'CVS 'vc-functions nil)
35584
498bcc1e7c00 require vc
Sam Steingold <sds@gnu.org>
parents: 35569
diff changeset
33
94563
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
34 ;;; Properties of the backend.
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
35
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
36 (defun vc-cvs-revision-granularity () 'file)
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
37
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
38 (defun vc-cvs-checkout-model (files)
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
39 "CVS-specific version of `vc-checkout-model'."
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
40 (if (getenv "CVSREAD")
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
41 'announce
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
42 (let* ((file (if (consp files) (car files) files))
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
43 (attrib (file-attributes file)))
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
44 (or (vc-file-getprop file 'vc-checkout-model)
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
45 (vc-file-setprop
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
46 file 'vc-checkout-model
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
47 (if (and attrib ;; don't check further if FILE doesn't exist
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
48 ;; If the file is not writable (despite CVSREAD being
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
49 ;; undefined), this is probably because the file is being
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
50 ;; "watched" by other developers.
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
51 ;; (If vc-mistrust-permissions was t, we actually shouldn't
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
52 ;; trust this, but there is no other way to learn this from
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
53 ;; CVS at the moment (version 1.9).)
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
54 (string-match "r-..-..-." (nth 8 attrib)))
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
55 'announce
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
56 'implicit))))))
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
57
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
58 ;;;
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
59 ;;; Customization options
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
60 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
61
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
62 (defcustom vc-cvs-global-switches nil
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 99498
diff changeset
63 "Global switches to pass to any CVS command."
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
64 :type '(choice (const :tag "None" nil)
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
65 (string :tag "Argument String")
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
66 (repeat :tag "Argument List"
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
67 :value ("")
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
68 string))
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59443
diff changeset
69 :version "22.1"
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
70 :group 'vc)
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
71
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
72 (defcustom vc-cvs-register-switches nil
100202
d2b36bcb9a82 (vc-cvs-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100186
diff changeset
73 "Switches for registering a file into CVS.
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
74 A string or list of strings passed to the checkin program by
100202
d2b36bcb9a82 (vc-cvs-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100186
diff changeset
75 \\[vc-register]. If nil, use the value of `vc-register-switches'.
d2b36bcb9a82 (vc-cvs-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100186
diff changeset
76 If t, use no switches."
d2b36bcb9a82 (vc-cvs-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100186
diff changeset
77 :type '(choice (const :tag "Unspecified" nil)
d2b36bcb9a82 (vc-cvs-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100186
diff changeset
78 (const :tag "None" t)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
79 (string :tag "Argument String")
100202
d2b36bcb9a82 (vc-cvs-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100186
diff changeset
80 (repeat :tag "Argument List" :value ("") string))
31475
b25e22223eb9 DOc fixes.
Dave Love <fx@gnu.org>
parents: 31404
diff changeset
81 :version "21.1"
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
82 :group 'vc)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
83
35821
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
84 (defcustom vc-cvs-diff-switches nil
100186
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
85 "String or list of strings specifying switches for CVS diff under VC.
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
86 If nil, use the value of `vc-diff-switches'. If t, use no switches."
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
87 :type '(choice (const :tag "Unspecified" nil)
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
88 (const :tag "None" t)
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
89 (string :tag "Argument String")
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
90 (repeat :tag "Argument List" :value ("") string))
35821
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
91 :version "21.1"
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
92 :group 'vc)
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
93
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
94 (defcustom vc-cvs-header (or (cdr (assoc 'CVS vc-header-alist)) '("\$Id\$"))
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 99498
diff changeset
95 "Header keywords to be inserted by `vc-insert-headers'."
31475
b25e22223eb9 DOc fixes.
Dave Love <fx@gnu.org>
parents: 31404
diff changeset
96 :version "21.1"
35177
f7c511463b68 (vc-cvs-header): Fix :type.
Dave Love <fx@gnu.org>
parents: 35132
diff changeset
97 :type '(repeat string)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
98 :group 'vc)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
99
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
100 (defcustom vc-cvs-use-edit t
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 99498
diff changeset
101 "Non-nil means to use `cvs edit' to \"check out\" a file.
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
102 This is only meaningful if you don't use the implicit checkout model
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
103 \(i.e. if you have $CVSREAD set)."
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
104 :type 'boolean
31475
b25e22223eb9 DOc fixes.
Dave Love <fx@gnu.org>
parents: 31404
diff changeset
105 :version "21.1"
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
106 :group 'vc)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
107
98675
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
108 (defcustom vc-cvs-stay-local 'only-file
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 99498
diff changeset
109 "Non-nil means use local operations when possible for remote repositories.
38288
6934c28c6bc5 (vc-cvs-stay-local): doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37358
diff changeset
110 This avoids slow queries over the network and instead uses heuristics
6934c28c6bc5 (vc-cvs-stay-local): doc fix.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 37358
diff changeset
111 and past information to determine the current status of a file.
50671
0737c3a76291 (vc-cvs-stay-local): Keep the old default. Simplify doc string.
André Spiegel <spiegel@gnu.org>
parents: 50668
diff changeset
112
98675
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
113 If value is the symbol `only-file' `vc-dir' will connect to the
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
114 server, but heuristics will be used to determine the status for
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
115 all other VC operations.
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
116
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
117 The value can also be a regular expression or list of regular
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
118 expressions to match against the host name of a repository; then VC
50671
0737c3a76291 (vc-cvs-stay-local): Keep the old default. Simplify doc string.
André Spiegel <spiegel@gnu.org>
parents: 50668
diff changeset
119 only stays local for hosts that match it. Alternatively, the value
57913
f5d7d9bbc021 (vc-cvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 54465
diff changeset
120 can be a list of regular expressions where the first element is the
f5d7d9bbc021 (vc-cvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 54465
diff changeset
121 symbol `except'; then VC always stays local except for hosts matched
50671
0737c3a76291 (vc-cvs-stay-local): Keep the old default. Simplify doc string.
André Spiegel <spiegel@gnu.org>
parents: 50668
diff changeset
122 by these regular expressions."
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
123 :type '(choice (const :tag "Always stay local" t)
99190
e78a75586e10 (vc-cvs-stay-local): Fix typo in choice.
Martin Rudalics <rudalics@gmx.at>
parents: 99159
diff changeset
124 (const :tag "Only for file operations" only-file)
98675
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
125 (const :tag "Don't stay local" nil)
100186
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
126 (list :format "\nExamine hostname and %v"
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
127 :tag "Examine hostname ..."
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
128 (set :format "%v" :inline t
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
129 (const :format "%t" :tag "don't" except))
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
130 (regexp :format " stay local,\n%t: %v"
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
131 :tag "if it matches")
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
132 (repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
98576
5472a993dc3a (vc-cvs-dir-stay-local): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98532
diff changeset
133 :version "23.1"
5472a993dc3a (vc-cvs-dir-stay-local): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98532
diff changeset
134 :group 'vc)
5472a993dc3a (vc-cvs-dir-stay-local): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98532
diff changeset
135
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
136 (defcustom vc-cvs-sticky-date-format-string "%c"
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 99498
diff changeset
137 "Format string for mode-line display of sticky date.
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
138 Format is according to `format-time-string'. Only used if
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
139 `vc-cvs-sticky-tag-display' is t."
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
140 :type '(string)
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59443
diff changeset
141 :version "22.1"
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
142 :group 'vc)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
143
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
144 (defcustom vc-cvs-sticky-tag-display t
100171
d42aff5ca541 * align.el:
Lute Kamstra <lute@gnu.org>
parents: 99498
diff changeset
145 "Specify the mode-line display of sticky tags.
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
146 Value t means default display, nil means no display at all. If the
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
147 value is a function or macro, it is called with the sticky tag and
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
148 its' type as parameters, in that order. TYPE can have three different
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
149 values: `symbolic-name' (TAG is a string), `revision-number' (TAG is a
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
150 string) and `date' (TAG is a date as returned by `encode-time'). The
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
151 return value of the function or macro will be displayed as a string.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
152
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
153 Here's an example that will display the formatted date for sticky
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
154 dates and the word \"Sticky\" for sticky tag names and revisions.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
155
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
156 (lambda (tag type)
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
157 (cond ((eq type 'date) (format-time-string
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
158 vc-cvs-sticky-date-format-string tag))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
159 ((eq type 'revision-number) \"Sticky\")
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
160 ((eq type 'symbolic-name) \"Sticky\")))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
161
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
162 Here's an example that will abbreviate to the first character only,
47917
ca7641fe56ba (vc-cvs-sticky-tag-display): Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 47840
diff changeset
163 any text before the first occurrence of `-' for sticky symbolic tags.
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
164 If the sticky tag is a revision number, the word \"Sticky\" is
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
165 displayed. Date and time is displayed for sticky dates.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
166
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
167 (lambda (tag type)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
168 (cond ((eq type 'date) (format-time-string \"%Y%m%d %H:%M\" tag))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
169 ((eq type 'revision-number) \"Sticky\")
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
170 ((eq type 'symbolic-name)
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
171 (condition-case nil
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
172 (progn
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
173 (string-match \"\\\\([^-]*\\\\)\\\\(.*\\\\)\" tag)
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
174 (concat (substring (match-string 1 tag) 0 1) \":\"
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
175 (substring (match-string 2 tag) 1 nil)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
176 (error tag))))) ; Fall-back to given tag name.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
177
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
178 See also variable `vc-cvs-sticky-date-format-string'."
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
179 :type '(choice boolean function)
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59443
diff changeset
180 :version "22.1"
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
181 :group 'vc)
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
182
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
183 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
184 ;;; Internal variables
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
185 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
186
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
187
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
188 ;;;
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
189 ;;; State-querying functions
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
190 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
191
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
192 ;;;###autoload (defun vc-cvs-registered (f)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
193 ;;;###autoload (when (file-readable-p (expand-file-name
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
194 ;;;###autoload "CVS/Entries" (file-name-directory f)))
47811
8b1c72f30fea (vc-cvs-registered): In the autoload version use load instead of
Markus Rost <rost@math.uni-bielefeld.de>
parents: 47807
diff changeset
195 ;;;###autoload (load "vc-cvs")
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
196 ;;;###autoload (vc-cvs-registered f)))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
197
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
198 (defun vc-cvs-registered (file)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
199 "Check if FILE is CVS registered."
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
200 (let ((dirname (or (file-name-directory file) ""))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
201 (basename (file-name-nondirectory file))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
202 ;; make sure that the file name is searched case-sensitively
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
203 (case-fold-search nil))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
204 (if (file-readable-p (expand-file-name "CVS/Entries" dirname))
95591
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
205 (or (string= basename "")
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
206 (with-temp-buffer
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
207 (vc-cvs-get-entries dirname)
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
208 (goto-char (point-min))
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
209 (cond ((re-search-forward
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
210 (concat "^/" (regexp-quote basename) "/[^/]") nil t)
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
211 (beginning-of-line)
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
212 (vc-cvs-parse-entry file)
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
213 t)
fff438dcde9e (vc-cvs-registered): Consider a directory with a CVS subdirectory to be registered.
Sam Steingold <sds@gnu.org>
parents: 95524
diff changeset
214 (t nil))))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
215 nil)))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
216
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
217 (defun vc-cvs-state (file)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
218 "CVS-specific version of `vc-state'."
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
219 (if (vc-stay-local-p file)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
220 (let ((state (vc-file-getprop file 'vc-state)))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
221 ;; If we should stay local, use the heuristic but only if
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
222 ;; we don't have a more precise state already available.
58640
0241e1689d7f (vc-cvs-state): Handle the case where vc-state is still nil.
André Spiegel <spiegel@gnu.org>
parents: 57916
diff changeset
223 (if (memq state '(up-to-date edited nil))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
224 (vc-cvs-state-heuristic file)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
225 state))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
226 (with-temp-buffer
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
227 (cd (file-name-directory file))
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
228 (vc-cvs-command t 0 file "status")
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
229 (vc-cvs-parse-status t))))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
230
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
231 (defun vc-cvs-state-heuristic (file)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
232 "CVS-specific state heuristic."
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
233 ;; If the file has not changed since checkout, consider it `up-to-date'.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
234 ;; Otherwise consider it `edited'.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
235 (let ((checkout-time (vc-file-getprop file 'vc-checkout-time))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
236 (lastmod (nth 5 (file-attributes file))))
93124
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93118
diff changeset
237 (cond
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93118
diff changeset
238 ((equal checkout-time lastmod) 'up-to-date)
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93118
diff changeset
239 ((string= (vc-working-revision file) "0") 'added)
95425
72ac0c4a8ecd (vc-cvs-state-heuristic, vc-cvs-parse-status): Try and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95321
diff changeset
240 ((null checkout-time) 'unregistered)
93124
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93118
diff changeset
241 (t 'edited))))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
242
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
243 (defun vc-cvs-working-revision (file)
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
244 "CVS-specific version of `vc-working-revision'."
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
245 ;; There is no need to consult RCS headers under CVS, because we
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
246 ;; get the workfile version for free when we recognize that a file
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
247 ;; is registered in CVS.
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
248 (vc-cvs-registered file)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
249 (vc-file-getprop file 'vc-working-revision))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
250
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31384
diff changeset
251 (defun vc-cvs-mode-line-string (file)
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31384
diff changeset
252 "Return string for placement into the modeline for FILE.
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
253 Compared to the default implementation, this function does two things:
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
254 Handle the special case of a CVS file that is added but not yet
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
255 committed and support display of sticky tags."
82027
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
256 (let* ((sticky-tag (vc-file-getprop file 'vc-cvs-sticky-tag))
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
257 help-echo
93124
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93118
diff changeset
258 (string
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93118
diff changeset
259 (let ((def-ml (vc-default-mode-line-string 'CVS file)))
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
260 (setq help-echo
93124
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93118
diff changeset
261 (get-text-property 0 'help-echo def-ml))
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93118
diff changeset
262 def-ml)))
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
263 (propertize
82027
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
264 (if (zerop (length sticky-tag))
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
265 string
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
266 (setq help-echo (format "%s on the '%s' branch"
82027
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
267 help-echo sticky-tag))
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
268 (concat string "[" sticky-tag "]"))
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
269 'help-echo help-echo)))
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31384
diff changeset
270
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
271
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
272 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
273 ;;; State-changing functions
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
274 ;;;
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
275
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
276 (defun vc-cvs-register (files &optional rev comment)
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
277 "Register FILES into the CVS version-control system.
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
278 COMMENT can be used to provide an initial description of FILES.
100202
d2b36bcb9a82 (vc-cvs-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100186
diff changeset
279 Passes either `vc-cvs-register-switches' or `vc-register-switches'
d2b36bcb9a82 (vc-cvs-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100186
diff changeset
280 to the CVS command."
92163
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
281 ;; Register the directories if needed.
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
282 (let (dirs)
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
283 (dolist (file files)
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
284 (and (not (vc-cvs-responsible-p file))
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
285 (vc-cvs-could-register file)
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
286 (push (directory-file-name (file-name-directory file)) dirs)))
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
287 (if dirs (vc-cvs-register dirs)))
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
288 (apply 'vc-cvs-command nil 0 files
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
289 "add"
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
290 (and comment (string-match "[^\t\n ]" comment)
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
291 (concat "-m" comment))
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
292 (vc-switches 'CVS 'register)))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
293
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
294 (defun vc-cvs-responsible-p (file)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
295 "Return non-nil if CVS thinks it is responsible for FILE."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
296 (file-directory-p (expand-file-name "CVS"
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
297 (if (file-directory-p file)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
298 file
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
299 (file-name-directory file)))))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
300
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
301 (defun vc-cvs-could-register (file)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
302 "Return non-nil if FILE could be registered in CVS.
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
303 This is only possible if CVS is managing FILE's directory or one of
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
304 its parents."
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
305 (let ((dir file))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
306 (while (and (stringp dir)
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
307 (not (equal dir (setq dir (file-name-directory dir))))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
308 dir)
100214
188994c9d7fe (vc-cvs-could-register): Don't use file-directory-p to
Lute Kamstra <lute@gnu.org>
parents: 100202
diff changeset
309 (setq dir (if (file-exists-p
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
310 (expand-file-name "CVS/Entries" dir))
100214
188994c9d7fe (vc-cvs-could-register): Don't use file-directory-p to
Lute Kamstra <lute@gnu.org>
parents: 100202
diff changeset
311 t
188994c9d7fe (vc-cvs-could-register): Don't use file-directory-p to
Lute Kamstra <lute@gnu.org>
parents: 100202
diff changeset
312 (directory-file-name dir))))
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
313 (eq dir t)))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
314
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
315 (defun vc-cvs-checkin (files rev comment)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
316 "CVS-specific version of `vc-backend-checkin'."
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
317 (unless (or (not rev) (vc-cvs-valid-revision-number-p rev))
50910
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
318 (if (not (vc-cvs-valid-symbolic-tag-name-p rev))
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
319 (error "%s is not a valid symbolic tag name" rev)
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
320 ;; If the input revison is a valid symbolic tag name, we create it
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
321 ;; as a branch, commit and switch to it.
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
322 (apply 'vc-cvs-command nil 0 files "tag" "-b" (list rev))
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
323 (apply 'vc-cvs-command nil 0 files "update" "-r" (list rev))
81976
69946487f7b5 Fix two variable-reference bugs.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81962
diff changeset
324 (mapc (lambda (file) (vc-file-setprop file 'vc-cvs-sticky-tag rev))
69946487f7b5 Fix two variable-reference bugs.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81962
diff changeset
325 files)))
69946487f7b5 Fix two variable-reference bugs.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81962
diff changeset
326 (let ((status (apply 'vc-cvs-command nil 1 files
50910
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
327 "ci" (if rev (concat "-r" rev))
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
328 (concat "-m" comment)
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
329 (vc-switches 'CVS 'checkin))))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
330 (set-buffer "*vc*")
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
331 (goto-char (point-min))
32948
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
332 (when (not (zerop status))
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
333 ;; Check checkin problem.
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
334 (cond
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
335 ((re-search-forward "Up-to-date check failed" nil t)
81977
ef9ebdaeea06 vc-cvs-checkin had some reference problems, now fixed.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81976
diff changeset
336 (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge))
ef9ebdaeea06 vc-cvs-checkin had some reference problems, now fixed.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81976
diff changeset
337 files)
87139
f358a2fd5895 Fix buggy calls to `error'.
Deepak Goel <deego@gnufans.org>
parents: 86041
diff changeset
338 (error "%s" (substitute-command-keys
32948
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
339 (concat "Up-to-date check failed: "
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
340 "type \\[vc-next-action] to merge in changes"))))
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
341 (t
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
342 (pop-to-buffer (current-buffer))
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
343 (goto-char (point-min))
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
344 (shrink-window-if-larger-than-buffer)
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
345 (error "Check-in failed"))))
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
346 ;; Single-file commit? Then update the revision by parsing the buffer.
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
347 ;; Otherwise we can't necessarily tell what goes with what; clear
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
348 ;; its properties so they have to be refetched.
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
349 (if (= (length files) 1)
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
350 (vc-file-setprop
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
351 (car files) 'vc-working-revision
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
352 (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
94481
ad6c174910db Make `checkout-model' apply to filesets.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 94210
diff changeset
353 (mapc 'vc-file-clearprops files))
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
354 ;; Anyway, forget the checkout model of the file, because we might have
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
355 ;; guessed wrong when we found the file. After commit, we can
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
356 ;; tell it from the permissions of the file (see
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
357 ;; vc-cvs-checkout-model).
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
358 (mapc (lambda (file) (vc-file-setprop file 'vc-checkout-model nil))
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
359 files)
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
360
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
361 ;; if this was an explicit check-in (does not include creation of
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
362 ;; a branch), remove the sticky tag.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
363 (if (and rev (not (vc-cvs-valid-symbolic-tag-name-p rev)))
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
364 (vc-cvs-command nil 0 files "update" "-A"))))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
365
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
366 (defun vc-cvs-find-revision (file rev buffer)
47799
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
367 (apply 'vc-cvs-command
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
368 buffer 0 file
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
369 "-Q" ; suppress diagnostic output
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
370 "update"
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
371 (and rev (not (string= rev ""))
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
372 (concat "-r" rev))
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
373 "-p"
50910
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
374 (vc-switches 'CVS 'checkout)))
47799
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
375
81764
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
376 (defun vc-cvs-checkout (file &optional editable rev)
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
377 "Checkout a revision of FILE into the working area.
35132
78bce41f17c5 (vc-cvs-latest-on-branch-p): Removed.
André Spiegel <spiegel@gnu.org>
parents: 33637
diff changeset
378 EDITABLE non-nil means that the file should be writable.
81764
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
379 REV is the revision to check out."
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
380 (message "Checking out %s..." file)
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
381 ;; Change buffers to get local value of vc-checkout-switches.
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
382 (with-current-buffer (or (get-file-buffer file) (current-buffer))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
383 (if (and (file-exists-p file) (not rev))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
384 ;; If no revision was specified, just make the file writable
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
385 ;; if necessary (using `cvs-edit' if requested).
94563
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
386 (and editable (not (eq (vc-cvs-checkout-model (list file)) 'implicit))
81764
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
387 (if vc-cvs-use-edit
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
388 (vc-cvs-command nil 0 file "edit")
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
389 (set-file-modes file (logior (file-modes file) 128))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
390 (if (equal file buffer-file-name) (toggle-read-only -1))))
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
391 ;; Check out a particular revision (or recreate the file).
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
392 (vc-file-setprop file 'vc-working-revision nil)
81764
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
393 (apply 'vc-cvs-command nil 0 file
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
394 (and editable "-w")
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
395 "update"
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
396 (when rev
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
397 (unless (eq rev t)
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
398 ;; default for verbose checkout: clear the
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
399 ;; sticky tag so that the actual update will
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
400 ;; get the head of the trunk
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
401 (if (string= rev "")
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
402 "-A"
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
403 (concat "-r" rev))))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
404 (vc-switches 'CVS 'checkout)))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
405 (vc-mode-line file))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
406 (message "Checking out %s...done" file))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
407
50923
3eab629b1239 (vc-cvs-mode-line-string): Use vc-default-mode-line-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50910
diff changeset
408 (defun vc-cvs-delete-file (file)
94534
37fa7ba3820c Don't commit right after deletion.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94522
diff changeset
409 (vc-cvs-command nil 0 file "remove" "-f"))
50923
3eab629b1239 (vc-cvs-mode-line-string): Use vc-default-mode-line-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50910
diff changeset
410
39001
d13c2139752b (vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents: 38288
diff changeset
411 (defun vc-cvs-revert (file &optional contents-done)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
412 "Revert FILE to the working revision on which it was based."
81764
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
413 (vc-default-revert 'CVS file contents-done)
94563
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94542
diff changeset
414 (unless (eq (vc-cvs-checkout-model (list file)) 'implicit)
39001
d13c2139752b (vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents: 38288
diff changeset
415 (if vc-cvs-use-edit
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
416 (vc-cvs-command nil 0 file "unedit")
39001
d13c2139752b (vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents: 38288
diff changeset
417 ;; Make the file read-only by switching off all w-bits
d13c2139752b (vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents: 38288
diff changeset
418 (set-file-modes file (logand (file-modes file) 3950)))))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
419
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
420 (defun vc-cvs-merge (file first-revision &optional second-revision)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
421 "Merge changes into current working copy of FILE.
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
422 The changes are between FIRST-REVISION and SECOND-REVISION."
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
423 (vc-cvs-command nil 0 file
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
424 "update" "-kk"
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
425 (concat "-j" first-revision)
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
426 (concat "-j" second-revision))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
427 (vc-file-setprop file 'vc-state 'edited)
50645
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
428 (with-current-buffer (get-buffer "*vc*")
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
429 (goto-char (point-min))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
430 (if (re-search-forward "conflicts during merge" nil t)
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
431 (progn
93956
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
432 (vc-file-setprop file 'vc-state 'conflict)
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
433 ;; signal error
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
434 1)
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
435 (vc-file-setprop file 'vc-state 'edited)
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
436 ;; signal success
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
437 0)))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
438
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
439 (defun vc-cvs-merge-news (file)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
440 "Merge in any new changes made to FILE."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
441 (message "Merging changes into %s..." file)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
442 ;; (vc-file-setprop file 'vc-working-revision nil)
50645
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
443 (vc-file-setprop file 'vc-checkout-time 0)
87739
28dc34f6a246 * vc.el (vc-update): Resolve conflicts if necessary instead of
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87649
diff changeset
444 (vc-cvs-command nil nil file "update")
50645
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
445 ;; Analyze the merge result reported by CVS, and set
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
446 ;; file properties accordingly.
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
447 (with-current-buffer (get-buffer "*vc*")
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
448 (goto-char (point-min))
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
449 ;; get new working revision
50645
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
450 (if (re-search-forward
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
451 "^Merging differences between [0-9.]* and \\([0-9.]*\\) into" nil t)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
452 (vc-file-setprop file 'vc-working-revision (match-string 1))
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
453 (vc-file-setprop file 'vc-working-revision nil))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
454 ;; get file status
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
455 (prog1
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
456 (if (eq (buffer-size) 0)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
457 0 ;; there were no news; indicate success
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
458 (if (re-search-forward
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
459 (concat "^\\([CMUP] \\)?"
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
460 (regexp-quote (file-name-nondirectory file))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
461 "\\( already contains the differences between \\)?")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
462 nil t)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
463 (cond
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
464 ;; Merge successful, we are in sync with repository now
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
465 ((or (match-string 2)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
466 (string= (match-string 1) "U ")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
467 (string= (match-string 1) "P "))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
468 (vc-file-setprop file 'vc-state 'up-to-date)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
469 (vc-file-setprop file 'vc-checkout-time
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
470 (nth 5 (file-attributes file)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
471 0);; indicate success to the caller
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
472 ;; Merge successful, but our own changes are still in the file
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
473 ((string= (match-string 1) "M ")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
474 (vc-file-setprop file 'vc-state 'edited)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
475 0);; indicate success to the caller
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
476 ;; Conflicts detected!
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
477 (t
93956
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
478 (vc-file-setprop file 'vc-state 'conflict)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
479 1);; signal the error to the caller
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
480 )
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
481 (pop-to-buffer "*vc*")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
482 (error "Couldn't analyze cvs update result")))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
483 (message "Merging changes into %s...done" file))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
484
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: 87427
diff changeset
485 (defun vc-cvs-modify-change-comment (files rev comment)
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
486 "Modify the change comments for FILES on a specified REV.
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: 87427
diff changeset
487 Will fail unless you have administrative privileges on the repo."
93867
520490ae1b9a * vc-rcs.el (vc-rcs-modify-change-comment):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93461
diff changeset
488 (vc-cvs-command nil 0 files "admin" (concat "-m" rev ":" comment)))
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
489
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
490 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
491 ;;; History functions
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
492 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
493
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
494 (defun vc-cvs-print-log (files &optional buffer)
87427
1aea302af710 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87424
diff changeset
495 "Get change logs associated with FILES."
1aea302af710 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87424
diff changeset
496 ;; It's just the catenation of the individual logs.
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
497 (vc-cvs-command
54465
2e4ddb8bfffd (vc-cvs-print-log, vc-cvs-diff): Add optional BUFFER argument.
André Spiegel <spiegel@gnu.org>
parents: 53631
diff changeset
498 buffer
86002
613df1ba1584 * vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85458
diff changeset
499 (if (vc-stay-local-p files) 'async 0)
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
500 files "log"))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
501
94806
eedf64b515f0 Remove wash-log from the VC backend API.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94729
diff changeset
502 (defun vc-cvs-comment-history (file)
eedf64b515f0 Remove wash-log from the VC backend API.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94729
diff changeset
503 "Get comment history of a file."
eedf64b515f0 Remove wash-log from the VC backend API.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94729
diff changeset
504 (vc-call-backend 'RCS 'comment-history file))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
505
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
506 (defun vc-cvs-diff (files &optional oldvers newvers buffer)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
507 "Get a difference report using CVS between two revisions of FILE."
86041
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
508 (let* ((async (and (not vc-disable-async-diff)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
509 (vc-stay-local-p files)))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
510 (invoke-cvs-diff-list nil)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
511 status)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
512 ;; Look through the file list and see if any files have backups
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
513 ;; that can be used to do a plain "diff" instead of "cvs diff".
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
514 (dolist (file files)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
515 (let ((ov oldvers)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
516 (nv newvers))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
517 (when (or (not ov) (string-equal ov ""))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
518 (setq ov (vc-working-revision file)))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
519 (when (string-equal nv "")
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
520 (setq nv nil))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
521 (let ((file-oldvers (vc-version-backup-file file ov))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
522 (file-newvers (if (not nv)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
523 file
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
524 (vc-version-backup-file file nv)))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
525 (coding-system-for-read (vc-coding-system-for-diff file)))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
526 (if (and file-oldvers file-newvers)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
527 (progn
100186
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
528 ;; This used to append diff-switches and vc-diff-switches,
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
529 ;; which was consistent with the vc-diff-switches doc at that
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
530 ;; time, but not with the actual behavior of any other VC diff.
86041
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
531 (apply 'vc-do-command (or buffer "*vc-diff*") 1 "diff" nil
100186
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
532 ;; Not a CVS diff, does not use vc-cvs-diff-switches.
c9d564389052 (vc-cvs-diff-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents: 100171
diff changeset
533 (append (vc-switches nil 'diff)
86041
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
534 (list (file-relative-name file-oldvers)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
535 (file-relative-name file-newvers))))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
536 (setq status 0))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
537 (push file invoke-cvs-diff-list)))))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
538 (when invoke-cvs-diff-list
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
539 (setq status (apply 'vc-cvs-command (or buffer "*vc-diff*")
50910
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
540 (if async 'async 1)
86041
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
541 invoke-cvs-diff-list "diff"
50910
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
542 (and oldvers (concat "-r" oldvers))
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
543 (and newvers (concat "-r" newvers))
8c4130079acf (vc-cvs-register, vc-cvs-checkin, vc-cvs-find-version, vc-cvs-diff)
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50909
diff changeset
544 (vc-switches 'CVS 'diff))))
86041
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
545 (if async 1 status))) ; async diff, pessimistic assumption
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
546
81820
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
547 (defconst vc-cvs-annotate-first-line-re "^[0-9]")
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
548
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
549 (defun vc-cvs-annotate-process-filter (process string)
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
550 (setq string (concat (process-get process 'output) string))
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
551 (if (not (string-match vc-cvs-annotate-first-line-re string))
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
552 ;; Still waiting for the first real line.
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
553 (process-put process 'output string)
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
554 (let ((vc-filter (process-get process 'vc-filter)))
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
555 (set-process-filter process vc-filter)
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
556 (funcall vc-filter process (substring string (match-beginning 0))))))
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
557
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
558 (defun vc-cvs-annotate-command (file buffer &optional revision)
33545
5411250e7971 (vc-cvs-annotate-command): New optional arg VERSION. Use
André Spiegel <spiegel@gnu.org>
parents: 32959
diff changeset
559 "Execute \"cvs annotate\" on FILE, inserting the contents in BUFFER.
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
560 Optional arg REVISION is a revision to annotate from."
81820
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
561 (vc-cvs-command buffer
86002
613df1ba1584 * vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85458
diff changeset
562 (if (vc-stay-local-p file)
81820
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
563 'async 0)
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
564 file "annotate"
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
565 (if revision (concat "-r" revision)))
81820
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
566 ;; Strip the leading few lines.
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
567 (let ((proc (get-buffer-process buffer)))
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
568 (if proc
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
569 ;; If running asynchronously, use a process filter.
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
570 (progn
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
571 (process-put proc 'vc-filter (process-filter proc))
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
572 (set-process-filter proc 'vc-cvs-annotate-process-filter))
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
573 (with-current-buffer buffer
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
574 (goto-char (point-min))
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
575 (re-search-forward vc-cvs-annotate-first-line-re)
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
576 (delete-region (point-min) (1- (point)))))))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
577
96213
09da7727f35f * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96123
diff changeset
578 (declare-function vc-annotate-convert-time "vc-annotate" (time))
09da7727f35f * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96123
diff changeset
579
40171
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
580 (defun vc-cvs-annotate-current-time ()
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
581 "Return the current time, based at midnight of the current day, and
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
582 encoded as fractional days."
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
583 (vc-annotate-convert-time
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
584 (apply 'encode-time 0 0 0 (nthcdr 3 (decode-time (current-time))))))
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
585
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
586 (defun vc-cvs-annotate-time ()
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
587 "Return the time of the next annotation (as fraction of days)
42206
0f4506820432 Doc fix.
Pavel Janík <Pavel@Janik.cz>
parents: 41707
diff changeset
588 systime, or nil if there is none."
57916
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
589 (let* ((bol (point))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
590 (cache (get-text-property bol 'vc-cvs-annotate-time))
84583
52ca2a6a41bf (vc-cvs-annotate-time): Use inhibit-read-only and inhibit-modification-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 82140
diff changeset
591 (inhibit-read-only t)
52ca2a6a41bf (vc-cvs-annotate-time): Use inhibit-read-only and inhibit-modification-hooks.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 82140
diff changeset
592 (inhibit-modification-hooks t))
57916
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
593 (cond
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
594 (cache)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
595 ((looking-at
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
596 "^\\S-+\\s-+\\S-+\\s-+\\([0-9]+\\)-\\(\\sw+\\)-\\([0-9]+\\)): ")
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
597 (let ((day (string-to-number (match-string 1)))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
598 (month (cdr (assq (intern (match-string 2))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
599 '((Jan . 1) (Feb . 2) (Mar . 3)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
600 (Apr . 4) (May . 5) (Jun . 6)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
601 (Jul . 7) (Aug . 8) (Sep . 9)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
602 (Oct . 10) (Nov . 11) (Dec . 12)))))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
603 (year (let ((tmp (string-to-number (match-string 3))))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
604 ;; Years 0..68 are 2000..2068.
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
605 ;; Years 69..99 are 1969..1999.
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
606 (+ (cond ((> 69 tmp) 2000)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
607 ((> 100 tmp) 1900)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
608 (t 0))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
609 tmp))))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
610 (put-text-property
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
611 bol (1+ bol) 'vc-cvs-annotate-time
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
612 (setq cache (cons
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
613 ;; Position at end makes for nicer overlay result.
79690
be4e5f45a3eb (vc-cvs-annotate-time): Don't move backward when text
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78359
diff changeset
614 ;; Don't put actual buffer pos here, but only relative
be4e5f45a3eb (vc-cvs-annotate-time): Don't move backward when text
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78359
diff changeset
615 ;; distance, so we don't ever move backward in the
be4e5f45a3eb (vc-cvs-annotate-time): Don't move backward when text
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78359
diff changeset
616 ;; goto-char below, even if the text is moved.
be4e5f45a3eb (vc-cvs-annotate-time): Don't move backward when text
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78359
diff changeset
617 (- (match-end 0) (match-beginning 0))
57916
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
618 (vc-annotate-convert-time
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
619 (encode-time 0 0 0 day month year))))))))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
620 (when cache
79690
be4e5f45a3eb (vc-cvs-annotate-time): Don't move backward when text
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78359
diff changeset
621 (goto-char (+ bol (car cache))) ; Fontify from here to eol.
57916
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
622 (cdr cache)))) ; days (float)
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
623
53631
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
624 (defun vc-cvs-annotate-extract-revision-at-line ()
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
625 (save-excursion
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
626 (beginning-of-line)
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
627 (if (re-search-forward "^\\([0-9]+\\.[0-9]+\\(\\.[0-9]+\\)*\\) +("
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
628 (line-end-position) t)
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
629 (match-string-no-properties 1)
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
630 nil)))
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
631
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
632 ;;;
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
633 ;;; Tag system
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
634 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
635
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
636 (defun vc-cvs-create-tag (dir name branchp)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
637 "Assign to DIR's current revision a given NAME.
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
638 If BRANCHP is non-nil, the name is created as a branch (and the current
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
639 workspace is immediately moved to that new branch)."
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
640 (vc-cvs-command nil 0 dir "tag" "-c" (if branchp "-b") name)
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
641 (when branchp (vc-cvs-command nil 0 dir "update" "-r" name)))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
642
95020
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
643 (defun vc-cvs-retrieve-tag (dir name update)
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
644 "Retrieve a tag at and below DIR.
4da572dc4992 Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94847
diff changeset
645 NAME is the name of the tag; if it is empty, do a `cvs update'.
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
646 If UPDATE is non-nil, then update (resynch) any affected buffers."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
647 (with-current-buffer (get-buffer-create "*vc*")
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
648 (let ((default-directory dir)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
649 (sticky-tag))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
650 (erase-buffer)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
651 (if (or (not name) (string= name ""))
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
652 (vc-cvs-command t 0 nil "update")
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
653 (vc-cvs-command t 0 nil "update" "-r" name)
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
654 (setq sticky-tag name))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
655 (when update
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
656 (goto-char (point-min))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
657 (while (not (eobp))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
658 (if (looking-at "\\([CMUP]\\) \\(.*\\)")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
659 (let* ((file (expand-file-name (match-string 2) dir))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
660 (state (match-string 1))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
661 (buffer (find-buffer-visiting file)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
662 (when buffer
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
663 (cond
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
664 ((or (string= state "U")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
665 (string= state "P"))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
666 (vc-file-setprop file 'vc-state 'up-to-date)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
667 (vc-file-setprop file 'vc-working-revision nil)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
668 (vc-file-setprop file 'vc-checkout-time
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
669 (nth 5 (file-attributes file))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
670 ((or (string= state "M")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
671 (string= state "C"))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
672 (vc-file-setprop file 'vc-state 'edited)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
673 (vc-file-setprop file 'vc-working-revision nil)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
674 (vc-file-setprop file 'vc-checkout-time 0)))
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
675 (vc-file-setprop file 'vc-cvs-sticky-tag sticky-tag)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
676 (vc-resynch-buffer file t t))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
677 (forward-line 1))))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
678
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
679
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
680 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
681 ;;; Miscellaneous
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
682 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
683
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
684 (defalias 'vc-cvs-make-version-backups-p 'vc-stay-local-p
50645
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
685 "Return non-nil if version backups should be made for FILE.")
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
686
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
687 (defun vc-cvs-check-headers ()
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
688 "Check if the current file has any headers in it."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
689 (save-excursion
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
690 (goto-char (point-min))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
691 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
692 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
693
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
694
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
695 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
696 ;;; Internal functions
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
697 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
698
81962
0744b309302b Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81821
diff changeset
699 (defun vc-cvs-command (buffer okstatus files &rest flags)
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
700 "A wrapper around `vc-do-command' for use in vc-cvs.el.
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
701 The difference to vc-do-command is that this function always invokes `cvs',
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
702 and that it passes `vc-cvs-global-switches' to it before FLAGS."
94847
5e64dca662f0 Remove assumption about what nil means as a first arument to vc-do-command.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94806
diff changeset
703 (apply 'vc-do-command (or buffer "*vc*") okstatus "cvs" files
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
704 (if (stringp vc-cvs-global-switches)
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
705 (cons vc-cvs-global-switches flags)
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
706 (append vc-cvs-global-switches
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
707 flags))))
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
708
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
709 (defalias 'vc-cvs-stay-local-p 'vc-stay-local-p) ;Back-compatibility.
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
710
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
711 (defun vc-cvs-repository-hostname (dirname)
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
712 "Hostname of the CVS server associated to workarea DIRNAME."
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
713 (let ((rootname (expand-file-name "CVS/Root" dirname)))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
714 (when (file-readable-p rootname)
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
715 (with-temp-buffer
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
716 (let ((coding-system-for-read
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
717 (or file-name-coding-system
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
718 default-file-name-coding-system)))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
719 (vc-insert-file rootname))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
720 (goto-char (point-min))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
721 (nth 2 (vc-cvs-parse-root
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
722 (buffer-substring (point)
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
723 (line-end-position))))))))
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
724
99498
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
725 (defun vc-cvs-parse-uhp (path)
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
726 "parse user@host/path into (user@host /path)"
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
727 (if (string-match "\\([^/]+\\)\\(/.*\\)" path)
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
728 (list (match-string 1 path) (match-string 2 path))
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
729 (list nil path)))
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
730
50898
8806616471e2 (vc-cvs-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50671
diff changeset
731 (defun vc-cvs-parse-root (root)
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
732 "Split CVS ROOT specification string into a list of fields.
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
733 A CVS root specification of the form
99498
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
734 [:METHOD:][[USER@]HOSTNAME]:?/path/to/repository
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
735 is converted to a normalized record with the following structure:
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
736 \(METHOD USER HOSTNAME CVS-ROOT).
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
737 The default METHOD for a CVS root of the form
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
738 /path/to/repository
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
739 is `local'.
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
740 The default METHOD for a CVS root of the form
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
741 [USER@]HOSTNAME:/path/to/repository
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
742 is `ext'.
60912
4a2ea521d778 * vc-cvs.el: Replace `illegal' with `invalid'.
Werner LEMBERG <wl@gnu.org>
parents: 59996
diff changeset
743 For an empty string, nil is returned (invalid CVS root)."
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
744 ;; Split CVS root into colon separated fields (0-4).
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
745 ;; The `x:' makes sure, that leading colons are not lost;
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
746 ;; `HOST:/PATH' is then different from `:METHOD:/PATH'.
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
747 (let* ((root-list (cdr (split-string (concat "x:" root) ":")))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
748 (len (length root-list))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
749 ;; All syntactic varieties will get a proper METHOD.
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
750 (root-list
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
751 (cond
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
752 ((= len 0)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
753 ;; Invalid CVS root
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
754 nil)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
755 ((= len 1)
99498
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
756 (let ((uhp (vc-cvs-parse-uhp (car root-list))))
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
757 (cons (if (car uhp) "ext" "local") uhp)))
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
758 ((= len 2)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
759 ;; [USER@]HOST:PATH => method `ext'
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
760 (and (not (equal (car root-list) ""))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
761 (cons "ext" root-list)))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
762 ((= len 3)
99498
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
763 ;; :METHOD:PATH or :METHOD:USER@HOSTNAME/PATH
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
764 (cons (cadr root-list)
99498
ea9a7a9912a9 (vc-cvs-parse-root): Handle roots without colon between hostname and path.
Sam Steingold <sds@gnu.org>
parents: 99363
diff changeset
765 (vc-cvs-parse-uhp (caddr root-list))))
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
766 (t
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
767 ;; :METHOD:[USER@]HOST:PATH
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
768 (cdr root-list)))))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
769 (if root-list
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
770 (let ((method (car root-list))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
771 (uhost (or (cadr root-list) ""))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
772 (root (nth 2 root-list))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
773 user host)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
774 ;; Split USER@HOST
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
775 (if (string-match "\\(.*\\)@\\(.*\\)" uhost)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
776 (setq user (match-string 1 uhost)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
777 host (match-string 2 uhost))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
778 (setq host uhost))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
779 ;; Remove empty HOST
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
780 (and (equal host "")
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
781 (setq host))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
782 ;; Fix windows style CVS root `:local:C:\\project\\cvs\\some\\dir'
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
783 (and host
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
784 (equal method "local")
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
785 (setq root (concat host ":" root) host))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
786 ;; Normalize CVS root record
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
787 (list method user host root)))))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
788
93160
22d835ffa8f7 (vc-cvs-parse-status): Note there are problems with
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93149
diff changeset
789 ;; XXX: This does not work correctly for subdirectories. "cvs status"
22d835ffa8f7 (vc-cvs-parse-status): Note there are problems with
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93149
diff changeset
790 ;; information is context sensitive, it contains lines like:
22d835ffa8f7 (vc-cvs-parse-status): Note there are problems with
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93149
diff changeset
791 ;; cvs status: Examining DIRNAME
22d835ffa8f7 (vc-cvs-parse-status): Note there are problems with
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93149
diff changeset
792 ;; and the file entries after that don't show the full path.
94542
16651da1e3ed Fix some comments to remove references to vc-dired.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94534
diff changeset
793 ;; Because of this VC directory listings only show changed files
16651da1e3ed Fix some comments to remove references to vc-dired.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94534
diff changeset
794 ;; at the top level for CVS.
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
795 (defun vc-cvs-parse-status (&optional full)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
796 "Parse output of \"cvs status\" command in the current buffer.
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
797 Set file properties accordingly. Unless FULL is t, parse only
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87449
diff changeset
798 essential information. Note that this can never set the 'ignored
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87449
diff changeset
799 state."
93242
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
800 (let (file status missing)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
801 (goto-char (point-min))
87450
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87449
diff changeset
802 (while (looking-at "? \\(.*\\)")
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87449
diff changeset
803 (setq file (expand-file-name (match-string 1)))
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87449
diff changeset
804 (vc-file-setprop file 'vc-state 'unregistered)
71fc7b1db920 * vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87449
diff changeset
805 (forward-line 1))
93242
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
806 (when (re-search-forward "^File: " nil t)
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
807 (when (setq missing (looking-at "no file "))
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
808 (goto-char (match-end 0)))
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
809 (cond
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
810 ((re-search-forward "\\=\\([^ \t]+\\)" nil t)
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
811 (setq file (expand-file-name (match-string 1)))
95425
72ac0c4a8ecd (vc-cvs-state-heuristic, vc-cvs-parse-status): Try and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95321
diff changeset
812 (setq status(if (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t)
72ac0c4a8ecd (vc-cvs-state-heuristic, vc-cvs-parse-status): Try and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95321
diff changeset
813 (match-string 1) "Unknown"))
93956
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
814 (when (and full
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
815 (re-search-forward
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
816 "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
817 \[\t ]+\\([0-9.]+\\)"
93956
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
818 nil t))
93242
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
819 (vc-file-setprop file 'vc-latest-revision (match-string 2)))
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
820 (vc-file-setprop
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
821 file 'vc-state
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
822 (cond
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
823 ((string-match "Up-to-date" status)
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
824 (vc-file-setprop file 'vc-checkout-time
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
825 (nth 5 (file-attributes file)))
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
826 'up-to-date)
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
827 ((string-match "Locally Modified" status) 'edited)
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
828 ((string-match "Needs Merge" status) 'needs-merge)
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
829 ((string-match "Needs \\(Checkout\\|Patch\\)" status)
94521
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
830 (if missing 'missing 'needs-update))
93242
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
831 ((string-match "Locally Added" status) 'added)
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
832 ((string-match "Locally Removed" status) 'removed)
93956
bfc762f0b49c * vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93941
diff changeset
833 ((string-match "File had conflicts " status) 'conflict)
95425
72ac0c4a8ecd (vc-cvs-state-heuristic, vc-cvs-parse-status): Try and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 95321
diff changeset
834 ((string-match "Unknown" status) 'unregistered)
93242
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
835 (t 'edited))))))))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
836
94003
2ecb2ea8d5b5 Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93956
diff changeset
837 (defun vc-cvs-after-dir-status (update-function)
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
838 ;; Heavily inspired by vc-cvs-parse-status. AKA a quick hack.
94522
a69dcc2c42ae Remove some XXX comments no longer needed.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94521
diff changeset
839 ;; This needs a lot of testing.
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
840 (let ((status nil)
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
841 (status-str nil)
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
842 (file nil)
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
843 (result nil)
93242
0dcb59446144 (vc-cvs-parse-status, vc-cvs-after-dir-status): Detect
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93175
diff changeset
844 (missing nil)
98532
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
845 (ignore-next nil)
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
846 (subdir default-directory))
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
847 (goto-char (point-min))
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
848 (while
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
849 ;; Look for either a file entry, an unregistered file, or a
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
850 ;; directory change.
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
851 (re-search-forward
98532
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
852 "\\(^=+\n\\([^=c?\n].*\n\\|\n\\)+\\)\\|\\(\\(^?? .*\n\\)+\\)\\|\\(^cvs status: \\(Examining\\|nothing\\) .*\n\\)"
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
853 nil t)
95441
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
854 ;; FIXME: get rid of narrowing here.
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
855 (narrow-to-region (match-beginning 0) (match-end 0))
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
856 (goto-char (point-min))
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
857 ;; The subdir
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
858 (when (looking-at "cvs status: Examining \\(.+\\)")
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
859 (setq subdir (expand-file-name (match-string 1))))
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
860 ;; Unregistered files
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
861 (while (looking-at "? \\(.*\\)")
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
862 (setq file (file-relative-name
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
863 (expand-file-name (match-string 1) subdir)))
93461
3afeea9a48a3 * vc.el (vc-status-add-entry): Assume ENTRY is a list not a cons.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93382
diff changeset
864 (push (list file 'unregistered) result)
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
865 (forward-line 1))
98532
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
866 (when (looking-at "cvs status: nothing known about")
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
867 ;; We asked about a non existent file. The output looks like this:
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
868
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
869 ;; cvs status: nothing known about `lisp/v.diff'
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
870 ;; ===================================================================
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
871 ;; File: no file v.diff Status: Unknown
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
872 ;;
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
873 ;; Working revision: No entry for v.diff
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
874 ;; Repository revision: No revision control file
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
875 ;;
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
876
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
877 ;; Due to narrowing in this iteration we only see the "cvs
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
878 ;; status:" line, so just set a flag so that we can ignore the
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
879 ;; file in the next iteration.
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
880 (setq ignore-next t))
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
881 ;; A file entry.
95441
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
882 (when (re-search-forward "^File: \\(no file \\)?\\(.*[^ \t]\\)[ \t]+Status: \\(.*\\)" nil t)
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
883 (setq missing (match-string 1))
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
884 (setq file (file-relative-name
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
885 (expand-file-name (match-string 2) subdir)))
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
886 (setq status-str (match-string 3))
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
887 (setq status
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
888 (cond
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
889 ((string-match "Up-to-date" status-str) 'up-to-date)
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
890 ((string-match "Locally Modified" status-str) 'edited)
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
891 ((string-match "Needs Merge" status-str) 'needs-merge)
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
892 ((string-match "Needs \\(Checkout\\|Patch\\)" status-str)
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
893 (if missing 'missing 'needs-update))
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
894 ((string-match "Locally Added" status-str) 'added)
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
895 ((string-match "Locally Removed" status-str) 'removed)
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
896 ((string-match "File had conflicts " status-str) 'conflict)
95442
f3de1c31de14 Fix typos.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95441
diff changeset
897 ((string-match "Unknown" status-str) 'unregistered)
95441
3a41427d46d9 (vc-cvs-after-dir-status): Support spaces in file
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95425
diff changeset
898 (t 'edited)))
98532
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
899 (if ignore-next
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
900 (setq ignore-next nil)
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
901 (unless (eq status 'up-to-date)
69b1ca445635 (vc-cvs-after-dir-status): Parse the output for non
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98517
diff changeset
902 (push (list file status) result))))
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
903 (goto-char (point-max))
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
904 (widen))
95443
14f66635f87d *** empty log message ***
Dan Nicolaescu <dann@ics.uci.edu>
parents: 95442
diff changeset
905 (funcall update-function result))
94094
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
906 ;; Alternative implementation: use the "update" command instead of
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
907 ;; the "status" command.
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
908 ;; (let ((result nil)
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
909 ;; (translation '((?? . unregistered)
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
910 ;; (?A . added)
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
911 ;; (?C . conflict)
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
912 ;; (?M . edited)
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
913 ;; (?P . needs-merge)
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
914 ;; (?R . removed)
94521
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94481
diff changeset
915 ;; (?U . needs-update))))
94094
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
916 ;; (goto-char (point-min))
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
917 ;; (while (not (eobp))
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
918 ;; (if (looking-at "^[ACMPRU?] \\(.*\\)$")
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
919 ;; (push (list (match-string 1)
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
920 ;; (cdr (assoc (char-after) translation)))
94094
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
921 ;; result)
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
922 ;; (cond
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
923 ;; ((looking-at "cvs update: warning: \\(.*\\) was lost")
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
924 ;; ;; Format is:
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
925 ;; ;; cvs update: warning: FILENAME was lost
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
926 ;; ;; U FILENAME
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
927 ;; (push (list (match-string 1) 'missing) result)
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
928 ;; ;; Skip the "U" line
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
929 ;; (forward-line 1))
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
930 ;; ((looking-at "cvs update: New directory `\\(.*\\)' -- ignored")
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
931 ;; (push (list (match-string 1) 'unregistered) result))))
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
932 ;; (forward-line 1))
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
933 ;; (funcall update-function result)))
9ec1b62752b1 (vc-cvs-after-dir-status, vc-cvs-dir-status): Add
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94045
diff changeset
934 )
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
935
98517
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
936 ;; Based on vc-cvs-dir-state-heuristic from Emacs 22.
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
937 (defun vc-cvs-dir-status-heuristic (dir update-function &optional basedir)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
938 "Find the CVS state of all files in DIR, using only local information."
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
939 (let (file basename status result dirlist)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
940 (with-temp-buffer
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
941 (vc-cvs-get-entries dir)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
942 (goto-char (point-min))
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
943 (while (not (eobp))
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
944 (if (looking-at "D/\\([^/]*\\)////")
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
945 (push (expand-file-name (match-string 1) dir) dirlist)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
946 ;; CVS-removed files are not taken under VC control.
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
947 (when (looking-at "/\\([^/]*\\)/[^/-]")
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
948 (setq basename (match-string 1)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
949 file (expand-file-name basename dir)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
950 status (or (vc-file-getprop file 'vc-state)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
951 (vc-cvs-parse-entry file t)))
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
952 (unless (eq status 'up-to-date)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
953 (push (list (if basedir
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
954 (file-relative-name file basedir)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
955 basename)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
956 status) result))))
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
957 (forward-line 1)))
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
958 (dolist (subdir dirlist)
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
959 (setq result (append result
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
960 (vc-cvs-dir-status-heuristic subdir nil
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
961 (or basedir dir)))))
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
962 (if basedir result
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
963 (funcall update-function result))))
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
964
94003
2ecb2ea8d5b5 Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93956
diff changeset
965 (defun vc-cvs-dir-status (dir update-function)
93149
5ec26b66bbe8 (vc-cvs-after-dir-status, vc-cvs-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 93124
diff changeset
966 "Create a list of conses (file . state) for DIR."
98517
04d30d4471c2 (vc-cvs-dir-status-heuristic): New function.
Glenn Morris <rgm@gnu.org>
parents: 98495
diff changeset
967 ;; FIXME check all files in DIR instead?
98675
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
968 (let ((local (vc-stay-local-p dir)))
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
969 (if (and local (not (eq local 'only-file)))
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
970 (vc-cvs-dir-status-heuristic dir update-function)
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
971 (vc-cvs-command (current-buffer) 'async dir "-f" "status")
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
972 ;; Alternative implementation: use the "update" command instead of
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
973 ;; the "status" command.
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
974 ;; (vc-cvs-command (current-buffer) 'async
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
975 ;; (file-relative-name dir)
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
976 ;; "-f" "-n" "update" "-d" "-P")
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
977 (vc-exec-after
2cae4bd13e67 * vc-hooks.el (vc-stay-local): Add a new choice and default to it.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98576
diff changeset
978 `(vc-cvs-after-dir-status (quote ,update-function))))))
99190
e78a75586e10 (vc-cvs-stay-local): Fix typo in choice.
Martin Rudalics <rudalics@gmx.at>
parents: 99159
diff changeset
979
98495
e8a025cdac4a * vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98086
diff changeset
980 (defun vc-cvs-dir-status-files (dir files default-state update-function)
e8a025cdac4a * vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98086
diff changeset
981 "Create a list of conses (file . state) for DIR."
e8a025cdac4a * vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98086
diff changeset
982 (apply 'vc-cvs-command (current-buffer) 'async dir "-f" "status" files)
e8a025cdac4a * vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98086
diff changeset
983 (vc-exec-after
e8a025cdac4a * vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98086
diff changeset
984 `(vc-cvs-after-dir-status (quote ,update-function))))
e8a025cdac4a * vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 98086
diff changeset
985
95049
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
986 (defun vc-cvs-file-to-string (file)
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
987 "Read the content of FILE and return it as a string."
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
988 (condition-case nil
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
989 (with-temp-buffer
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
990 (insert-file-contents file)
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
991 (goto-char (point-min))
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
992 (buffer-substring (point) (point-max)))
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
993 (file-error nil)))
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
994
99159
b0dce7f34dda * vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents: 99138
diff changeset
995 (defun vc-cvs-dir-extra-headers (dir)
95049
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
996 "Extract and represent per-directory properties of a CVS working copy."
95042
0f15001fd142 Extract and display the CVS repository.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95020
diff changeset
997 (let ((repo
95049
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
998 (condition-case nil
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
999 (with-temp-buffer
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1000 (insert-file-contents "CVS/Root")
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1001 (goto-char (point-min))
95042
0f15001fd142 Extract and display the CVS repository.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95020
diff changeset
1002 (and (looking-at ":ext:") (delete-char 5))
99363
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1003 (concat (buffer-substring (point) (1- (point-max))) "\n"))
95049
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1004 (file-error nil)))
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1005 (module
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1006 (condition-case nil
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1007 (with-temp-buffer
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1008 (insert-file-contents "CVS/Repository")
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1009 (goto-char (point-min))
99138
a479c7f4849d (vc-cvs-status-extra-headers): Use full directory name when reporting
Chong Yidong <cyd@stupidchicken.com>
parents: 98675
diff changeset
1010 (skip-chars-forward "^\n")
a479c7f4849d (vc-cvs-status-extra-headers): Use full directory name when reporting
Chong Yidong <cyd@stupidchicken.com>
parents: 98675
diff changeset
1011 (concat (buffer-substring (point-min) (point)) "\n"))
95049
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1012 (file-error nil))))
95042
0f15001fd142 Extract and display the CVS repository.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95020
diff changeset
1013 (concat
99363
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1014 (cond (repo
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1015 (concat (propertize "Repository : " 'face 'font-lock-type-face)
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1016 (propertize repo 'face 'font-lock-variable-name-face)))
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1017 (t ""))
95049
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1018 (cond (module
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
1019 (concat (propertize "Module : " 'face 'font-lock-type-face)
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
1020 (propertize module 'face 'font-lock-variable-name-face)))
95049
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1021 (t ""))
99363
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1022 (if (file-readable-p "CVS/Tag")
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1023 (let ((tag (vc-cvs-file-to-string "CVS/Tag")))
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1024 (cond
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1025 ((string-match "\\`T" tag)
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1026 (concat (propertize "Tag : " 'face 'font-lock-type-face)
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1027 (propertize (substring tag 1)
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1028 'face 'font-lock-variable-name-face)))
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1029 ((string-match "\\`D" tag)
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1030 (concat (propertize "Date : " 'face 'font-lock-type-face)
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1031 (propertize (substring tag 1)
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1032 'face 'font-lock-variable-name-face)))
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1033 (t ""))))
e48aaf88b6e7 * vc-cvs.el (vc-cvs-dir-extra-headers): Add tag name to header.
Nick Roberts <nickrob@snap.net.nz>
parents: 99190
diff changeset
1034
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
1035 ;; In CVS, branch is a per-file property, not a per-directory property.
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
1036 ;; We can't really do this here without making dangerous assumptions.
95049
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1037 ;;(propertize "Branch: " 'face 'font-lock-type-face)
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1038 ;;(propertize "ADD CODE TO PRINT THE BRANCH NAME\n"
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1039 ;; 'face 'font-lock-warning-face)
438808a998aa Improved extra-headers method for CVS.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 95043
diff changeset
1040 )))
94210
7cc87e1801a6 (vc-cvs-status-extra-headers): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94120
diff changeset
1041
50453
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
1042 (defun vc-cvs-get-entries (dir)
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
1043 "Insert the CVS/Entries file from below DIR into the current buffer.
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
1044 This function ensures that the correct coding system is used for that,
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
1045 which may not be the one that is used for the files' contents.
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
1046 CVS/Entries should only be accessed through this function."
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
1047 (let ((coding-system-for-read (or file-name-coding-system
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
1048 default-file-name-coding-system)))
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
1049 (vc-insert-file (expand-file-name "CVS/Entries" dir))))
57913
f5d7d9bbc021 (vc-cvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 54465
diff changeset
1050
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1051 (defun vc-cvs-valid-symbolic-tag-name-p (tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1052 "Return non-nil if TAG is a valid symbolic tag name."
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1053 ;; According to the CVS manual, a valid symbolic tag must start with
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1054 ;; an uppercase or lowercase letter and can contain uppercase and
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1055 ;; lowercase letters, digits, `-', and `_'.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1056 (and (string-match "^[a-zA-Z]" tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1057 (not (string-match "[^a-z0-9A-Z-_]" tag))))
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
1058
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
1059 (defun vc-cvs-valid-revision-number-p (tag)
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
1060 "Return non-nil if TAG is a valid revision number."
44462
6eb10924e77f (vc-cvs-valid-version-number-p): New function.
Sam Steingold <sds@gnu.org>
parents: 44436
diff changeset
1061 (and (string-match "^[0-9]" tag)
6eb10924e77f (vc-cvs-valid-version-number-p): New function.
Sam Steingold <sds@gnu.org>
parents: 44436
diff changeset
1062 (not (string-match "[^0-9.]" tag))))
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1063
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1064 (defun vc-cvs-parse-sticky-tag (match-type match-tag)
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
1065 "Parse and return the sticky tag as a string.
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1066 `match-data' is protected."
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1067 (let ((data (match-data))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1068 (tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1069 (type (cond ((string= match-type "D") 'date)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1070 ((string= match-type "T")
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1071 (if (vc-cvs-valid-symbolic-tag-name-p match-tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1072 'symbolic-name
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1073 'revision-number))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1074 (t nil))))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1075 (unwind-protect
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1076 (progn
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
1077 (cond
46163
426c8cf1a3df Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 45255
diff changeset
1078 ;; Sticky Date tag. Convert to a proper date value (`encode-time')
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1079 ((eq type 'date)
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
1080 (string-match
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
1081 "\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)\\.\\([0-9]+\\)"
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1082 match-tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1083 (let* ((year-tmp (string-to-number (match-string 1 match-tag)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1084 (month (string-to-number (match-string 2 match-tag)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1085 (day (string-to-number (match-string 3 match-tag)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1086 (hour (string-to-number (match-string 4 match-tag)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1087 (min (string-to-number (match-string 5 match-tag)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1088 (sec (string-to-number (match-string 6 match-tag)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1089 ;; Years 0..68 are 2000..2068.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1090 ;; Years 69..99 are 1969..1999.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1091 (year (+ (cond ((> 69 year-tmp) 2000)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1092 ((> 100 year-tmp) 1900)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1093 (t 0))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1094 year-tmp)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1095 (setq tag (encode-time sec min hour day month year))))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1096 ;; Sticky Tag name or revision number
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1097 ((eq type 'symbolic-name) (setq tag match-tag))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1098 ((eq type 'revision-number) (setq tag match-tag))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1099 ;; Default is no sticky tag at all
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1100 (t nil))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1101 (cond ((eq vc-cvs-sticky-tag-display nil) nil)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1102 ((eq vc-cvs-sticky-tag-display t)
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
1103 (cond ((eq type 'date) (format-time-string
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1104 vc-cvs-sticky-date-format-string
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1105 tag))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1106 ((eq type 'symbolic-name) tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1107 ((eq type 'revision-number) tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1108 (t nil)))
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
1109 ((functionp vc-cvs-sticky-tag-display)
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1110 (funcall vc-cvs-sticky-tag-display tag type))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1111 (t nil)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1112
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1113 (set-match-data data))))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1114
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1115 (defun vc-cvs-parse-entry (file &optional set-state)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1116 "Parse a line from CVS/Entries.
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1117 Compare modification time to that of the FILE, set file properties
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1118 accordingly. However, `vc-state' is set only if optional arg SET-STATE
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1119 is non-nil."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1120 (cond
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1121 ;; entry for a "locally added" file (not yet committed)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1122 ((looking-at "/[^/]+/0/")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1123 (vc-file-setprop file 'vc-checkout-time 0)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
1124 (vc-file-setprop file 'vc-working-revision "0")
93124
97c5b398eee4 * vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93118
diff changeset
1125 (if set-state (vc-file-setprop file 'vc-state 'added)))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1126 ;; normal entry
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1127 ((looking-at
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1128 (concat "/[^/]+"
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1129 ;; revision
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
1130 "/\\([^/]*\\)"
50321
17ff9d10125f (vc-cvs-parse-entry): Make sure a file with conflicts
Andreas Schwab <schwab@suse.de>
parents: 49822
diff changeset
1131 ;; timestamp and optional conflict field
17ff9d10125f (vc-cvs-parse-entry): Make sure a file with conflicts
Andreas Schwab <schwab@suse.de>
parents: 49822
diff changeset
1132 "/\\([^/]*\\)/"
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1133 ;; options
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1134 "\\([^/]*\\)/"
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1135 ;; sticky tag
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1136 "\\(.\\|\\)" ;Sticky tag type (date or tag name, could be empty)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
1137 "\\(.*\\)")) ;Sticky tag
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
1138 (vc-file-setprop file 'vc-working-revision (match-string 1))
44104
985526b08270 (vc-cvs-registered, vc-cvs-dir-state-heuristic):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44005
diff changeset
1139 (vc-file-setprop file 'vc-cvs-sticky-tag
57913
f5d7d9bbc021 (vc-cvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 54465
diff changeset
1140 (vc-cvs-parse-sticky-tag (match-string 4)
52624
2b71ed49b8c6 (vc-cvs-parse-entry): Don't require parse-time, because it's
André Spiegel <spiegel@gnu.org>
parents: 52602
diff changeset
1141 (match-string 5)))
52602
04c9b596cce6 (vc-cvs-parse-entry): Restore the code to compare time stamps
André Spiegel <spiegel@gnu.org>
parents: 52401
diff changeset
1142 ;; Compare checkout time and modification time.
04c9b596cce6 (vc-cvs-parse-entry): Restore the code to compare time stamps
André Spiegel <spiegel@gnu.org>
parents: 52401
diff changeset
1143 ;; This is intentionally different from the algorithm that CVS uses
52624
2b71ed49b8c6 (vc-cvs-parse-entry): Don't require parse-time, because it's
André Spiegel <spiegel@gnu.org>
parents: 52602
diff changeset
1144 ;; (which is based on textual comparison), because there can be problems
52602
04c9b596cce6 (vc-cvs-parse-entry): Restore the code to compare time stamps
André Spiegel <spiegel@gnu.org>
parents: 52401
diff changeset
1145 ;; generating a time string that looks exactly like the one from CVS.
52717
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1146 (let ((mtime (nth 5 (file-attributes file))))
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1147 (require 'parse-time)
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1148 (let ((parsed-time
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1149 (parse-time-string (concat (match-string 2) " +0000"))))
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1150 (cond ((and (not (string-match "\\+" (match-string 2)))
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1151 (car parsed-time)
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1152 (equal mtime (apply 'encode-time parsed-time)))
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1153 (vc-file-setprop file 'vc-checkout-time mtime)
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1154 (if set-state (vc-file-setprop file 'vc-state 'up-to-date)))
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1155 (t
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1156 (vc-file-setprop file 'vc-checkout-time 0)
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
1157 (if set-state (vc-file-setprop file 'vc-state 'edited)))))))))
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
1158
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1159 ;; Completion of revision names.
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1160 ;; Just so I don't feel like I'm duplicating code from pcl-cvs, I'll use
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1161 ;; `cvs log' so I can list all the revision numbers rather than only
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1162 ;; tag names.
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1163
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1164 (defun vc-cvs-revision-table (file)
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1165 (let ((default-directory (file-name-directory file))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1166 (res nil))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1167 (with-temp-buffer
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1168 (vc-cvs-command t nil file "log")
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1169 (goto-char (point-min))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1170 (when (re-search-forward "^symbolic names:\n" nil t)
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1171 (while (looking-at "^ \\(.*\\): \\(.*\\)")
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1172 (push (cons (match-string 1) (match-string 2)) res)
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1173 (forward-line 1)))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1174 (while (re-search-forward "^revision \\([0-9.]+\\)" nil t)
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1175 (push (match-string 1) res))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1176 res)))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1177
85458
119299b8a040 (vc-cvs-revision-completion-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85139
diff changeset
1178 (defun vc-cvs-revision-completion-table (files)
119299b8a040 (vc-cvs-revision-completion-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85139
diff changeset
1179 (lexical-let ((files files)
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1180 table)
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1181 (setq table (lazy-completion-table
85458
119299b8a040 (vc-cvs-revision-completion-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85139
diff changeset
1182 table (lambda () (vc-cvs-revision-table (car files)))))
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1183 table))
95524
75b22805a854 (vc-cvs-status-extra-headers): Remove extraneous newlines.
Sam Steingold <sds@gnu.org>
parents: 95443
diff changeset
1184
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1185
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1186 (provide 'vc-cvs)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1187
81821
0d37b602a4f0 Require CL.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81820
diff changeset
1188 ;; arch-tag: 60e1402a-aa53-4607-927a-cf74f144b432
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1189 ;;; vc-cvs.el ends here