Mercurial > emacs
annotate lisp/vc-cvs.el @ 86589:a8357c53ed02
Move here from lisp/nxml/char-name/unicode
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Wed, 28 Nov 2007 05:00:18 +0000 |
parents | 62a404545514 |
children | f358a2fd5895 53108e6cea98 |
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, |
75347 | 4 ;; 2004, 2005, 2006, 2007 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 | 25 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
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 |
81821 | 32 (eval-when-compile (require 'cl) (require 'vc)) |
35584 | 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 | 37 |
35569 | 38 ;;; |
33560 | 39 ;;; Customization options |
40 ;;; | |
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 | 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 | 76 :version "21.1" |
35177 | 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 | 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 | 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 | 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 | 154 |
33560 | 155 ;;; |
156 ;;; Internal variables | |
157 ;;; | |
158 | |
35569 | 159 |
33560 | 160 ;;; |
35569 | 161 ;;; State-querying functions |
33560 | 162 ;;; |
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 | 180 (cond |
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 | 214 (defun vc-cvs-dir-state (dir) |
215 "Find the CVS state of all files in DIR." | |
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 |
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
224 (vc-cvs-command t 0 nil "status" "-l") |
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
225 (goto-char (point-min)) |
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
226 (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
|
227 (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
|
228 (vc-cvs-parse-status) |
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
229 (goto-char (point-max)) |
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
230 (widen))))))) |
33560 | 231 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
232 (defun vc-cvs-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
233 "CVS-specific version of `vc-working-revision'." |
33560 | 234 ;; There is no need to consult RCS headers under CVS, because we |
235 ;; get the workfile version for free when we recognize that a file | |
236 ;; is registered in CVS. | |
237 (vc-cvs-registered file) | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
238 (vc-file-getprop file 'vc-working-revision)) |
33560 | 239 |
240 (defun vc-cvs-checkout-model (file) | |
241 "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
|
242 (if (getenv "CVSREAD") |
33560 | 243 'announce |
62606
6e91e3b4e9bc
(vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents:
60912
diff
changeset
|
244 (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
|
245 (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
|
246 ;; 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
|
247 ;; 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
|
248 ;; "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
|
249 ;; (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
|
250 ;; 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
|
251 ;; 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
|
252 (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
|
253 'announce |
6e91e3b4e9bc
(vc-cvs-checkout-model): Handle the case where FILE doesn't exist.
André Spiegel <spiegel@gnu.org>
parents:
60912
diff
changeset
|
254 'implicit)))) |
33560 | 255 |
31404
f2ab9420390f
2000-09-05 Stefan Monnier <monnier@cs.yale.edu>
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31384
diff
changeset
|
256 (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
|
257 "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
|
258 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
|
259 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
|
260 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
|
261 (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
|
262 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
|
263 (string |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
264 (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
|
265 ;; 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
|
266 (progn |
1350ba0c0448
* vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81988
diff
changeset
|
267 (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
|
268 "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 (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
|
270 (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
|
271 (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
|
272 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 (propertize |
1350ba0c0448
* vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81988
diff
changeset
|
274 (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
|
275 string |
1350ba0c0448
* vc-cvs.el (vc-cvs-mode-line-string): Add support for tooltips
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81988
diff
changeset
|
276 (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
|
277 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
|
278 (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
|
279 '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
|
280 |
33560 | 281 (defun vc-cvs-dired-state-info (file) |
282 "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
|
283 (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
|
284 (cond ((eq cvs-state 'edited) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
285 (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
|
286 "(added)" "(modified)")) |
8806616471e2
(vc-cvs-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50671
diff
changeset
|
287 ((eq cvs-state 'needs-patch) "(patch)") |
8806616471e2
(vc-cvs-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50671
diff
changeset
|
288 ((eq cvs-state 'needs-merge) "(merge)")))) |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
289 |
35569 | 290 |
33560 | 291 ;;; |
292 ;;; State-changing functions | |
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 | 299 `vc-register-switches' and `vc-cvs-register-switches' are passed to |
300 the CVS command (in that order)." | |
51733
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
301 (when (and (not (vc-cvs-responsible-p file)) |
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
|
302 (vc-cvs-could-register file)) |
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
|
303 ;; Register the directory if needed. |
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
|
304 (vc-cvs-register (directory-file-name (file-name-directory file)))) |
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
|
305 (apply 'vc-cvs-command nil 0 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
|
306 "add" |
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
|
307 (and comment (string-match "[^\t\n ]" 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
|
308 (concat "-m" 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
|
309 (vc-switches 'CVS 'register))) |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
310 |
33560 | 311 (defun vc-cvs-responsible-p (file) |
312 "Return non-nil if CVS thinks it is responsible for FILE." | |
313 (file-directory-p (expand-file-name "CVS" | |
314 (if (file-directory-p file) | |
315 file | |
316 (file-name-directory file))))) | |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
317 |
51733
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
318 (defun vc-cvs-could-register (file) |
33560 | 319 "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
|
320 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
|
321 its parents." |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
322 (let ((dir file)) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
323 (while (and (stringp dir) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
324 (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
|
325 dir) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
326 (setq dir (if (file-directory-p |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
327 (expand-file-name "CVS/Entries" dir)) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
328 t (directory-file-name dir)))) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
329 (eq dir t))) |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
330 |
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
|
331 (defun vc-cvs-checkin (files rev comment) |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
332 "CVS-specific version of `vc-backend-checkin'." |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
333 (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
|
334 (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
|
335 (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
|
336 ;; 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
|
337 ;; 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
|
338 (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
|
339 (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
|
340 (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
|
341 files))) |
69946487f7b5
Fix two variable-reference bugs.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81962
diff
changeset
|
342 (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
|
343 "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
|
344 (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
|
345 (vc-switches 'CVS 'checkin)))) |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
346 (set-buffer "*vc*") |
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
347 (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
|
348 (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
|
349 ;; Check checkin problem. |
3c95af2888f6
(vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents:
32747
diff
changeset
|
350 (cond |
3c95af2888f6
(vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents:
32747
diff
changeset
|
351 ((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
|
352 (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
|
353 files) |
32948
3c95af2888f6
(vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents:
32747
diff
changeset
|
354 (error (substitute-command-keys |
3c95af2888f6
(vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents:
32747
diff
changeset
|
355 (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
|
356 "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
|
357 (t |
3c95af2888f6
(vc-cvs-checkin): Check both status and error message after command.
André Spiegel <spiegel@gnu.org>
parents:
32747
diff
changeset
|
358 (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
|
359 (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
|
360 (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
|
361 (error "Check-in failed")))) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
362 ;; 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
|
363 ;; 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
|
364 ;; 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
|
365 (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
|
366 (vc-file-setprop |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
367 (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
|
368 (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
|
369 (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
|
370 ;; 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
|
371 ;; 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
|
372 ;; 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
|
373 ;; 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
|
374 (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
|
375 files) |
43447
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
376 |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
377 ;; 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
|
378 ;; a branch), remove the sticky tag. |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
379 (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
|
380 (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
|
381 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
382 (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
|
383 (apply 'vc-cvs-command |
0d2f83a91144
(vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47758
diff
changeset
|
384 buffer 0 file |
0d2f83a91144
(vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47758
diff
changeset
|
385 "-Q" ; suppress diagnostic output |
0d2f83a91144
(vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47758
diff
changeset
|
386 "update" |
0d2f83a91144
(vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47758
diff
changeset
|
387 (and rev (not (string= rev "")) |
0d2f83a91144
(vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47758
diff
changeset
|
388 (concat "-r" rev)) |
0d2f83a91144
(vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47758
diff
changeset
|
389 "-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
|
390 (vc-switches 'CVS 'checkout))) |
47799
0d2f83a91144
(vc-cvs-find-version): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47758
diff
changeset
|
391 |
81764
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
392 (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
|
393 "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
|
394 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
|
395 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
|
396 (message "Checking out %s..." file) |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
397 ;; 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
|
398 (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
|
399 (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
|
400 ;; 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
|
401 ;; 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
|
402 (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
|
403 (if vc-cvs-use-edit |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
404 (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
|
405 (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
|
406 (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
|
407 ;; Check out a particular revision (or recreate the file). |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
408 (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
|
409 (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
|
410 (and editable "-w") |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
411 "update" |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
412 (when rev |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
413 (unless (eq rev t) |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
414 ;; default for verbose checkout: clear the |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
415 ;; 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
|
416 ;; get the head of the trunk |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
417 (if (string= rev "") |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
418 "-A" |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
419 (concat "-r" rev)))) |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
420 (vc-switches 'CVS 'checkout))) |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
421 (vc-mode-line file)) |
12e5ff38b024
(vc-cvs-revert): Use vc-default-revert.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75347
diff
changeset
|
422 (message "Checking out %s...done" file)) |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
423 |
50923
3eab629b1239
(vc-cvs-mode-line-string): Use vc-default-mode-line-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50910
diff
changeset
|
424 (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
|
425 (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
|
426 (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
|
427 |
39001
d13c2139752b
(vc-*-revert-file): Handle new optional arg CONTENTS-DONE.
André Spiegel <spiegel@gnu.org>
parents:
38288
diff
changeset
|
428 (defun vc-cvs-revert (file &optional contents-done) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
429 "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
|
430 (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
|
431 (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
|
432 (if vc-cvs-use-edit |
44197
e255f8fa4f62
(vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
44104
diff
changeset
|
433 (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
|
434 ;; 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
|
435 (set-file-modes file (logand (file-modes file) 3950))))) |
33560 | 436 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
437 (defun vc-cvs-merge (file first-revision &optional second-revision) |
33560 | 438 "Merge changes into current working copy of FILE. |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
439 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
|
440 (vc-cvs-command nil 0 file |
33560 | 441 "update" "-kk" |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
442 (concat "-j" first-revision) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
443 (concat "-j" second-revision)) |
33560 | 444 (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
|
445 (with-current-buffer (get-buffer "*vc*") |
33560 | 446 (goto-char (point-min)) |
447 (if (re-search-forward "conflicts during merge" nil t) | |
448 1 ; signal error | |
449 0))) ; signal success | |
450 | |
451 (defun vc-cvs-merge-news (file) | |
452 "Merge in any new changes made to FILE." | |
453 (message "Merging changes into %s..." file) | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
454 ;; (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
|
455 (vc-file-setprop file 'vc-checkout-time 0) |
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
456 (vc-cvs-command nil 0 file "update") |
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
457 ;; 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
|
458 ;; file properties accordingly. |
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
459 (with-current-buffer (get-buffer "*vc*") |
33560 | 460 (goto-char (point-min)) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
461 ;; get new working revision |
50645
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
462 (if (re-search-forward |
4b6925d144de
(vc-cvs-dir-state): Use vc-cvs-command.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50453
diff
changeset
|
463 "^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
|
464 (vc-file-setprop file 'vc-working-revision (match-string 1)) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
465 (vc-file-setprop file 'vc-working-revision nil)) |
33560 | 466 ;; get file status |
467 (prog1 | |
468 (if (eq (buffer-size) 0) | |
469 0 ;; there were no news; indicate success | |
470 (if (re-search-forward | |
471 (concat "^\\([CMUP] \\)?" | |
472 (regexp-quote (file-name-nondirectory file)) | |
473 "\\( already contains the differences between \\)?") | |
474 nil t) | |
475 (cond | |
476 ;; Merge successful, we are in sync with repository now | |
477 ((or (match-string 2) | |
478 (string= (match-string 1) "U ") | |
479 (string= (match-string 1) "P ")) | |
480 (vc-file-setprop file 'vc-state 'up-to-date) | |
481 (vc-file-setprop file 'vc-checkout-time | |
482 (nth 5 (file-attributes file))) | |
483 0);; indicate success to the caller | |
484 ;; Merge successful, but our own changes are still in the file | |
485 ((string= (match-string 1) "M ") | |
486 (vc-file-setprop file 'vc-state 'edited) | |
487 0);; indicate success to the caller | |
488 ;; Conflicts detected! | |
489 (t | |
490 (vc-file-setprop file 'vc-state 'edited) | |
491 1);; signal the error to the caller | |
492 ) | |
493 (pop-to-buffer "*vc*") | |
494 (error "Couldn't analyze cvs update result"))) | |
495 (message "Merging changes into %s...done" file)))) | |
496 | |
35569 | 497 |
33560 | 498 ;;; |
499 ;;; History functions | |
500 ;;; | |
501 | |
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
|
502 (defun vc-cvs-print-log (files &optional buffer) |
33560 | 503 "Get change log associated with FILE." |
44197
e255f8fa4f62
(vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
44104
diff
changeset
|
504 (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
|
505 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
|
506 (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
|
507 files "log")) |
33560 | 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-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
|
510 "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
|
511 (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
|
512 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
|
513 |
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
|
514 (defun vc-cvs-diff (files &optional oldvers newvers buffer) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
515 "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
|
516 (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
|
517 (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
|
518 (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
|
519 status) |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
520 ;; 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
|
521 ;; 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
|
522 (dolist (file files) |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
523 (let ((ov oldvers) |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
524 (nv newvers)) |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
525 (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
|
526 (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
|
527 (when (string-equal nv "") |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
528 (setq nv nil)) |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
529 (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
|
530 (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
|
531 file |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
532 (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
|
533 (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
|
534 (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
|
535 (progn |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
536 (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
|
537 (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
|
538 diff-switches |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
539 (list diff-switches)) |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
540 (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
|
541 vc-diff-switches |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
542 (list vc-diff-switches)) |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
543 (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
|
544 (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
|
545 (setq status 0)) |
62a404545514
(vc-cvs-diff): If backup files exist, diff them
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
546 (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
|
547 (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
|
548 (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
|
549 (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
|
550 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
|
551 (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
|
552 (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
|
553 (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
|
554 (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
|
555 |
33560 | 556 |
40125
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
557 (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
|
558 "Diff all files at and below DIR." |
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
559 (with-current-buffer "*vc-diff*" |
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
560 (setq default-directory dir) |
51733
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
561 (if (vc-stay-local-p dir) |
40125
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
562 ;; 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
|
563 (vc-file-tree-walk |
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
564 dir |
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
565 (lambda (f) |
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
566 (vc-exec-after |
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
567 `(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
|
568 ;; possible optimization: fetch the state of all files |
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
569 ;; 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
|
570 (unless (vc-up-to-date-p ',f) |
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
571 (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
|
572 (vc-diff-internal ',f ',rev1 ',rev2)))))) |
40125
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
573 ;; 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
|
574 (let ((coding-system-for-read |
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
575 (or coding-system-for-read 'undecided))) |
44197
e255f8fa4f62
(vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
44104
diff
changeset
|
576 (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
|
577 (and rev1 (concat "-r" rev1)) |
1163adb21e5d
(vc-cvs-diff-tree): Fix typo in parameter names.
André Spiegel <spiegel@gnu.org>
parents:
43533
diff
changeset
|
578 (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
|
579 (vc-switches 'CVS 'diff)))))) |
40125
b2e4b1a5315a
(vc-cvs-diff-tree): New function.
André Spiegel <spiegel@gnu.org>
parents:
39001
diff
changeset
|
580 |
81820
37a7f9bddc45
(vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81764
diff
changeset
|
581 (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
|
582 |
37a7f9bddc45
(vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81764
diff
changeset
|
583 (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
|
584 (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
|
585 (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
|
586 ;; 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
|
587 (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
|
588 (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
|
589 (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
|
590 (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
|
591 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
592 (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
|
593 "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
|
594 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
|
595 (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
|
596 (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
|
597 'async 0) |
37a7f9bddc45
(vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81764
diff
changeset
|
598 file "annotate" |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
599 (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
|
600 ;; 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
|
601 (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
|
602 (if proc |
37a7f9bddc45
(vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81764
diff
changeset
|
603 ;; 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
|
604 (progn |
37a7f9bddc45
(vc-functions): Clear up the cache when reloading the file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81764
diff
changeset
|
605 (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
|
606 (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
|
607 (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
|
608 (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
|
609 (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
|
610 (delete-region (point-min) (1- (point))))))) |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
611 |
40171
91eda91380cb
New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40125
diff
changeset
|
612 (defun vc-cvs-annotate-current-time () |
91eda91380cb
New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40125
diff
changeset
|
613 "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
|
614 encoded as fractional days." |
91eda91380cb
New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40125
diff
changeset
|
615 (vc-annotate-convert-time |
91eda91380cb
New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40125
diff
changeset
|
616 (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
|
617 |
91eda91380cb
New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40125
diff
changeset
|
618 (defun vc-cvs-annotate-time () |
91eda91380cb
New scaling algorithm for vc-annotate.
André Spiegel <spiegel@gnu.org>
parents:
40125
diff
changeset
|
619 "Return the time of the next annotation (as fraction of days) |
42206 | 620 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
|
621 (let* ((bol (point)) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
622 (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
|
623 (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
|
624 (inhibit-modification-hooks t)) |
57916
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
625 (cond |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
626 (cache) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
627 ((looking-at |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
628 "^\\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
|
629 (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
|
630 (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
|
631 '((Jan . 1) (Feb . 2) (Mar . 3) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
632 (Apr . 4) (May . 5) (Jun . 6) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
633 (Jul . 7) (Aug . 8) (Sep . 9) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
634 (Oct . 10) (Nov . 11) (Dec . 12))))) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
635 (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
|
636 ;; Years 0..68 are 2000..2068. |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
637 ;; Years 69..99 are 1969..1999. |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
638 (+ (cond ((> 69 tmp) 2000) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
639 ((> 100 tmp) 1900) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
640 (t 0)) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
641 tmp)))) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
642 (put-text-property |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
643 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
|
644 (setq cache (cons |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
645 ;; Position at end makes for nicer overlay result. |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
646 (match-end 0) |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
647 (vc-annotate-convert-time |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
648 (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
|
649 (when cache |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
650 (goto-char (car cache)) ; fontify from here to eol |
990dbd4941c8
(vc-cvs-local-month-numbers): Delete var.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
57913
diff
changeset
|
651 (cdr cache)))) ; days (float) |
35569 | 652 |
53631
74e44ab76fa5
* vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents:
52717
diff
changeset
|
653 (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
|
654 (save-excursion |
74e44ab76fa5
* vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents:
52717
diff
changeset
|
655 (beginning-of-line) |
74e44ab76fa5
* vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents:
52717
diff
changeset
|
656 (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
|
657 (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
|
658 (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
|
659 nil))) |
74e44ab76fa5
* vc-cvs.el (vc-cvs-annotate-extract-revision-at-line): New
André Spiegel <spiegel@gnu.org>
parents:
52717
diff
changeset
|
660 |
33560 | 661 ;;; |
662 ;;; Snapshot system | |
663 ;;; | |
664 | |
665 (defun vc-cvs-create-snapshot (dir name branchp) | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
666 "Assign to DIR's current revision a given NAME. |
33560 | 667 If BRANCHP is non-nil, the name is created as a branch (and the current |
668 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
|
669 (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
|
670 (when branchp (vc-cvs-command nil 0 dir "update" "-r" name))) |
33560 | 671 |
672 (defun vc-cvs-retrieve-snapshot (dir name update) | |
673 "Retrieve a snapshot at and below DIR. | |
674 NAME is the name of the snapshot; if it is empty, do a `cvs update'. | |
675 If UPDATE is non-nil, then update (resynch) any affected buffers." | |
676 (with-current-buffer (get-buffer-create "*vc*") | |
43447
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
677 (let ((default-directory dir) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
678 (sticky-tag)) |
33560 | 679 (erase-buffer) |
680 (if (or (not name) (string= name "")) | |
44197
e255f8fa4f62
(vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
44104
diff
changeset
|
681 (vc-cvs-command t 0 nil "update") |
e255f8fa4f62
(vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
44104
diff
changeset
|
682 (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
|
683 (setq sticky-tag name)) |
33560 | 684 (when update |
685 (goto-char (point-min)) | |
686 (while (not (eobp)) | |
687 (if (looking-at "\\([CMUP]\\) \\(.*\\)") | |
688 (let* ((file (expand-file-name (match-string 2) dir)) | |
689 (state (match-string 1)) | |
690 (buffer (find-buffer-visiting file))) | |
691 (when buffer | |
692 (cond | |
693 ((or (string= state "U") | |
694 (string= state "P")) | |
695 (vc-file-setprop file 'vc-state 'up-to-date) | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
696 (vc-file-setprop file 'vc-working-revision nil) |
33560 | 697 (vc-file-setprop file 'vc-checkout-time |
698 (nth 5 (file-attributes file)))) | |
699 ((or (string= state "M") | |
700 (string= state "C")) | |
701 (vc-file-setprop file 'vc-state 'edited) | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
702 (vc-file-setprop file 'vc-working-revision nil) |
33560 | 703 (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
|
704 (vc-file-setprop file 'vc-cvs-sticky-tag sticky-tag) |
33560 | 705 (vc-resynch-buffer file t t)))) |
706 (forward-line 1)))))) | |
707 | |
35569 | 708 |
33560 | 709 ;;; |
710 ;;; Miscellaneous | |
711 ;;; | |
712 | |
51733
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
713 (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
|
714 "Return non-nil if version backups should be made for FILE.") |
33560 | 715 |
716 (defun vc-cvs-check-headers () | |
717 "Check if the current file has any headers in it." | |
718 (save-excursion | |
719 (goto-char (point-min)) | |
720 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\ | |
721 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t))) | |
722 | |
35569 | 723 |
33560 | 724 ;;; |
725 ;;; Internal functions | |
726 ;;; | |
727 | |
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
|
728 (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
|
729 "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
|
730 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
|
731 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
|
732 (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
|
733 (if (stringp vc-cvs-global-switches) |
44197
e255f8fa4f62
(vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
44104
diff
changeset
|
734 (cons vc-cvs-global-switches flags) |
e255f8fa4f62
(vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
44104
diff
changeset
|
735 (append vc-cvs-global-switches |
e255f8fa4f62
(vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
44104
diff
changeset
|
736 flags)))) |
e255f8fa4f62
(vc-cvs-global-switches): New user option.
André Spiegel <spiegel@gnu.org>
parents:
44104
diff
changeset
|
737 |
51733
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
738 (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
|
739 |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
740 (defun vc-cvs-repository-hostname (dirname) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
741 "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
|
742 (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
|
743 (when (file-readable-p rootname) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
744 (with-temp-buffer |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
745 (let ((coding-system-for-read |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
746 (or file-name-coding-system |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
747 default-file-name-coding-system))) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
748 (vc-insert-file rootname)) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
749 (goto-char (point-min)) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
750 (nth 2 (vc-cvs-parse-root |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
751 (buffer-substring (point) |
2b72fd42f02e
(vc-cvs-repository-hostname): New operation.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51164
diff
changeset
|
752 (line-end-position)))))))) |
50668
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
753 |
50898
8806616471e2
(vc-cvs-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50671
diff
changeset
|
754 (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
|
755 "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
|
756 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
|
757 [:METHOD:][[USER@]HOSTNAME:]/path/to/repository |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
758 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
|
759 \(METHOD USER HOSTNAME CVS-ROOT). |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
760 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
|
761 /path/to/repository |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
762 is `local'. |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
763 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
|
764 [USER@]HOSTNAME:/path/to/repository |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
765 is `ext'. |
60912
4a2ea521d778
* vc-cvs.el: Replace `illegal' with `invalid'.
Werner LEMBERG <wl@gnu.org>
parents:
59996
diff
changeset
|
766 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
|
767 ;; 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
|
768 ;; 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
|
769 ;; `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
|
770 (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
|
771 (len (length root-list)) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
772 ;; 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
|
773 (root-list |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
774 (cond |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
775 ((= len 0) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
776 ;; Invalid CVS root |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
777 nil) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
778 ((= len 1) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
779 ;; Simple PATH => method `local' |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
780 (cons "local" |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
781 (cons nil root-list))) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
782 ((= len 2) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
783 ;; [USER@]HOST:PATH => method `ext' |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
784 (and (not (equal (car root-list) "")) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
785 (cons "ext" root-list))) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
786 ((= len 3) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
787 ;; :METHOD:PATH |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
788 (cons (cadr root-list) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
789 (cons nil (cddr root-list)))) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
790 (t |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
791 ;; :METHOD:[USER@]HOST:PATH |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
792 (cdr root-list))))) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
793 (if root-list |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
794 (let ((method (car root-list)) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
795 (uhost (or (cadr root-list) "")) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
796 (root (nth 2 root-list)) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
797 user host) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
798 ;; Split USER@HOST |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
799 (if (string-match "\\(.*\\)@\\(.*\\)" uhost) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
800 (setq user (match-string 1 uhost) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
801 host (match-string 2 uhost)) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
802 (setq host uhost)) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
803 ;; Remove empty HOST |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
804 (and (equal host "") |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
805 (setq host)) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
806 ;; 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
|
807 (and host |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
808 (equal method "local") |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
809 (setq root (concat host ":" root) host)) |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
810 ;; Normalize CVS root record |
01d84e9d30e0
Patch by Wolfgang Scherer <Wolfgang.Scherer@gmx.de>
André Spiegel <spiegel@gnu.org>
parents:
50645
diff
changeset
|
811 (list method user host root))))) |
33560 | 812 |
813 (defun vc-cvs-parse-status (&optional full) | |
814 "Parse output of \"cvs status\" command in the current buffer. | |
815 Set file properties accordingly. Unless FULL is t, parse only | |
816 essential information." | |
817 (let (file status) | |
818 (goto-char (point-min)) | |
819 (if (re-search-forward "^File: " nil t) | |
820 (cond | |
821 ((looking-at "no file") nil) | |
822 ((re-search-forward "\\=\\([^ \t]+\\)" nil t) | |
823 (setq file (expand-file-name (match-string 1))) | |
824 (vc-file-setprop file 'vc-backend 'CVS) | |
825 (if (not (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t)) | |
826 (setq status "Unknown") | |
827 (setq status (match-string 1))) | |
828 (if (and full | |
829 (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
|
830 "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\ |
33560 | 831 \[\t ]+\\([0-9.]+\\)" |
832 nil t)) | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
833 (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
|
834 (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
|
835 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
|
836 (cond |
94df6eb103b3
(vc-cvs-parse-status): Store file state in property, don't just return
André Spiegel <spiegel@gnu.org>
parents:
41520
diff
changeset
|
837 ((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
|
838 (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
|
839 (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
|
840 '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
|
841 ((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
|
842 ((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
|
843 ((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
|
844 (t 'edited)))))))) |
33560 | 845 |
846 (defun vc-cvs-dir-state-heuristic (dir) | |
847 "Find the CVS state of all files in DIR, using only local information." | |
848 (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
|
849 (vc-cvs-get-entries dir) |
33560 | 850 (goto-char (point-min)) |
851 (while (not (eobp)) | |
44104
985526b08270
(vc-cvs-registered, vc-cvs-dir-state-heuristic):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44005
diff
changeset
|
852 ;; 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
|
853 (when (looking-at "/\\([^/]*\\)/[^/-]") |
33560 | 854 (let ((file (expand-file-name (match-string 1) dir))) |
855 (unless (vc-file-getprop file 'vc-state) | |
856 (vc-cvs-parse-entry file t)))) | |
857 (forward-line 1)))) | |
858 | |
50453
e499daf7fb22
(vc-cvs-get-entries): New function that uses the right coding system for
André Spiegel <spiegel@gnu.org>
parents:
50321
diff
changeset
|
859 (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
|
860 "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
|
861 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
|
862 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
|
863 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
|
864 (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
|
865 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
|
866 (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
|
867 |
43447
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
868 (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
|
869 "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
|
870 ;; 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
|
871 ;; 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
|
872 ;; lowercase letters, digits, `-', and `_'. |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
873 (and (string-match "^[a-zA-Z]" tag) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
874 (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
|
875 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
876 (defun vc-cvs-valid-revision-number-p (tag) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
877 "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
|
878 (and (string-match "^[0-9]" tag) |
6eb10924e77f
(vc-cvs-valid-version-number-p): New function.
Sam Steingold <sds@gnu.org>
parents:
44436
diff
changeset
|
879 (not (string-match "[^0-9.]" tag)))) |
43447
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
880 |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
881 (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
|
882 "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
|
883 `match-data' is protected." |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
884 (let ((data (match-data)) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
885 (tag) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
886 (type (cond ((string= match-type "D") 'date) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
887 ((string= match-type "T") |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
888 (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
|
889 'symbolic-name |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
890 'revision-number)) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
891 (t nil)))) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
892 (unwind-protect |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
893 (progn |
44436
f9db51bb423b
(vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents:
44197
diff
changeset
|
894 (cond |
46163 | 895 ;; 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
|
896 ((eq type 'date) |
44436
f9db51bb423b
(vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents:
44197
diff
changeset
|
897 (string-match |
f9db51bb423b
(vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents:
44197
diff
changeset
|
898 "\\([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
|
899 match-tag) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
900 (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
|
901 (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
|
902 (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
|
903 (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
|
904 (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
|
905 (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
|
906 ;; Years 0..68 are 2000..2068. |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
907 ;; Years 69..99 are 1969..1999. |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
908 (year (+ (cond ((> 69 year-tmp) 2000) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
909 ((> 100 year-tmp) 1900) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
910 (t 0)) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
911 year-tmp))) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
912 (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
|
913 ;; Sticky Tag name or revision number |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
914 ((eq type 'symbolic-name) (setq tag match-tag)) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
915 ((eq type 'revision-number) (setq tag match-tag)) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
916 ;; Default is no sticky tag at all |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
917 (t nil)) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
918 (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
|
919 ((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
|
920 (cond ((eq type 'date) (format-time-string |
43447
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
921 vc-cvs-sticky-date-format-string |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
922 tag)) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
923 ((eq type 'symbolic-name) tag) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
924 ((eq type 'revision-number) tag) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
925 (t nil))) |
44436
f9db51bb423b
(vc-cvs-checkin): Pass the required argument to `error'.
Sam Steingold <sds@gnu.org>
parents:
44197
diff
changeset
|
926 ((functionp vc-cvs-sticky-tag-display) |
43447
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
927 (funcall vc-cvs-sticky-tag-display tag type)) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
928 (t nil))) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
929 |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
930 (set-match-data data)))) |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
931 |
33560 | 932 (defun vc-cvs-parse-entry (file &optional set-state) |
933 "Parse a line from CVS/Entries. | |
934 Compare modification time to that of the FILE, set file properties | |
935 accordingly. However, `vc-state' is set only if optional arg SET-STATE | |
936 is non-nil." | |
937 (cond | |
938 ;; entry for a "locally added" file (not yet committed) | |
939 ((looking-at "/[^/]+/0/") | |
940 (vc-file-setprop file 'vc-checkout-time 0) | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
941 (vc-file-setprop file 'vc-working-revision "0") |
33560 | 942 (if set-state (vc-file-setprop file 'vc-state 'edited))) |
943 ;; normal entry | |
944 ((looking-at | |
945 (concat "/[^/]+" | |
946 ;; revision | |
947 "/\\([^/]*\\)" | |
50321
17ff9d10125f
(vc-cvs-parse-entry): Make sure a file with conflicts
Andreas Schwab <schwab@suse.de>
parents:
49822
diff
changeset
|
948 ;; 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
|
949 "/\\([^/]*\\)/" |
43447
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
950 ;; options |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
951 "\\([^/]*\\)/" |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
952 ;; sticky tag |
79cf46e34420
Patch by Martin.Lorentzson@telia.com.
André Spiegel <spiegel@gnu.org>
parents:
42657
diff
changeset
|
953 "\\(.\\|\\)" ;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
|
954 "\\(.*\\)")) ;Sticky tag |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84583
diff
changeset
|
955 (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
|
956 (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
|
957 (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
|
958 (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
|
959 ;; 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
|
960 ;; 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
|
961 ;; (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
|
962 ;; 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
|
963 (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
|
964 (require 'parse-time) |
9197177c5f99
(vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents:
52624
diff
changeset
|
965 (let ((parsed-time |
9197177c5f99
(vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents:
52624
diff
changeset
|
966 (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
|
967 (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
|
968 (car parsed-time) |
9197177c5f99
(vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents:
52624
diff
changeset
|
969 (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
|
970 (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
|
971 (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
|
972 (t |
9197177c5f99
(vc-cvs-parse-entry): Revert last change to allow
Dave Love <fx@gnu.org>
parents:
52624
diff
changeset
|
973 (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
|
974 (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
|
975 |
81821 | 976 ;; Completion of revision names. |
977 ;; Just so I don't feel like I'm duplicating code from pcl-cvs, I'll use | |
978 ;; `cvs log' so I can list all the revision numbers rather than only | |
979 ;; tag names. | |
980 | |
981 (defun vc-cvs-revision-table (file) | |
982 (let ((default-directory (file-name-directory file)) | |
983 (res nil)) | |
984 (with-temp-buffer | |
985 (vc-cvs-command t nil file "log") | |
986 (goto-char (point-min)) | |
987 (when (re-search-forward "^symbolic names:\n" nil t) | |
988 (while (looking-at "^ \\(.*\\): \\(.*\\)") | |
989 (push (cons (match-string 1) (match-string 2)) res) | |
990 (forward-line 1))) | |
991 (while (re-search-forward "^revision \\([0-9.]+\\)" nil t) | |
992 (push (match-string 1) res)) | |
993 res))) | |
994 | |
85458
119299b8a040
(vc-cvs-revision-completion-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85139
diff
changeset
|
995 (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
|
996 (lexical-let ((files files) |
81821 | 997 table) |
998 (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
|
999 table (lambda () (vc-cvs-revision-table (car files))))) |
81821 | 1000 table)) |
1001 | |
1002 | |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1003 (provide 'vc-cvs) |
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1004 |
81821 | 1005 ;; arch-tag: 60e1402a-aa53-4607-927a-cf74f144b432 |
31384
f6cb7dfe5e7c
(vc-cvs-show-log-entry): New function.
Gerd Moellmann <gerd@gnu.org>
parents:
diff
changeset
|
1006 ;;; vc-cvs.el ends here |