Mercurial > emacs
annotate lisp/pcvs-info.el @ 51946:048b0517e63d
(c++-make-template-syntax-table, c-syntactic-ws-start, c-syntactic-ws-end):
Gave more consistent names to these language constants.
author | Martin Stjernholm <mast@lysator.liu.se> |
---|---|
date | Wed, 16 Jul 2003 20:54:19 +0000 |
parents | fa1c848a9779 |
children | 695cf19ef79e |
rev | line source |
---|---|
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
34652
diff
changeset
|
1 ;;; pcvs-info.el --- internal representation of a fileinfo entry |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2 |
34304 | 3 ;; Copyright (C) 1991, 92, 93, 94, 95, 96, 97, 98, 99, 2000 Free Software Foundation, Inc. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
4 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
5 ;; Author: Stefan Monnier <monnier@cs.yale.edu> |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
6 ;; Keywords: pcl-cvs |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
7 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
8 ;; This file is part of GNU Emacs. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
9 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
10 ;; GNU Emacs is free software; you can redistribute it and/or modify |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
11 ;; it under the terms of the GNU General Public License as published by |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
12 ;; the Free Software Foundation; either version 2, or (at your option) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
13 ;; any later version. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
14 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
15 ;; GNU Emacs is distributed in the hope that it will be useful, |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
18 ;; GNU General Public License for more details. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
19 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
20 ;; You should have received a copy of the GNU General Public License |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
22 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
23 ;; Boston, MA 02111-1307, USA. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
24 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
25 ;;; Commentary: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
26 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
27 ;; The cvs-fileinfo data structure: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
28 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
29 ;; When the `cvs update' is ready we parse the output. Every file |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
30 ;; that is affected in some way is added to the cookie collection as |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
31 ;; a "fileinfo" (as defined below in cvs-create-fileinfo). |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
32 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
33 ;;; Code: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
34 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
35 (eval-when-compile (require 'cl)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
36 (require 'pcvs-util) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
37 ;;(require 'pcvs-defs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
38 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
39 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
40 ;;;; config variables |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
41 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
42 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
43 (defcustom cvs-display-full-path t |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
44 "*Specifies how the filenames should look like in the listing. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
45 If t, their full path name will be displayed, else only the filename." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
46 :group 'pcl-cvs |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
47 :type '(boolean)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
48 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
49 (defcustom cvs-allow-dir-commit nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
50 "*Allow `cvs-mode-commit' on directories. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
51 If you commit without any marked file and with the cursor positioned |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
52 on a directory entry, cvs would commit the whole directory. This seems |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
53 to confuse some users sometimes." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
54 :group 'pcl-cvs |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
55 :type '(boolean)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
56 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
57 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
58 ;;;; Faces for fontification |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
59 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
60 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
61 (defface cvs-header-face |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
62 '((((class color) (background dark)) |
42455
7662f312caf2
(various face definitions): Use :weight and :slant.
Richard M. Stallman <rms@gnu.org>
parents:
38422
diff
changeset
|
63 (:foreground "lightyellow" :weight bold)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
64 (((class color) (background light)) |
42455
7662f312caf2
(various face definitions): Use :weight and :slant.
Richard M. Stallman <rms@gnu.org>
parents:
38422
diff
changeset
|
65 (:foreground "blue4" :weight bold)) |
7662f312caf2
(various face definitions): Use :weight and :slant.
Richard M. Stallman <rms@gnu.org>
parents:
38422
diff
changeset
|
66 (t (:weight bold))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
67 "PCL-CVS face used to highlight directory changes." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
68 :group 'pcl-cvs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
69 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
70 (defface cvs-filename-face |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
71 '((((class color) (background dark)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
72 (:foreground "lightblue")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
73 (((class color) (background light)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
74 (:foreground "blue4")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
75 (t ())) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
76 "PCL-CVS face used to highlight file names." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
77 :group 'pcl-cvs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
78 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
79 (defface cvs-unknown-face |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
80 '((((class color) (background dark)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
81 (:foreground "red")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
82 (((class color) (background light)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
83 (:foreground "red")) |
42455
7662f312caf2
(various face definitions): Use :weight and :slant.
Richard M. Stallman <rms@gnu.org>
parents:
38422
diff
changeset
|
84 (t (:slant italic))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
85 "PCL-CVS face used to highlight unknown file status." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
86 :group 'pcl-cvs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
87 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
88 (defface cvs-handled-face |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
89 '((((class color) (background dark)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
90 (:foreground "pink")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
91 (((class color) (background light)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
92 (:foreground "pink")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
93 (t ())) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
94 "PCL-CVS face used to highlight handled file status." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
95 :group 'pcl-cvs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
96 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
97 (defface cvs-need-action-face |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
98 '((((class color) (background dark)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
99 (:foreground "orange")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
100 (((class color) (background light)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
101 (:foreground "orange")) |
42455
7662f312caf2
(various face definitions): Use :weight and :slant.
Richard M. Stallman <rms@gnu.org>
parents:
38422
diff
changeset
|
102 (t (:slant italic))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
103 "PCL-CVS face used to highlight status of files needing action." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
104 :group 'pcl-cvs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
105 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
106 (defface cvs-marked-face |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
107 '((((class color) (background dark)) |
42455
7662f312caf2
(various face definitions): Use :weight and :slant.
Richard M. Stallman <rms@gnu.org>
parents:
38422
diff
changeset
|
108 (:foreground "green" :weight bold)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
109 (((class color) (background light)) |
42455
7662f312caf2
(various face definitions): Use :weight and :slant.
Richard M. Stallman <rms@gnu.org>
parents:
38422
diff
changeset
|
110 (:foreground "green3" :weight bold)) |
7662f312caf2
(various face definitions): Use :weight and :slant.
Richard M. Stallman <rms@gnu.org>
parents:
38422
diff
changeset
|
111 (t (:weight bold))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
112 "PCL-CVS face used to highlight marked file indicator." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
113 :group 'pcl-cvs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
114 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
115 (defface cvs-msg-face |
42455
7662f312caf2
(various face definitions): Use :weight and :slant.
Richard M. Stallman <rms@gnu.org>
parents:
38422
diff
changeset
|
116 '((t (:slant italic))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
117 "PCL-CVS face used to highlight CVS messages." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
118 :group 'pcl-cvs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
119 |
29576
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
120 (defvar cvs-fi-up-to-date-face 'cvs-handled-face) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
121 (defvar cvs-fi-unknown-face 'cvs-unknown-face) |
33431
5ca411467bf3
(cvs-fi-conflict-face): New var.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
29576
diff
changeset
|
122 (defvar cvs-fi-conflict-face 'font-lock-warning-face) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
123 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
124 ;; There is normally no need to alter the following variable, but if |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
125 ;; your site has installed CVS in a non-standard way you might have |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
126 ;; to change it. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
127 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
128 (defvar cvs-bakprefix ".#" |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
129 "The prefix that CVS prepends to files when rcsmerge'ing.") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
130 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
131 (easy-mmode-defmap cvs-status-map |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
132 '(([(mouse-2)] . cvs-mouse-toggle-mark)) |
29576
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
133 "Local keymap for text properties of status") |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
134 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
135 ;; Constructor: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
136 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
137 (defstruct (cvs-fileinfo |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
138 (:constructor nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
139 (:copier nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
140 (:constructor -cvs-create-fileinfo (type dir file full-log |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
141 &key marked subtype |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
142 merge |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
143 base-rev |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
144 head-rev)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
145 (:conc-name cvs-fileinfo->)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
146 marked ;; t/nil. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
147 type ;; See below |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
148 subtype ;; See below |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
149 dir ;; Relative directory the file resides in. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
150 ;; (concat dir file) should give a valid path. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
151 file ;; The file name sans the directory. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
152 base-rev ;; During status: This is the revision that the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
153 ;; working file is based on. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
154 head-rev ;; During status: This is the highest revision in |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
155 ;; the repository. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
156 merge ;; A cons cell containing the (ancestor . head) revisions |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
157 ;; of the merge that resulted in the current file. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
158 ;;removed ;; t if the file no longer exists. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
159 full-log ;; The output from cvs, unparsed. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
160 ;;mod-time ;; Not used. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
161 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
162 ;; In addition to the above, the following values can be extracted: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
163 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
164 ;; handled ;; t if this file doesn't require further action. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
165 ;; full-path ;; The complete relative filename. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
166 ;; pp-name ;; The printed file name |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
167 ;; backup-file;; For MERGED and CONFLICT files after a \"cvs update\", |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
168 ;; this is a full path to the backup file where the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
169 ;; untouched version resides. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
170 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
171 ;; The meaning of the type field: |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49237
diff
changeset
|
172 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
173 ;; Value ---Used by--- Explanation |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
174 ;; update status |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
175 ;; NEED-UPDATE x file needs update |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
176 ;; MODIFIED x x modified by you, unchanged in repository |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
177 ;; MERGED x x successful merge |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
178 ;; ADDED x x added by you, not yet committed |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
179 ;; MISSING x rm'd, but not yet `cvs remove'd |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
180 ;; REMOVED x x removed by you, not yet committed |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
181 ;; NEED-MERGE x need merge |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
182 ;; CONFLICT x conflict when merging |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
183 ;; ;;MOD-CONFLICT x removed locally, changed in repository. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
184 ;; DIRCHANGE x x A change of directory. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
185 ;; UNKNOWN x An unknown file. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
186 ;; UP-TO-DATE x The file is up-to-date. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
187 ;; UPDATED x x file copied from repository |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
188 ;; PATCHED x x diff applied from repository |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
189 ;; COMMITTED x x cvs commit'd |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
190 ;; DEAD An entry that should be removed |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
191 ;; MESSAGE x x This is a special fileinfo that is used |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
192 ;; to display a text that should be in |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
193 ;; full-log." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
194 ;; TEMP A temporary message that should be removed |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
195 ) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
196 (defun cvs-create-fileinfo (type dir file msg &rest keys) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
197 (cvs-check-fileinfo (apply #'-cvs-create-fileinfo type dir file msg keys))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
198 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
199 ;; Fake selectors: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
200 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
201 (defun cvs-fileinfo->full-path (fileinfo) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
202 "Return the full path for the file that is described in FILEINFO." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
203 (let ((dir (cvs-fileinfo->dir fileinfo))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
204 (if (eq (cvs-fileinfo->type fileinfo) 'DIRCHANGE) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
205 (if (string= dir "") "." (directory-file-name dir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
206 ;; Here, I use `concat' rather than `expand-file-name' because I want |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
207 ;; the resulting path to stay relative if `dir' is relative. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
208 (concat dir (cvs-fileinfo->file fileinfo))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
209 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
210 (defun cvs-fileinfo->pp-name (fi) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
211 "Return the filename of FI as it should be displayed." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
212 (if cvs-display-full-path |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
213 (cvs-fileinfo->full-path fi) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
214 (cvs-fileinfo->file fi))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
215 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
216 (defun cvs-fileinfo->backup-file (fileinfo) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
217 "Construct the file name of the backup file for FILEINFO." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
218 (let* ((dir (cvs-fileinfo->dir fileinfo)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
219 (file (cvs-fileinfo->file fileinfo)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
220 (default-directory (file-name-as-directory (expand-file-name dir))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
221 (files (directory-files "." nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
222 (concat "^" (regexp-quote cvs-bakprefix) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
223 (regexp-quote file) "\\."))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
224 bf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
225 (dolist (f files bf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
226 (when (and (file-readable-p f) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
227 (or (null bf) (file-newer-than-file-p f bf))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
228 (setq bf (concat dir f)))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
229 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
230 ;; (defun cvs-fileinfo->handled (fileinfo) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
231 ;; "Tell if this requires further action" |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
232 ;; (memq (cvs-fileinfo->type fileinfo) '(UP-TO-DATE DEAD))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
233 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
234 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
235 ;; Predicate: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
236 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
237 (defun cvs-check-fileinfo (fi) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
238 "Check FI's conformance to some conventions." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
239 (let ((check 'none) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
240 (type (cvs-fileinfo->type fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
241 (subtype (cvs-fileinfo->subtype fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
242 (marked (cvs-fileinfo->marked fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
243 (dir (cvs-fileinfo->dir fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
244 (file (cvs-fileinfo->file fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
245 (base-rev (cvs-fileinfo->base-rev fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
246 (head-rev (cvs-fileinfo->head-rev fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
247 (full-log (cvs-fileinfo->full-log fi))) |
47390
ff0e463ca59f
(cvs-check-fileinfo): Don't use boolp.
Richard M. Stallman <rms@gnu.org>
parents:
45910
diff
changeset
|
248 (if (and (setq check 'marked) (memq marked '(t nil)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
249 (setq check 'base-rev) (or (null base-rev) (stringp base-rev)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
250 (setq check 'head-rev) (or (null head-rev) (stringp head-rev)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
251 (setq check 'full-log) (stringp full-log) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
252 (setq check 'dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
253 (and (stringp dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
254 (not (file-name-absolute-p dir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
255 (or (string= dir "") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
256 (string= dir (file-name-as-directory dir)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
257 (setq check 'file) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
258 (and (stringp file) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
259 (string= file (file-name-nondirectory file))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
260 (setq check 'type) (symbolp type) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
261 (setq check 'consistency) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
262 (case type |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
263 (DIRCHANGE (and (null subtype) (string= "." file))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
264 ((NEED-UPDATE ADDED MISSING DEAD MODIFIED MESSAGE UP-TO-DATE |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
265 REMOVED NEED-MERGE CONFLICT UNKNOWN MESSAGE) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
266 t))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
267 fi |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
268 (error "Invalid :%s in cvs-fileinfo %s" check fi)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
269 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
270 |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49237
diff
changeset
|
271 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
272 ;;;; State table to indicate what you can do when. |
49597
e88404e8f2cf
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
49237
diff
changeset
|
273 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
274 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
275 (defconst cvs-states |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
276 `((NEED-UPDATE update diff) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
277 (UP-TO-DATE update nil remove diff safe-rm revert) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
278 (MODIFIED update commit undo remove diff merge diff-base) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
279 (ADDED update commit remove) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
280 (MISSING remove undo update safe-rm revert) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
281 (REMOVED commit add undo safe-rm) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
282 (NEED-MERGE update undo diff diff-base) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
283 (CONFLICT merge remove undo commit diff diff-base) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
284 (DIRCHANGE remove update diff ,(if cvs-allow-dir-commit 'commit) tag) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
285 (UNKNOWN ignore add remove) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
286 (DEAD ) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
287 (MESSAGE)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
288 "Fileinfo state descriptions for pcl-cvs. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
289 This is an assoc list. Each element consists of (STATE . FUNS) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
290 - STATE (described in `cvs-create-fileinfo') is the key |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
291 - FUNS is the list of applicable operations. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
292 The first one (if any) should be the \"default\" action. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
293 Most of the actions have the obvious meaning. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
294 `safe-rm' indicates that the file can be removed without losing |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
295 any information.") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
296 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
297 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
298 ;;;; Utility functions |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
299 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
300 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
301 (defun cvs-applicable-p (fi-or-type func) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
302 "Check if FUNC is applicable to FI-OR-TYPE. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
303 If FUNC is nil, always return t. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
304 FI-OR-TYPE can either be a symbol (a fileinfo-type) or a fileinfo." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
305 (let ((type (if (symbolp fi-or-type) fi-or-type |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
306 (cvs-fileinfo->type fi-or-type)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
307 (and (not (eq type 'MESSAGE)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
308 (eq (car (memq func (cdr (assq type cvs-states)))) func)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
309 |
45903
bbb734dc35fd
(cvs-add-face): Minor rewrite.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45841
diff
changeset
|
310 (defun cvs-add-face (str face &optional keymap &rest props) |
45910
32ed873c69a7
(cvs-add-face): Fix silly oversight.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45903
diff
changeset
|
311 (when keymap |
32ed873c69a7
(cvs-add-face): Fix silly oversight.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45903
diff
changeset
|
312 (when (keymapp keymap) |
32ed873c69a7
(cvs-add-face): Fix silly oversight.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45903
diff
changeset
|
313 (setq props (list* 'keymap keymap props))) |
32ed873c69a7
(cvs-add-face): Fix silly oversight.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45903
diff
changeset
|
314 (setq props (list* 'mouse-face 'highlight props))) |
32ed873c69a7
(cvs-add-face): Fix silly oversight.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45903
diff
changeset
|
315 (add-text-properties 0 (length str) (list* 'font-lock-face face props) str) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
316 str) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
317 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
318 (defun cvs-fileinfo-pp (fileinfo) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
319 "Pretty print FILEINFO. Insert a printed representation in current buffer. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
320 For use by the cookie package." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
321 (cvs-check-fileinfo fileinfo) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
322 (let ((type (cvs-fileinfo->type fileinfo)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
323 (subtype (cvs-fileinfo->subtype fileinfo))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
324 (insert |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
325 (case type |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
326 (DIRCHANGE (concat "In directory " |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
327 (cvs-add-face (cvs-fileinfo->full-path fileinfo) |
45903
bbb734dc35fd
(cvs-add-face): Minor rewrite.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45841
diff
changeset
|
328 'cvs-header-face t |
bbb734dc35fd
(cvs-add-face): Minor rewrite.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45841
diff
changeset
|
329 'cvs-goal-column t) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
330 ":")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
331 (MESSAGE |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
332 (cvs-add-face (format "Message: %s" (cvs-fileinfo->full-log fileinfo)) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
333 'cvs-msg-face)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
334 (t |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
335 (let* ((status (if (cvs-fileinfo->marked fileinfo) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
336 (cvs-add-face "*" 'cvs-marked-face) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
337 " ")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
338 (file (cvs-add-face (cvs-fileinfo->pp-name fileinfo) |
44384
3626a12fe452
* pcvs.el (cvs-mode-previous-line, cvs-mode-next-line): Move to
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42455
diff
changeset
|
339 'cvs-filename-face t |
3626a12fe452
* pcvs.el (cvs-mode-previous-line, cvs-mode-next-line): Move to
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42455
diff
changeset
|
340 'cvs-goal-column t)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
341 (base (or (cvs-fileinfo->base-rev fileinfo) "")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
342 (head (cvs-fileinfo->head-rev fileinfo)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
343 (type |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
344 (let ((str (case type |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
345 ;;(MOD-CONFLICT "Not Removed") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
346 (DEAD "") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
347 (t (capitalize (symbol-name type))))) |
29576
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
348 (face (let ((sym (intern |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
349 (concat "cvs-fi-" |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
350 (downcase (symbol-name type)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
351 "-face")))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
352 (or (and (boundp sym) (symbol-value sym)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
353 'cvs-need-action-face)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
354 (cvs-add-face str face cvs-status-map))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
355 (side (or |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
356 ;; maybe a subtype |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
357 (when subtype (downcase (symbol-name subtype))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
358 ;; or the head-rev |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
359 (when (and head (not (string= head base))) head) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
360 ;; or nothing |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
361 ""))) |
44384
3626a12fe452
* pcvs.el (cvs-mode-previous-line, cvs-mode-next-line): Move to
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42455
diff
changeset
|
362 (format "%-11s %s %-11s %-11s %s" |
3626a12fe452
* pcvs.el (cvs-mode-previous-line, cvs-mode-next-line): Move to
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42455
diff
changeset
|
363 side status type base file))))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
364 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
365 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
366 (defun cvs-fileinfo-update (fi fi-new) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
367 "Update FI with the information provided in FI-NEW." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
368 (let ((type (cvs-fileinfo->type fi-new)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
369 (merge (cvs-fileinfo->merge fi-new))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
370 (setf (cvs-fileinfo->type fi) type) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
371 (setf (cvs-fileinfo->subtype fi) (cvs-fileinfo->subtype fi-new)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
372 (setf (cvs-fileinfo->full-log fi) (cvs-fileinfo->full-log fi-new)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
373 (setf (cvs-fileinfo->base-rev fi) (cvs-fileinfo->base-rev fi-new)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
374 (setf (cvs-fileinfo->head-rev fi) (cvs-fileinfo->head-rev fi-new)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
375 (cond |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
376 (merge (setf (cvs-fileinfo->merge fi) merge)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
377 ((memq type '(UP-TO-DATE NEED-UPDATE)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
378 (setf (cvs-fileinfo->merge fi) nil))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
379 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
380 (defun cvs-fileinfo< (a b) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
381 "Compare fileinfo A with fileinfo B and return t if A is `less'. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
382 The ordering defined by this function is such that directories are |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
383 sorted alphabetically, and inside every directory the DIRCHANGE |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
384 fileinfo will appear first, followed by all files (alphabetically)." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
385 (let ((subtypea (cvs-fileinfo->subtype a)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
386 (subtypeb (cvs-fileinfo->subtype b))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
387 (cond |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
388 ;; Sort according to directories. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
389 ((string< (cvs-fileinfo->dir a) (cvs-fileinfo->dir b)) t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
390 ((not (string= (cvs-fileinfo->dir a) (cvs-fileinfo->dir b))) nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
391 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
392 ;; The DIRCHANGE entry is always first within the directory. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
393 ((eq (cvs-fileinfo->type b) 'DIRCHANGE) nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
394 ((eq (cvs-fileinfo->type a) 'DIRCHANGE) t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
395 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
396 ;; All files are sorted by file name. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
397 ((string< (cvs-fileinfo->file a) (cvs-fileinfo->file b)))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
398 |
29576
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
399 ;;; |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
400 ;;; Look at CVS/Entries to quickly find a first approximation of the status |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
401 ;;; |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
402 |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
403 (defun cvs-fileinfo-from-entries (dir &optional all) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
404 "List of fileinfos for DIR, extracted from CVS/Entries. |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
405 Unless ALL is optional, returns only the files that are not up-to-date. |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
406 DIR can also be a file." |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
407 (let* ((singlefile |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
408 (cond |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
409 ((equal dir "") nil) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
410 ((file-directory-p dir) (setq dir (file-name-as-directory dir)) nil) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
411 (t (prog1 (file-name-nondirectory dir) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
412 (setq dir (or (file-name-directory dir) "")))))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
413 (file (expand-file-name "CVS/Entries" dir)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
414 (fis nil)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
415 (if (not (file-readable-p file)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
416 (push (cvs-create-fileinfo (if singlefile 'UNKNOWN 'DIRCHANGE) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
417 dir (or singlefile ".") "") fis) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
418 (with-temp-buffer |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
419 (insert-file-contents file) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
420 (goto-char (point-min)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
421 ;; Select the single file entry in case we're only interested in a file. |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
422 (cond |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
423 ((not singlefile) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
424 (push (cvs-create-fileinfo 'DIRCHANGE dir "." "") fis)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
425 ((re-search-forward |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
426 (concat "^[^/]*/" (regexp-quote singlefile) "/.*") nil t) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
427 (setq all t) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
428 (goto-char (match-beginning 0)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
429 (narrow-to-region (point) (match-end 0))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
430 (t |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
431 (push (cvs-create-fileinfo 'UNKNOWN dir singlefile "") fis) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
432 (narrow-to-region (point-min) (point-min)))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
433 (while (looking-at "\\([^/]*\\)/\\([^/]*\\)/\\([^/]*\\)/\\([^/]*\\)/") |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
434 (if (/= (match-beginning 1) (match-end 1)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
435 (setq fis (append (cvs-fileinfo-from-entries |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
436 (concat dir (file-name-as-directory |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
437 (match-string 2))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
438 all) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
439 fis)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
440 (let ((f (match-string 2)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
441 (rev (match-string 3)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
442 (date (match-string 4)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
443 timestamp |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
444 (type 'MODIFIED) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
445 (subtype nil)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
446 (cond |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
447 ((equal (substring rev 0 1) "-") |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
448 (setq type 'REMOVED rev (substring rev 1))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
449 ((not (file-exists-p (concat dir f))) (setq type 'MISSING)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
450 ((equal rev "0") (setq type 'ADDED rev nil)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
451 ((equal date "Result of merge") (setq subtype 'MERGED)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
452 ((let ((mtime (nth 5 (file-attributes (concat dir f)))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
453 (system-time-locale "C")) |
49237
9a2cb7cc7942
(cvs-fileinfo-from-entries): Deal with Solaris'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47390
diff
changeset
|
454 (setq timestamp (format-time-string "%c" mtime 'utc)) |
9a2cb7cc7942
(cvs-fileinfo-from-entries): Deal with Solaris'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47390
diff
changeset
|
455 ;; Solaris sometimes uses "Wed Sep 05", not "Wed Sep 5". |
9a2cb7cc7942
(cvs-fileinfo-from-entries): Deal with Solaris'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47390
diff
changeset
|
456 ;; See "grep '[^a-z_]ctime' cvs/src/*.c" for reference. |
9a2cb7cc7942
(cvs-fileinfo-from-entries): Deal with Solaris'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47390
diff
changeset
|
457 (if (= (aref timestamp 8) ?0) |
9a2cb7cc7942
(cvs-fileinfo-from-entries): Deal with Solaris'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47390
diff
changeset
|
458 (setq timestamp (concat (substring timestamp 0 8) |
9a2cb7cc7942
(cvs-fileinfo-from-entries): Deal with Solaris'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47390
diff
changeset
|
459 " " (substring timestamp 9)))) |
9a2cb7cc7942
(cvs-fileinfo-from-entries): Deal with Solaris'
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47390
diff
changeset
|
460 (equal timestamp date)) |
29576
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
461 (setq type (if all 'UP-TO-DATE))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
462 ((equal date (concat "Result of merge+" timestamp)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
463 (setq type 'CONFLICT))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
464 (when type |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
465 (push (cvs-create-fileinfo type dir f "" |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
466 :base-rev rev :subtype subtype) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
467 fis)))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
468 (forward-line 1)))) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
469 fis)) |
961f303cda37
(cvs-fi-up-to-date-face, cvs-fi-unknown-face): New vars.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
470 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
471 (provide 'pcvs-info) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
472 |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
34652
diff
changeset
|
473 ;;; pcvs-info.el ends here |