annotate lisp/vc-cvs.el @ 92249:e324b86de474

Make the `whitespace.el' issue a little less confusing for people by actually mentioning it.
author Glenn Morris <rgm@gnu.org>
date Wed, 27 Feb 2008 04:48:23 +0000
parents 12326ccb66d6
children 01d3fd1a2cfe
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
64762
41bb365f41c4 Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 64091
diff changeset
3 ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003,
79690
be4e5f45a3eb (vc-cvs-annotate-time): Don't move backward when text
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78359
diff changeset
4 ;; 2004, 2005, 2006, 2007, 2008 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
57913
f5d7d9bbc021 (vc-cvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 54465
diff changeset
9 ;; $Id$
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
10
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
11 ;; This file is part of GNU Emacs.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
12
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
13 ;; GNU Emacs is free software; you can redistribute it and/or modify
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
14 ;; it under the terms of the GNU General Public License as published by
78236
9355f9b7bbff Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents: 75347
diff changeset
15 ;; the Free Software Foundation; either version 3, or (at your option)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
16 ;; any later version.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
17
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
18 ;; GNU Emacs is distributed in the hope that it will be useful,
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
19 ;; 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
20 ;; 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
21 ;; GNU General Public License for more details.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
22
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
23 ;; You should have received a copy of the GNU General Public License
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
24 ;; along with GNU Emacs; see the file COPYING. If not, write to the
64091
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 62606
diff changeset
25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
6fb026ad601f Update FSF's address.
Lute Kamstra <lute@gnu.org>
parents: 62606
diff changeset
26 ;; Boston, MA 02110-1301, USA.
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
27
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
28 ;;; Commentary:
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
29
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
30 ;;; Code:
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
31
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
32 (eval-when-compile (require 'cl) (require 'vc))
35584
498bcc1e7c00 require vc
Sam Steingold <sds@gnu.org>
parents: 35569
diff changeset
33
81820
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
34 ;; 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
35 ;; 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
36 (put 'CVS 'vc-functions nil)
35584
498bcc1e7c00 require vc
Sam Steingold <sds@gnu.org>
parents: 35569
diff changeset
37
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
38 ;;;
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
39 ;;; Customization options
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
40 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
41
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
42 (defcustom vc-cvs-global-switches nil
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
43 "*Global switches to pass to any CVS command."
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
44 :type '(choice (const :tag "None" nil)
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
45 (string :tag "Argument String")
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
46 (repeat :tag "Argument List"
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
47 :value ("")
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
48 string))
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59443
diff changeset
49 :version "22.1"
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
50 :group 'vc)
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
51
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
52 (defcustom vc-cvs-register-switches nil
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
53 "*Extra switches for registering a file into CVS.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
54 A string or list of strings passed to the checkin program by
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
55 \\[vc-register]."
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
56 :type '(choice (const :tag "None" nil)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
57 (string :tag "Argument String")
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
58 (repeat :tag "Argument List"
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
59 :value ("")
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
60 string))
31475
b25e22223eb9 DOc fixes.
Dave Love <fx@gnu.org>
parents: 31404
diff changeset
61 :version "21.1"
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
62 :group 'vc)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
63
35821
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
64 (defcustom vc-cvs-diff-switches nil
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
65 "*A string or list of strings specifying extra switches for cvs diff under VC."
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
66 :type '(choice (const :tag "None" nil)
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
67 (string :tag "Argument String")
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
68 (repeat :tag "Argument List"
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
69 :value ("")
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
70 string))
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
71 :version "21.1"
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
72 :group 'vc)
6b1ff979e045 (vc-cvs-diff-switches): New customization option.
André Spiegel <spiegel@gnu.org>
parents: 35702
diff changeset
73
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
74 (defcustom vc-cvs-header (or (cdr (assoc 'CVS vc-header-alist)) '("\$Id\$"))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
75 "*Header keywords to be inserted by `vc-insert-headers'."
31475
b25e22223eb9 DOc fixes.
Dave Love <fx@gnu.org>
parents: 31404
diff changeset
76 :version "21.1"
35177
f7c511463b68 (vc-cvs-header): Fix :type.
Dave Love <fx@gnu.org>
parents: 35132
diff changeset
77 :type '(repeat string)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
78 :group 'vc)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
79
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
80 (defcustom vc-cvs-use-edit t
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
81 "*Non-nil means to use `cvs edit' to \"check out\" a file.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
82 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
83 \(i.e. if you have $CVSREAD set)."
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
84 :type 'boolean
31475
b25e22223eb9 DOc fixes.
Dave Love <fx@gnu.org>
parents: 31404
diff changeset
85 :version "21.1"
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
86 :group 'vc)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
87
50671
0737c3a76291 (vc-cvs-stay-local): Keep the old default. Simplify doc string.
André Spiegel <spiegel@gnu.org>
parents: 50668
diff changeset
88 (defcustom vc-cvs-stay-local t
31475
b25e22223eb9 DOc fixes.
Dave Love <fx@gnu.org>
parents: 31404
diff changeset
89 "*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
90 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
91 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
92
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
93 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
94 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
95 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
96 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
97 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
98 by these regular expressions."
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
99 :type '(choice (const :tag "Always stay local" t)
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
100 (const :tag "Don't stay local" nil)
57913
f5d7d9bbc021 (vc-cvs-annotate-command): Delete extraneous lines from beginning of buffer.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 54465
diff changeset
101 (list :format "\nExamine hostname and %v" :tag "Examine hostname ..."
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
102 (set :format "%v" :inline t (const :format "%t" :tag "don't" except))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
103 (regexp :format " stay local,\n%t: %v" :tag "if it matches")
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
104 (repeat :format "%v%i\n" :inline t (regexp :tag "or"))))
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
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
108 (defcustom vc-cvs-sticky-date-format-string "%c"
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
109 "*Format string for mode-line display of sticky date.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
110 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
111 `vc-cvs-sticky-tag-display' is t."
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
112 :type '(string)
59996
aac0a33f5772 Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents: 59443
diff changeset
113 :version "22.1"
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
114 :group 'vc)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
115
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
116 (defcustom vc-cvs-sticky-tag-display t
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
117 "*Specify the mode-line display of sticky tags.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
118 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
119 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
120 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
121 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
122 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
123 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
124
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
125 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
126 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
127
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
128 (lambda (tag type)
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
129 (cond ((eq type 'date) (format-time-string
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
130 vc-cvs-sticky-date-format-string tag))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
131 ((eq type 'revision-number) \"Sticky\")
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
132 ((eq type 'symbolic-name) \"Sticky\")))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
133
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
134 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
135 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
136 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
137 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
138
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
139 (lambda (tag type)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
140 (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
141 ((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
142 ((eq type 'symbolic-name)
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
143 (condition-case nil
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
144 (progn
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
145 (string-match \"\\\\([^-]*\\\\)\\\\(.*\\\\)\" tag)
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
146 (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
147 (substring (match-string 2 tag) 1 nil)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
148 (error tag))))) ; Fall-back to given tag name.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
149
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
150 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
151 :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
152 :version "22.1"
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
153 :group 'vc)
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
154
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
155 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
156 ;;; Internal variables
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
157 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
158
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
159
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
160 ;;;
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
161 ;;; State-querying functions
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
162 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
163
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
164 ;;;###autoload (defun vc-cvs-registered (f)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
165 ;;;###autoload (when (file-readable-p (expand-file-name
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
166 ;;;###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
167 ;;;###autoload (load "vc-cvs")
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
168 ;;;###autoload (vc-cvs-registered f)))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
169
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
170 (defun vc-cvs-registered (file)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
171 "Check if FILE is CVS registered."
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
172 (let ((dirname (or (file-name-directory file) ""))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
173 (basename (file-name-nondirectory file))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
174 ;; 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
175 (case-fold-search nil))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
176 (if (file-readable-p (expand-file-name "CVS/Entries" dirname))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
177 (with-temp-buffer
50453
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
178 (vc-cvs-get-entries dirname)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
179 (goto-char (point-min))
31475
b25e22223eb9 DOc fixes.
Dave Love <fx@gnu.org>
parents: 31404
diff changeset
180 (cond
b25e22223eb9 DOc fixes.
Dave Love <fx@gnu.org>
parents: 31404
diff changeset
181 ((re-search-forward
44104
985526b08270 (vc-cvs-registered, vc-cvs-dir-state-heuristic):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44005
diff changeset
182 ;; CVS-removed files are not taken under VC control.
985526b08270 (vc-cvs-registered, vc-cvs-dir-state-heuristic):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44005
diff changeset
183 (concat "^/" (regexp-quote basename) "/[^/-]") nil t)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
184 (beginning-of-line)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
185 (vc-cvs-parse-entry file)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
186 t)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
187 (t nil)))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
188 nil)))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
189
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
190 (defun vc-cvs-state (file)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
191 "CVS-specific version of `vc-state'."
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
192 (if (vc-stay-local-p file)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
193 (let ((state (vc-file-getprop file 'vc-state)))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
194 ;; 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
195 ;; 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
196 (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
197 (vc-cvs-state-heuristic file)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
198 state))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
199 (with-temp-buffer
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
200 (cd (file-name-directory file))
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
201 (vc-cvs-command t 0 file "status")
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
202 (vc-cvs-parse-status t))))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
203
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
204 (defun vc-cvs-state-heuristic (file)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
205 "CVS-specific state heuristic."
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
206 ;; 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
207 ;; Otherwise consider it `edited'.
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
208 (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
209 (lastmod (nth 5 (file-attributes file))))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
210 (if (equal checkout-time lastmod)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
211 'up-to-date
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
212 'edited)))
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
213
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
214 (defun vc-cvs-dir-state (dir)
87424
c0ee02a9ac55 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87139
diff changeset
215 "Find the CVS state of all files in DIR and subdirectories."
50645
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
216 ;; if DIR is not under CVS control, don't do anything.
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
217 (when (file-readable-p (expand-file-name "CVS/Entries" dir))
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
218 (if (vc-stay-local-p dir)
50645
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
219 (vc-cvs-dir-state-heuristic dir)
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
220 (let ((default-directory dir))
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
221 ;; Don't specify DIR in this command, the default-directory is
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
222 ;; enough. Otherwise it might fail with remote repositories.
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
223 (with-temp-buffer
87442
c5df210848ca * vc-bzr.el, vc-cvs.el, vc-git.el, vc-hg.el, vc-mcvs.el, vc-svn.el:
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87432
diff changeset
224 (buffer-disable-undo) ;; Because these buffers can get huge
87424
c0ee02a9ac55 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87139
diff changeset
225 (vc-cvs-command t 0 nil "status")
50645
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
226 (goto-char (point-min))
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
227 (while (re-search-forward "^=+\n\\([^=\n].*\n\\|\n\\)+" nil t)
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
228 (narrow-to-region (match-beginning 0) (match-end 0))
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
229 (vc-cvs-parse-status)
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
230 (goto-char (point-max))
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
231 (widen)))))))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
232
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
233 (defun vc-cvs-working-revision (file)
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
234 "CVS-specific version of `vc-working-revision'."
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
235 ;; There is no need to consult RCS headers under CVS, because we
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
236 ;; get the workfile version for free when we recognize that a file
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
237 ;; is registered in CVS.
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
238 (vc-cvs-registered file)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
239 (vc-file-getprop file 'vc-working-revision))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
240
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
241 (defun vc-cvs-checkout-model (file)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
242 "CVS-specific version of `vc-checkout-model'."
62606
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
243 (if (getenv "CVSREAD")
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
244 'announce
62606
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
245 (let ((attrib (file-attributes file)))
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
246 (if (and attrib ;; don't check further if FILE doesn't exist
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
247 ;; If the file is not writable (despite CVSREAD being
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
248 ;; undefined), this is probably because the file is being
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
249 ;; "watched" by other developers.
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
250 ;; (If vc-mistrust-permissions was t, we actually shouldn't
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
251 ;; trust this, but there is no other way to learn this from CVS
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
252 ;; at the moment (version 1.9).)
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
253 (string-match "r-..-..-." (nth 8 attrib)))
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
254 'announce
6e91e3b4e9bc (vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents: 60912
diff changeset
255 'implicit))))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
256
31404
f2ab9420390f 2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 31384
diff changeset
257 (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
258 "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
259 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
260 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
261 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
262 (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
263 help-echo
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
264 (string
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
265 (if (string= (vc-working-revision file) "0")
82027
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
266 ;; A file that is added but not yet committed.
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
267 (progn
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
268 (setq help-echo "Added file (needs commit) under CVS")
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
269 "CVS @@")
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
270 (let ((def-ml (vc-default-mode-line-string 'CVS file)))
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
271 (setq help-echo
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
272 (get-text-property 0 'help-echo def-ml))
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
273 def-ml))))
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
274 (propertize
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
275 (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
276 string
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
277 (setq help-echo (format "%s on the '%s' branch"
1350ba0c0448 * vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents: 81988
diff changeset
278 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
279 (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
280 '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
281
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
282 (defun vc-cvs-dired-state-info (file)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
283 "CVS-specific version of `vc-dired-state-info'."
50898
8806616471e2 (vc-cvs-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50671
diff changeset
284 (let ((cvs-state (vc-state file)))
8806616471e2 (vc-cvs-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50671
diff changeset
285 (cond ((eq cvs-state 'edited)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
286 (if (equal (vc-working-revision file) "0")
50898
8806616471e2 (vc-cvs-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50671
diff changeset
287 "(added)" "(modified)"))
87449
7477a697d7e1 * vc-cvs.el, vc-svn.el: Simplify backend dired-state-info
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87442
diff changeset
288 (t
7477a697d7e1 * vc-cvs.el, vc-svn.el: Simplify backend dired-state-info
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87442
diff changeset
289 (vc-default-dired-state-info 'CVS file)))))
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
290
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
291 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
292 ;;; State-changing functions
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
293 ;;;
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
294
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
295 (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
296 "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
297 COMMENT can be used to provide an initial description of FILES.
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
298
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
299 `vc-register-switches' and `vc-cvs-register-switches' are passed to
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
300 the CVS command (in that order)."
92163
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
301 ;; 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
302 (let (dirs)
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
303 (dolist (file files)
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
304 (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
305 (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
306 (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
307 (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
308 (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
309 "add"
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
310 (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
311 (concat "-m" comment))
12326ccb66d6 (vc-cvs-register): Fix registering of directories in multiple file case.
Glenn Morris <rgm@gnu.org>
parents: 91956
diff changeset
312 (vc-switches 'CVS 'register)))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
313
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
314 (defun vc-cvs-responsible-p (file)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
315 "Return non-nil if CVS thinks it is responsible for FILE."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
316 (file-directory-p (expand-file-name "CVS"
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
317 (if (file-directory-p file)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
318 file
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
319 (file-name-directory file)))))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
320
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
321 (defun vc-cvs-could-register (file)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
322 "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
323 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
324 its parents."
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
325 (let ((dir file))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
326 (while (and (stringp dir)
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
327 (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
328 dir)
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
329 (setq dir (if (file-directory-p
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
330 (expand-file-name "CVS/Entries" dir))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
331 t (directory-file-name dir))))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
332 (eq dir t)))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
333
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
334 (defun vc-cvs-checkin (files rev comment)
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
335 "CVS-specific version of `vc-backend-checkin'."
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
336 (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
337 (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
338 (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
339 ;; 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
340 ;; 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
341 (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
342 (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
343 (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
344 files)))
69946487f7b5 Fix two variable-reference bugs.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 81962
diff changeset
345 (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
346 "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
347 (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
348 (vc-switches 'CVS 'checkin))))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
349 (set-buffer "*vc*")
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
350 (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
351 (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
352 ;; Check checkin problem.
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
353 (cond
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
354 ((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
355 (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
356 files)
87139
f358a2fd5895 Fix buggy calls to `error'.
Deepak Goel <deego@gnufans.org>
parents: 86041
diff changeset
357 (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
358 (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
359 "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
360 (t
3c95af2888f6 (vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents: 32747
diff changeset
361 (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
362 (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
363 (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
364 (error "Check-in failed"))))
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
365 ;; 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
366 ;; 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
367 ;; 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
368 (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
369 (vc-file-setprop
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
370 (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
371 (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2))
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
372 (mapc (lambda (file) (vc-file-clearprops file)) files))
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
373 ;; 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
374 ;; 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
375 ;; 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
376 ;; 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
377 (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
378 files)
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
379
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
380 ;; 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
381 ;; a branch), remove the sticky tag.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
382 (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
383 (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
384
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
385 (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
386 (apply 'vc-cvs-command
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
387 buffer 0 file
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
388 "-Q" ; suppress diagnostic output
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
389 "update"
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
390 (and rev (not (string= rev ""))
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
391 (concat "-r" rev))
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
392 "-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
393 (vc-switches 'CVS 'checkout)))
47799
0d2f83a91144 (vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 47758
diff changeset
394
81764
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
395 (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
396 "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
397 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
398 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
399 (message "Checking out %s..." file)
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
400 ;; 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
401 (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
402 (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
403 ;; 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
404 ;; if necessary (using `cvs-edit' if requested).
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
405 (and editable (not (eq (vc-cvs-checkout-model file) 'implicit))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
406 (if vc-cvs-use-edit
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
407 (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
408 (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
409 (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
410 ;; Check out a particular revision (or recreate the file).
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
411 (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
412 (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
413 (and editable "-w")
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
414 "update"
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
415 (when rev
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
416 (unless (eq rev t)
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
417 ;; default for verbose checkout: clear the
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
418 ;; 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
419 ;; get the head of the trunk
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
420 (if (string= rev "")
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
421 "-A"
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
422 (concat "-r" rev))))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
423 (vc-switches 'CVS 'checkout)))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
424 (vc-mode-line file))
12e5ff38b024 (vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 75347
diff changeset
425 (message "Checking out %s...done" file))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
426
50923
3eab629b1239 (vc-cvs-mode-line-string): Use vc-default-mode-line-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50910
diff changeset
427 (defun vc-cvs-delete-file (file)
66551
e72e61aed95a (vc-cvs-delete-file): Commit the file after removing it.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
428 (vc-cvs-command nil 0 file "remove" "-f")
e72e61aed95a (vc-cvs-delete-file): Commit the file after removing it.
André Spiegel <spiegel@gnu.org>
parents: 64762
diff changeset
429 (vc-cvs-command nil 0 file "commit" "-mRemoved."))
50923
3eab629b1239 (vc-cvs-mode-line-string): Use vc-default-mode-line-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50910
diff changeset
430
39001
d13c2139752b (vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents: 38288
diff changeset
431 (defun vc-cvs-revert (file &optional contents-done)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
432 "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
433 (vc-default-revert 'CVS file contents-done)
39001
d13c2139752b (vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents: 38288
diff changeset
434 (unless (eq (vc-checkout-model file) 'implicit)
d13c2139752b (vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents: 38288
diff changeset
435 (if vc-cvs-use-edit
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
436 (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
437 ;; 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
438 (set-file-modes file (logand (file-modes file) 3950)))))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
439
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
440 (defun vc-cvs-merge (file first-revision &optional second-revision)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
441 "Merge changes into current working copy of FILE.
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
442 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
443 (vc-cvs-command nil 0 file
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
444 "update" "-kk"
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
445 (concat "-j" first-revision)
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
446 (concat "-j" second-revision))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
447 (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
448 (with-current-buffer (get-buffer "*vc*")
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
449 (goto-char (point-min))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
450 (if (re-search-forward "conflicts during merge" nil t)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
451 1 ; signal error
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
452 0))) ; signal success
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
453
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
454 (defun vc-cvs-merge-news (file)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
455 "Merge in any new changes made to FILE."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
456 (message "Merging changes into %s..." file)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
457 ;; (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
458 (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
459 (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
460 ;; 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
461 ;; file properties accordingly.
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
462 (with-current-buffer (get-buffer "*vc*")
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
463 (goto-char (point-min))
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
464 ;; get new working revision
50645
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
465 (if (re-search-forward
4b6925d144de (vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50453
diff changeset
466 "^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
467 (vc-file-setprop file 'vc-working-revision (match-string 1))
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
468 (vc-file-setprop file 'vc-working-revision nil))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
469 ;; get file status
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
470 (prog1
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
471 (if (eq (buffer-size) 0)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
472 0 ;; there were no news; indicate success
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
473 (if (re-search-forward
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
474 (concat "^\\([CMUP] \\)?"
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
475 (regexp-quote (file-name-nondirectory file))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
476 "\\( already contains the differences between \\)?")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
477 nil t)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
478 (cond
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
479 ;; Merge successful, we are in sync with repository now
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
480 ((or (match-string 2)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
481 (string= (match-string 1) "U ")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
482 (string= (match-string 1) "P "))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
483 (vc-file-setprop file 'vc-state 'up-to-date)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
484 (vc-file-setprop file 'vc-checkout-time
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
485 (nth 5 (file-attributes file)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
486 0);; indicate success to the caller
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
487 ;; Merge successful, but our own changes are still in the file
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
488 ((string= (match-string 1) "M ")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
489 (vc-file-setprop file 'vc-state 'edited)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
490 0);; indicate success to the caller
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
491 ;; Conflicts detected!
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
492 (t
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
493 (vc-file-setprop file 'vc-state 'edited)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
494 1);; signal the error to the caller
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
495 )
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
496 (pop-to-buffer "*vc*")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
497 (error "Couldn't analyze cvs update result")))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
498 (message "Merging changes into %s...done" file))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
499
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
500 (defun vc-cvs-modify-change-comment (files rev comment)
315124ffb889 * (vc.el, vc-sccs.el, vc-rcs.el, vc-cs.el, vc-mcvs.el): Put
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87427
diff changeset
501 "Modify the change comments for FILES on a specified REV.
315124ffb889 * (vc.el, vc-sccs.el, vc-rcs.el, vc-cs.el, vc-mcvs.el): Put
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87427
diff changeset
502 Will fail unless you have administrative privileges on the repo."
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
503 (vc-cvs-command nil 0 files "rcs" (concat "-m" comment ":" rev)))
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
504
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
505 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
506 ;;; History functions
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
507 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
508
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
509 (defun vc-cvs-print-log (files &optional buffer)
87427
1aea302af710 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87424
diff changeset
510 "Get change logs associated with FILES."
1aea302af710 *** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 87424
diff changeset
511 ;; 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
512 (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
513 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
514 (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
515 files "log"))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
516
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
517 (defun vc-cvs-wash-log ()
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
518 "Remove all non-comment information from log output."
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
519 (vc-call-backend 'RCS 'wash-log)
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
520 nil)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
521
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
522 (defun vc-cvs-diff (files &optional oldvers newvers buffer)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
523 "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
524 (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
525 (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
526 (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
527 status)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
528 ;; 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
529 ;; 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
530 (dolist (file files)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
531 (let ((ov oldvers)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
532 (nv newvers))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
533 (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
534 (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
535 (when (string-equal nv "")
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
536 (setq nv nil))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
537 (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
538 (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
539 file
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
540 (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
541 (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
542 (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
543 (progn
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
544 (apply 'vc-do-command (or buffer "*vc-diff*") 1 "diff" nil
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
545 (append (if (listp diff-switches)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
546 diff-switches
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
547 (list diff-switches))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
548 (if (listp vc-diff-switches)
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
549 vc-diff-switches
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
550 (list vc-diff-switches))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
551 (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
552 (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
553 (setq status 0))
62a404545514 (vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents: 86002
diff changeset
554 (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
555 (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
556 (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
557 (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
558 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
559 (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
560 (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
561 (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
562 (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
563
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
564
40125
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
565 (defun vc-cvs-diff-tree (dir &optional rev1 rev2)
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
566 "Diff all files at and below DIR."
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
567 (with-current-buffer "*vc-diff*"
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
568 (setq default-directory dir)
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
569 (if (vc-stay-local-p dir)
40125
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
570 ;; local diff: do it filewise, and only for files that are modified
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
571 (vc-file-tree-walk
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
572 dir
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
573 (lambda (f)
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
574 (vc-exec-after
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
575 `(let ((coding-system-for-read (vc-coding-system-for-diff ',f)))
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
576 ;; possible optimization: fetch the state of all files
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
577 ;; in the tree via vc-cvs-dir-state-heuristic
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
578 (unless (vc-up-to-date-p ',f)
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
579 (message "Looking at %s" ',f)
43727
1163adb21e5d (vc-cvs-diff-tree): Fix typo in parameter names.
André Spiegel <spiegel@gnu.org>
parents: 43533
diff changeset
580 (vc-diff-internal ',f ',rev1 ',rev2))))))
40125
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
581 ;; cvs diff: use a single call for the entire tree
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
582 (let ((coding-system-for-read
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
583 (or coding-system-for-read 'undecided)))
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
584 (apply 'vc-cvs-command "*vc-diff*" 1 nil "diff"
43727
1163adb21e5d (vc-cvs-diff-tree): Fix typo in parameter names.
André Spiegel <spiegel@gnu.org>
parents: 43533
diff changeset
585 (and rev1 (concat "-r" rev1))
1163adb21e5d (vc-cvs-diff-tree): Fix typo in parameter names.
André Spiegel <spiegel@gnu.org>
parents: 43533
diff changeset
586 (and rev2 (concat "-r" rev2))
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
587 (vc-switches 'CVS 'diff))))))
40125
b2e4b1a5315a (vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents: 39001
diff changeset
588
81820
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
589 (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
590
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
591 (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
592 (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
593 (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
594 ;; 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
595 (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
596 (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
597 (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
598 (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
599
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
600 (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
601 "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
602 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
603 (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
604 (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
605 'async 0)
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
606 file "annotate"
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
607 (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
608 ;; 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
609 (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
610 (if proc
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
611 ;; 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
612 (progn
37a7f9bddc45 (vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81764
diff changeset
613 (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
614 (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
615 (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
616 (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
617 (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
618 (delete-region (point-min) (1- (point)))))))
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
619
40171
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
620 (defun vc-cvs-annotate-current-time ()
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
621 "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
622 encoded as fractional days."
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
623 (vc-annotate-convert-time
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
624 (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
625
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
626 (defun vc-cvs-annotate-time ()
91eda91380cb New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents: 40125
diff changeset
627 "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
628 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
629 (let* ((bol (point))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
630 (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
631 (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
632 (inhibit-modification-hooks t))
57916
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
633 (cond
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
634 (cache)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
635 ((looking-at
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
636 "^\\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
637 (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
638 (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
639 '((Jan . 1) (Feb . 2) (Mar . 3)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
640 (Apr . 4) (May . 5) (Jun . 6)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
641 (Jul . 7) (Aug . 8) (Sep . 9)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
642 (Oct . 10) (Nov . 11) (Dec . 12)))))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
643 (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
644 ;; Years 0..68 are 2000..2068.
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
645 ;; Years 69..99 are 1969..1999.
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
646 (+ (cond ((> 69 tmp) 2000)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
647 ((> 100 tmp) 1900)
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
648 (t 0))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
649 tmp))))
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
650 (put-text-property
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
651 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
652 (setq cache (cons
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
653 ;; 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
654 ;; 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
655 ;; 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
656 ;; 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
657 (- (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
658 (vc-annotate-convert-time
990dbd4941c8 (vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 57913
diff changeset
659 (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
660 (when cache
79690
be4e5f45a3eb (vc-cvs-annotate-time): Don't move backward when text
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 78359
diff changeset
661 (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
662 (cdr cache)))) ; days (float)
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
663
53631
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
664 (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
665 (save-excursion
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
666 (beginning-of-line)
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
667 (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
668 (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
669 (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
670 nil)))
74e44ab76fa5 * vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents: 52717
diff changeset
671
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
672 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
673 ;;; Snapshot system
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
674 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
675
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
676 (defun vc-cvs-create-snapshot (dir name branchp)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
677 "Assign to DIR's current revision a given NAME.
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
678 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
679 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
680 (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
681 (when branchp (vc-cvs-command nil 0 dir "update" "-r" name)))
33560
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 (defun vc-cvs-retrieve-snapshot (dir name update)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
684 "Retrieve a snapshot at and below DIR.
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
685 NAME is the name of the snapshot; if it is empty, do a `cvs update'.
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
686 If UPDATE is non-nil, then update (resynch) any affected buffers."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
687 (with-current-buffer (get-buffer-create "*vc*")
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
688 (let ((default-directory dir)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
689 (sticky-tag))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
690 (erase-buffer)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
691 (if (or (not name) (string= name ""))
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
692 (vc-cvs-command t 0 nil "update")
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
693 (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
694 (setq sticky-tag name))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
695 (when update
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
696 (goto-char (point-min))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
697 (while (not (eobp))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
698 (if (looking-at "\\([CMUP]\\) \\(.*\\)")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
699 (let* ((file (expand-file-name (match-string 2) dir))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
700 (state (match-string 1))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
701 (buffer (find-buffer-visiting file)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
702 (when buffer
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
703 (cond
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
704 ((or (string= state "U")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
705 (string= state "P"))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
706 (vc-file-setprop file 'vc-state 'up-to-date)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
707 (vc-file-setprop file 'vc-working-revision nil)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
708 (vc-file-setprop file 'vc-checkout-time
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
709 (nth 5 (file-attributes file))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
710 ((or (string= state "M")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
711 (string= state "C"))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
712 (vc-file-setprop file 'vc-state 'edited)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
713 (vc-file-setprop file 'vc-working-revision nil)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
714 (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
715 (vc-file-setprop file 'vc-cvs-sticky-tag sticky-tag)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
716 (vc-resynch-buffer file t t))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
717 (forward-line 1))))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
718
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
719
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
720 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
721 ;;; Miscellaneous
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
722 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
723
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
724 (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
725 "Return non-nil if version backups should be made for FILE.")
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
726
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
727 (defun vc-cvs-check-headers ()
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
728 "Check if the current file has any headers in it."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
729 (save-excursion
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
730 (goto-char (point-min))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
731 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
732 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
733
35569
5cd8ebba5a94 doc&comment fix
Sam Steingold <sds@gnu.org>
parents: 35177
diff changeset
734
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
735 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
736 ;;; Internal functions
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
737 ;;;
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
738
91956
7bc22dad5f9a Make sure all backends support vc-BACKEND-root.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87739
diff changeset
739 (defun vc-cvs-root (dir)
7bc22dad5f9a Make sure all backends support vc-BACKEND-root.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87739
diff changeset
740 (vc-find-root dir "CVS" t))
7bc22dad5f9a Make sure all backends support vc-BACKEND-root.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents: 87739
diff changeset
741
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
742 (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
743 "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
744 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
745 and that it passes `vc-cvs-global-switches' to it before FLAGS."
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
746 (apply 'vc-do-command buffer okstatus "cvs" files
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
747 (if (stringp vc-cvs-global-switches)
44197
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
748 (cons vc-cvs-global-switches flags)
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
749 (append vc-cvs-global-switches
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
750 flags))))
e255f8fa4f62 (vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents: 44104
diff changeset
751
51733
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
752 (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
753
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
754 (defun vc-cvs-repository-hostname (dirname)
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
755 "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
756 (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
757 (when (file-readable-p rootname)
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
758 (with-temp-buffer
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
759 (let ((coding-system-for-read
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
760 (or file-name-coding-system
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
761 default-file-name-coding-system)))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
762 (vc-insert-file rootname))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
763 (goto-char (point-min))
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
764 (nth 2 (vc-cvs-parse-root
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
765 (buffer-substring (point)
2b72fd42f02e (vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 51164
diff changeset
766 (line-end-position))))))))
50668
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
767
50898
8806616471e2 (vc-cvs-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 50671
diff changeset
768 (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
769 "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
770 A CVS root specification of the form
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
771 [:METHOD:][[USER@]HOSTNAME:]/path/to/repository
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
772 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
773 \(METHOD USER HOSTNAME CVS-ROOT).
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
774 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
775 /path/to/repository
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
776 is `local'.
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
777 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
778 [USER@]HOSTNAME:/path/to/repository
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
779 is `ext'.
60912
4a2ea521d778 * vc-cvs.el: Replace `illegal' with `invalid'.
Werner LEMBERG <wl@gnu.org>
parents: 59996
diff changeset
780 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
781 ;; 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
782 ;; 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
783 ;; `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
784 (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
785 (len (length root-list))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
786 ;; 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
787 (root-list
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
788 (cond
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
789 ((= len 0)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
790 ;; Invalid CVS root
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
791 nil)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
792 ((= len 1)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
793 ;; Simple PATH => method `local'
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
794 (cons "local"
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
795 (cons nil root-list)))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
796 ((= len 2)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
797 ;; [USER@]HOST:PATH => method `ext'
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
798 (and (not (equal (car root-list) ""))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
799 (cons "ext" root-list)))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
800 ((= len 3)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
801 ;; :METHOD:PATH
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
802 (cons (cadr root-list)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
803 (cons nil (cddr root-list))))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
804 (t
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
805 ;; :METHOD:[USER@]HOST:PATH
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
806 (cdr root-list)))))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
807 (if root-list
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
808 (let ((method (car root-list))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
809 (uhost (or (cadr root-list) ""))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
810 (root (nth 2 root-list))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
811 user host)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
812 ;; Split USER@HOST
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
813 (if (string-match "\\(.*\\)@\\(.*\\)" uhost)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
814 (setq user (match-string 1 uhost)
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
815 host (match-string 2 uhost))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
816 (setq host uhost))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
817 ;; Remove empty HOST
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
818 (and (equal host "")
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
819 (setq host))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
820 ;; 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
821 (and host
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
822 (equal method "local")
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
823 (setq root (concat host ":" root) host))
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
824 ;; Normalize CVS root record
01d84e9d30e0 Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents: 50645
diff changeset
825 (list method user host root)))))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
826
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
827 (defun vc-cvs-parse-status (&optional full)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
828 "Parse output of \"cvs status\" command in the current buffer.
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
829 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
830 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
831 state."
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
832 (let (file status)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
833 (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
834 (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
835 (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
836 (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
837 (forward-line 1))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
838 (if (re-search-forward "^File: " nil t)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
839 (cond
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
840 ((looking-at "no file") nil)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
841 ((re-search-forward "\\=\\([^ \t]+\\)" nil t)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
842 (setq file (expand-file-name (match-string 1)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
843 (vc-file-setprop file 'vc-backend 'CVS)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
844 (if (not (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
845 (setq status "Unknown")
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
846 (setq status (match-string 1)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
847 (if (and full
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
848 (re-search-forward
41707
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
849 "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
850 \[\t ]+\\([0-9.]+\\)"
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
851 nil t))
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
852 (vc-file-setprop file 'vc-latest-revision (match-string 2)))
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
853 (vc-file-setprop
41707
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
854 file 'vc-state
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
855 (cond
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
856 ((string-match "Up-to-date" status)
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
857 (vc-file-setprop file 'vc-checkout-time
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
858 (nth 5 (file-attributes file)))
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
859 'up-to-date)
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
860 ((string-match "Locally Modified" status) 'edited)
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
861 ((string-match "Needs Merge" status) 'needs-merge)
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
862 ((string-match "Needs \\(Checkout\\|Patch\\)" status) 'needs-patch)
94df6eb103b3 (vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents: 41520
diff changeset
863 (t 'edited))))))))
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
864
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
865 (defun vc-cvs-dir-state-heuristic (dir)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
866 "Find the CVS state of all files in DIR, using only local information."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
867 (with-temp-buffer
50453
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
868 (vc-cvs-get-entries dir)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
869 (goto-char (point-min))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
870 (while (not (eobp))
44104
985526b08270 (vc-cvs-registered, vc-cvs-dir-state-heuristic):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44005
diff changeset
871 ;; CVS-removed files are not taken under VC control.
985526b08270 (vc-cvs-registered, vc-cvs-dir-state-heuristic):
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 44005
diff changeset
872 (when (looking-at "/\\([^/]*\\)/[^/-]")
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
873 (let ((file (expand-file-name (match-string 1) dir)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
874 (unless (vc-file-getprop file 'vc-state)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
875 (vc-cvs-parse-entry file t))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
876 (forward-line 1))))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
877
50453
e499daf7fb22 (vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents: 50321
diff changeset
878 (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
879 "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
880 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
881 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
882 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
883 (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
884 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
885 (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
886
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
887 (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
888 "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
889 ;; 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
890 ;; 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
891 ;; lowercase letters, digits, `-', and `_'.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
892 (and (string-match "^[a-zA-Z]" tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
893 (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
894
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
895 (defun vc-cvs-valid-revision-number-p (tag)
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
896 "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
897 (and (string-match "^[0-9]" tag)
6eb10924e77f (vc-cvs-valid-version-number-p): New function.
Sam Steingold <sds@gnu.org>
parents: 44436
diff changeset
898 (not (string-match "[^0-9.]" tag))))
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
899
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
900 (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
901 "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
902 `match-data' is protected."
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
903 (let ((data (match-data))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
904 (tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
905 (type (cond ((string= match-type "D") 'date)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
906 ((string= match-type "T")
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
907 (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
908 'symbolic-name
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
909 'revision-number))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
910 (t nil))))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
911 (unwind-protect
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
912 (progn
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
913 (cond
46163
426c8cf1a3df Fix typo.
Juanma Barranquero <lekktu@gmail.com>
parents: 45255
diff changeset
914 ;; 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
915 ((eq type 'date)
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
916 (string-match
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
917 "\\([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
918 match-tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
919 (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
920 (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
921 (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
922 (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
923 (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
924 (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
925 ;; Years 0..68 are 2000..2068.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
926 ;; Years 69..99 are 1969..1999.
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
927 (year (+ (cond ((> 69 year-tmp) 2000)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
928 ((> 100 year-tmp) 1900)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
929 (t 0))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
930 year-tmp)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
931 (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
932 ;; Sticky Tag name or revision number
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
933 ((eq type 'symbolic-name) (setq tag match-tag))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
934 ((eq type 'revision-number) (setq tag match-tag))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
935 ;; Default is no sticky tag at all
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
936 (t nil))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
937 (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
938 ((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
939 (cond ((eq type 'date) (format-time-string
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
940 vc-cvs-sticky-date-format-string
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
941 tag))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
942 ((eq type 'symbolic-name) tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
943 ((eq type 'revision-number) tag)
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
944 (t nil)))
44436
f9db51bb423b (vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents: 44197
diff changeset
945 ((functionp vc-cvs-sticky-tag-display)
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
946 (funcall vc-cvs-sticky-tag-display tag type))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
947 (t nil)))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
948
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
949 (set-match-data data))))
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
950
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
951 (defun vc-cvs-parse-entry (file &optional set-state)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
952 "Parse a line from CVS/Entries.
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
953 Compare modification time to that of the FILE, set file properties
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
954 accordingly. However, `vc-state' is set only if optional arg SET-STATE
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
955 is non-nil."
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
956 (cond
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
957 ;; entry for a "locally added" file (not yet committed)
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
958 ((looking-at "/[^/]+/0/")
87507
fd67c20d4a7e (vc-cvs-parse-entry): Set the vc-backend property.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87450
diff changeset
959 (vc-file-setprop file 'vc-backend 'CVS)
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
960 (vc-file-setprop file 'vc-checkout-time 0)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
961 (vc-file-setprop file 'vc-working-revision "0")
33560
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
962 (if set-state (vc-file-setprop file 'vc-state 'edited)))
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
963 ;; normal entry
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
964 ((looking-at
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
965 (concat "/[^/]+"
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
966 ;; revision
da206bbad86b Functions reordered.
André Spiegel <spiegel@gnu.org>
parents: 33554
diff changeset
967 "/\\([^/]*\\)"
50321
17ff9d10125f (vc-cvs-parse-entry): Make sure a file with conflicts
Andreas Schwab <schwab@suse.de>
parents: 49822
diff changeset
968 ;; 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
969 "/\\([^/]*\\)/"
43447
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
970 ;; options
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
971 "\\([^/]*\\)/"
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
972 ;; sticky tag
79cf46e34420 Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents: 42657
diff changeset
973 "\\(.\\|\\)" ;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
974 "\\(.*\\)")) ;Sticky tag
87507
fd67c20d4a7e (vc-cvs-parse-entry): Set the vc-backend property.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 87450
diff changeset
975 (vc-file-setprop file 'vc-backend 'CVS)
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 84583
diff changeset
976 (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
977 (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
978 (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
979 (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
980 ;; 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
981 ;; 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
982 ;; (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
983 ;; 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
984 (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
985 (require 'parse-time)
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
986 (let ((parsed-time
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
987 (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
988 (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
989 (car parsed-time)
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
990 (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
991 (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
992 (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
993 (t
9197177c5f99 (vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents: 52624
diff changeset
994 (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
995 (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
996
78359
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
997 ;; 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
998 ;; 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
999 ;; `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
1000 ;; tag names.
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1001
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1002 (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
1003 (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
1004 (res nil))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1005 (with-temp-buffer
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1006 (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
1007 (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
1008 (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
1009 (while (looking-at "^ \\(.*\\): \\(.*\\)")
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1010 (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
1011 (forward-line 1)))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1012 (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
1013 (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
1014 res)))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1015
85458
119299b8a040 (vc-cvs-revision-completion-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85139
diff changeset
1016 (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
1017 (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
1018 table)
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1019 (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
1020 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
1021 table))
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1022
2dd5d799a16d * vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 78236
diff changeset
1023
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1024 (provide 'vc-cvs)
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1025
81821
0d37b602a4f0 Require CL.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 81820
diff changeset
1026 ;; arch-tag: 60e1402a-aa53-4607-927a-cf74f144b432
31384
f6cb7dfe5e7c (vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff changeset
1027 ;;; vc-cvs.el ends here