Mercurial > emacs
annotate lisp/pcvs.el @ 48237:ee293d310f44
*** empty log message ***
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sat, 09 Nov 2002 22:25:39 +0000 |
parents | d892c6e810f9 |
children | 64107c7851aa |
rev | line source |
---|---|
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37339
diff
changeset
|
1 ;;; pcvs.el --- a front-end to CVS |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2 |
45999
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
3 ;; Copyright (C) 1991,92,93,94,95,95,97,98,99,2000,2002 |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
5 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
6 ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
7 ;; (Per Cederqvist) ceder@lysator.liu.se |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
8 ;; (Greg A. Woods) woods@weird.com |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
9 ;; (Jim Blandy) jimb@cyclic.com |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
10 ;; (Karl Fogel) kfogel@floss.red-bean.com |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
11 ;; (Jim Kingdon) kingdon@cyclic.com |
31977
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
12 ;; (Stefan Monnier) monnier@cs.yale.edu |
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
13 ;; (Greg Klanderman) greg@alphatech.com |
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
14 ;; (Jari Aalto+mail.emacs) jari.aalto@poboxes.com |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
15 ;; Maintainer: (Stefan Monnier) monnier+lists/cvs/pcl@flint.cs.yale.edu |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
16 ;; Keywords: CVS, version control, release management |
48003
d892c6e810f9
(cvs-checkout): Use read-directory-name.
Kim F. Storm <storm@cua.dk>
parents:
47729
diff
changeset
|
17 ;; Revision: $Id: pcvs.el,v 1.42 2002/10/01 18:48:35 monnier Exp $ |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
18 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
19 ;; This file is part of GNU Emacs. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
20 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
21 ;; 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
|
22 ;; 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
|
23 ;; the Free Software Foundation; either version 2, or (at your option) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
24 ;; any later version. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
25 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
26 ;; 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
|
27 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
28 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
29 ;; GNU General Public License for more details. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
30 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
31 ;; 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
|
32 ;; 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
|
33 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
34 ;; Boston, MA 02111-1307, USA. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
35 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
36 ;;; Commentary: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
37 |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
38 ;; PCL-CVS is a front-end to the CVS version control system. For people |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
39 ;; familiar with VC, it is somewhat like VC-dired: it presents the status of |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
40 ;; all the files in your working area and allows you to commit/update several |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
41 ;; of them at a time. Compared to VC-dired, it is considerably better and |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
42 ;; faster (but only for CVS). |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
43 |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
44 ;; PCL-CVS was originally written by Per Cederqvist many years ago. This |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
45 ;; version derives from the XEmacs-21 version, itself based on the 2.0b2 |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
46 ;; version (last release from Per). It is a thorough rework. |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
47 |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
48 ;; Contrary to what you'd expect, PCL-CVS is not a replacement for VC but only |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
49 ;; for VC-dired. As such, I've tried to make PCL-CVS and VC interoperate |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
50 ;; seamlessly (I also use VC). |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
51 |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
52 ;; To use PCL-CVS just use `M-x cvs-examine RET <dir> RET'. |
30717
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
53 ;; There is a TeXinfo manual, which can be helpful to get started. |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
54 |
34376
25976c39c41e
* pcvs.el (cvs-menu): Use `cvs-menu' rather than `cvs-menu-map'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34304
diff
changeset
|
55 ;;; Bugs: |
25976c39c41e
* pcvs.el (cvs-menu): Use `cvs-menu' rather than `cvs-menu-map'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34304
diff
changeset
|
56 |
39392
11216aa2d43c
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38422
diff
changeset
|
57 ;; - Extracting an old version seems not to recognize encoding correctly. |
11216aa2d43c
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
38422
diff
changeset
|
58 ;; That's probably because it's done via a process rather than a file. |
34376
25976c39c41e
* pcvs.el (cvs-menu): Use `cvs-menu' rather than `cvs-menu-map'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34304
diff
changeset
|
59 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
60 ;;; Todo: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
61 |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
62 ;; ******** FIX THE DOCUMENTATION ********* |
30717
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
63 ;; |
34376
25976c39c41e
* pcvs.el (cvs-menu): Use `cvs-menu' rather than `cvs-menu-map'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34304
diff
changeset
|
64 ;; - rework the displaying of error messages. |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
65 ;; - allow to flush messages only |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
66 ;; - allow to protect files like ChangeLog from flushing |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
67 ;; - automatically cvs-mode-insert files from find-file-hook |
33195
d296e0e3cf43
(cvs-mode-add-change-log-entry-other-window):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32488
diff
changeset
|
68 ;; (and don't flush them as long as they are visited) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
69 ;; - query the user for cvs-get-marked (for some cmds or if nothing's selected) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
70 ;; - don't return the first (resp last) FI if the cursor is before |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
71 ;; (resp after) it. |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
72 ;; - allow cvs-confirm-removals to force always confirmation. |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
73 ;; - cvs-checkout should ask for a revision (with completion). |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
74 ;; - removal confirmation should allow specifying another file name. |
32187
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
75 ;; |
30717
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
76 ;; - hide fileinfos without getting rid of them (will require ewok work). |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
77 ;; - add toolbar entries |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
78 ;; - marking |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
79 ;; marking directories should jump to just after the dir. |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
80 ;; allow (un)marking directories at a time with the mouse. |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
81 ;; allow cvs-cmd-do to either clear the marks or not. |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
82 ;; add a "marks active" notion, like transient-mark-mode does. |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
83 ;; - liveness indicator |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
84 ;; - indicate in docstring if the cmd understands the `b' prefix(es). |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
85 ;; - call smerge-mode when opening CONFLICT files. |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
86 ;; - have vc-checkin delegate to cvs-mode-commit when applicable |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
87 ;; - higher-level CVS operations |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
88 ;; cvs-mode-rename |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
89 ;; cvs-mode-branch |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
90 ;; - module-level commands |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
91 ;; add support for parsing 'modules' file ("cvs co -c") |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
92 ;; cvs-mode-rcs2log |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
93 ;; cvs-rdiff |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
94 ;; cvs-release |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
95 ;; cvs-import |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
96 ;; C-u M-x cvs-checkout should ask for a cvsroot |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
97 ;; cvs-mode-handle-new-vendor-version |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
98 ;; - checks out module, or alternately does update join |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
99 ;; - does "cvs -n tag LAST_VENDOR" to find old files into *cvs* |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
100 ;; cvs-export |
30879
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
101 ;; (with completion on tag names and hooks to help generate full releases) |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
102 ;; - display stickiness information. And current CVS/Tag as well. |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
103 ;; - write 'cvs-mode-admin' to do arbitrary 'cvs admin' commands |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
104 ;; Most interesting would be version removal and log message replacement. |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
105 ;; The last one would be neat when called from log-view-mode. |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
106 ;; - cvs-mode-incorporate |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
107 ;; It would merge in the status from one *cvs* buffer into another. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
108 ;; This would be used to populate such a buffer that had been created with |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
109 ;; a `cvs {update,status,checkout} -l'. |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
110 ;; - cvs-mode-(i)diff-other-{file,buffer,cvs-buffer} |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
111 ;; - offer the choice to kill the process when the user kills the cvs buffer. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
112 ;; right now, it's killed without further ado. |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
113 ;; - make `cvs-mode-ignore' allow manually entering a pattern. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
114 ;; to which dir should it apply ? |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
115 ;; - cvs-mode-ignore should try to remove duplicate entries. |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
116 ;; - maybe poll/check CVS/Entries files to react to external `cvs' commands ? |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
117 ;; - some kind of `cvs annotate' support ? |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
118 ;; but vc-annotate can be used instead. |
30879
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
119 ;; - proper `g' that passes safe args and uses either cvs-status or cvs-examine |
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
120 ;; maybe also use cvs-update depending on I-don't-know-what. |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
121 ;; - add message-levels so that we can hide some levels of messages |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
122 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
123 ;;; Code: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
124 |
30612
a019ed819488
(require): Require `cl' during compilation, only.
Gerd Moellmann <gerd@gnu.org>
parents:
30569
diff
changeset
|
125 (eval-when-compile (require 'cl)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
126 (require 'ewoc) ;Ewoc was once cookie |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
127 (require 'pcvs-defs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
128 (require 'pcvs-util) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
129 (require 'pcvs-parse) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
130 (require 'pcvs-info) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
131 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
132 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
133 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
134 ;;;; global vars |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
135 ;;;; |
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 (defvar cvs-cookies) ;;nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
138 ;;"Handle for the cookie structure that is displayed in the *cvs* buffer.") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
139 ;;(make-variable-buffer-local 'cvs-cookies) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
140 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
141 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
142 ;;;; Dynamically scoped variables |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
143 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
144 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
145 (defvar cvs-from-vc nil "Bound to t inside VC advice.") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
146 |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
147 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
148 ;;;; flags variables |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
149 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
150 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
151 (defun cvs-defaults (&rest defs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
152 (let ((defs (cvs-first defs cvs-shared-start))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
153 (append defs |
30879
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
154 (make-list (- cvs-shared-start (length defs)) (car defs)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
155 cvs-shared-flags))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
156 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
157 ;; For cvs flags, we need to add "-f" to override the cvsrc settings |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
158 ;; we also want to evict the annoying -q and -Q options that hide useful |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
159 ;; information from pcl-cvs. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
160 (cvs-flags-define cvs-cvs-flags '(("-f"))) |
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 (cvs-flags-define cvs-checkout-flags (cvs-defaults '("-P"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
163 (cvs-flags-define cvs-status-flags (cvs-defaults '("-v") nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
164 (cvs-flags-define cvs-log-flags (cvs-defaults nil)) |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
165 (cvs-flags-define cvs-diff-flags (cvs-defaults '("-u" "-N") '("-c" "-N") '("-u" "-b"))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
166 (cvs-flags-define cvs-tag-flags (cvs-defaults nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
167 (cvs-flags-define cvs-add-flags (cvs-defaults nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
168 (cvs-flags-define cvs-commit-flags (cvs-defaults nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
169 (cvs-flags-define cvs-remove-flags (cvs-defaults nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
170 ;;(cvs-flags-define cvs-undo-flags (cvs-defaults nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
171 (cvs-flags-define cvs-update-flags (cvs-defaults '("-d" "-P"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
172 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
173 (defun cvs-reread-cvsrc () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
174 "Reset the default arguments to those in the `cvs-cvsrc-file'." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
175 (interactive) |
41779
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
176 (condition-case nil |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
177 (with-temp-buffer |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
178 (insert-file-contents cvs-cvsrc-file) |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
179 ;; fetch the values |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
180 (dolist (cmd '("cvs" "checkout" "status" "log" "diff" "tag" |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
181 "add" "commit" "remove" "update")) |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
182 (goto-char (point-min)) |
42966
afd482080b6f
(cvs-reread-cvsrc): Distinguish between an empty list of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42206
diff
changeset
|
183 (when (re-search-forward |
afd482080b6f
(cvs-reread-cvsrc): Distinguish between an empty list of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42206
diff
changeset
|
184 (concat "^" cmd "\\(\\s-+\\(.*\\)\\)?$") nil t) |
afd482080b6f
(cvs-reread-cvsrc): Distinguish between an empty list of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42206
diff
changeset
|
185 (let* ((sym (intern (concat "cvs-" cmd "-flags"))) |
afd482080b6f
(cvs-reread-cvsrc): Distinguish between an empty list of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42206
diff
changeset
|
186 (val (cvs-string->strings (or (match-string 2) "")))) |
afd482080b6f
(cvs-reread-cvsrc): Distinguish between an empty list of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42206
diff
changeset
|
187 (cvs-flags-set sym 0 val)))) |
41779
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
188 ;; ensure that cvs doesn't have -q or -Q |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
189 (cvs-flags-set 'cvs-cvs-flags 0 |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
190 (cons "-f" |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
191 (cdr (cvs-partition |
42966
afd482080b6f
(cvs-reread-cvsrc): Distinguish between an empty list of
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
42206
diff
changeset
|
192 (lambda (x) (member x '("-q" "-Q" "-f"))) |
41779
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
193 (cvs-flags-query 'cvs-cvs-flags |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
194 nil 'noquery)))))) |
d31a6beb070e
(cvs-reread-cvsrc): Don't use cvs-file-to-string.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
40479
diff
changeset
|
195 (file-error nil))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
196 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
197 ;; initialize to cvsrc's default values |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
198 (cvs-reread-cvsrc) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
199 |
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 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
202 ;;;; Mouse bindings and mode motion |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
203 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
204 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
205 (defun cvs-menu (e) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
206 "Popup the CVS menu." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
207 (interactive "e") |
30717
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
208 (let ((cvs-minor-current-files |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
209 (list (ewoc-data (ewoc-locate |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
210 cvs-cookies (posn-point (event-end e))))))) |
34376
25976c39c41e
* pcvs.el (cvs-menu): Use `cvs-menu' rather than `cvs-menu-map'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34304
diff
changeset
|
211 (popup-menu cvs-menu e))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
212 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
213 (defvar cvs-mode-line-process nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
214 "Mode-line control for displaying info on cvs process status.") |
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 |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
217 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
218 ;;;; Query-Type-Descriptor for Tags |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
219 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
220 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
221 (autoload 'cvs-status-get-tags "cvs-status") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
222 (defun cvs-tags-list () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
223 "Return a list of acceptable tags, ready for completions." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
224 (assert (cvs-buffer-p)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
225 (let ((marked (cvs-get-marked))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
226 (list* '("BASE") '("HEAD") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
227 (when marked |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
228 (with-temp-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
229 (call-process cvs-program |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
230 nil ;no input |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
231 t ;output to current-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
232 nil ;don't update display while running |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
233 "status" |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
234 "-v" |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
235 (cvs-fileinfo->full-path (car marked))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
236 (goto-char (point-min)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
237 (let ((tags (cvs-status-get-tags))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
238 (when (listp tags) tags))))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
239 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
240 (defvar cvs-tag-history nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
241 (defconst cvs-qtypedesc-tag |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
242 (cvs-qtypedesc-create 'identity 'identity 'cvs-tags-list 'cvs-tag-history)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
243 |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
244 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
245 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
246 (defun cvs-mode! (&optional -cvs-mode!-fun -cvs-mode!-noerror) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
247 "Switch to the *cvs* buffer. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
248 If -CVS-MODE!-FUN is provided, it is executed *cvs* being the current buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
249 and with its window selected. Else, the *cvs* buffer is simply selected. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
250 If -CVS-MODE!-NOERROR is non-nil, then failure to find a *cvs* buffer does |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
251 not generate an error and the current buffer is kept selected. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
252 -CVS-MODE!-FUN is called interactively if applicable and else with no argument." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
253 (let* ((-cvs-mode!-buf (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
254 (cvsbuf (cond ((cvs-buffer-p) (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
255 ((and cvs-buffer (cvs-buffer-p cvs-buffer)) cvs-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
256 (-cvs-mode!-noerror (current-buffer)) |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37339
diff
changeset
|
257 (t (error "can't find the *cvs* buffer")))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
258 (-cvs-mode!-wrapper cvs-minor-wrap-function) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
259 (-cvs-mode!-cont (lambda () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
260 (save-current-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
261 (if (commandp -cvs-mode!-fun) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
262 (call-interactively -cvs-mode!-fun) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
263 (funcall -cvs-mode!-fun)))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
264 (if (not -cvs-mode!-fun) (set-buffer cvsbuf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
265 (let ((cvs-mode!-buf (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
266 (cvs-mode!-owin (selected-window)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
267 (cvs-mode!-nwin (get-buffer-window cvsbuf 'visible))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
268 (unwind-protect |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
269 (progn |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
270 (set-buffer cvsbuf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
271 (when cvs-mode!-nwin (select-window cvs-mode!-nwin)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
272 (if -cvs-mode!-wrapper |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
273 (funcall -cvs-mode!-wrapper -cvs-mode!-buf -cvs-mode!-cont) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
274 (funcall -cvs-mode!-cont))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
275 (set-buffer cvs-mode!-buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
276 (when (and cvs-mode!-nwin (eq cvs-mode!-nwin (selected-window))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
277 ;; the selected window has not been changed by FUN |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
278 (select-window cvs-mode!-owin))))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
279 |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
280 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
281 ;;;; Prefixes |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
282 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
283 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
284 (defvar cvs-branches (list cvs-vendor-branch "HEAD" "HEAD")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
285 (cvs-prefix-define cvs-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
286 "Current selected branch." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
287 "version" |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
288 (cons cvs-vendor-branch cvs-branches) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
289 cvs-qtypedesc-tag) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
290 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
291 (defun cvs-set-branch-prefix (arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
292 "Set the branch prefix to take action at the next command. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
293 See `cvs-prefix-set' for a further the description of the behavior. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
294 \\[universal-argument] 1 selects the vendor branch |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
295 and \\[universal-argument] 2 selects the HEAD." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
296 (interactive "P") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
297 (cvs-mode!) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
298 (cvs-prefix-set 'cvs-branch-prefix arg)) |
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 (defun cvs-add-branch-prefix (flags &optional arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
301 "Add branch selection argument if the branch prefix was set. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
302 The argument is added (or not) to the list of FLAGS and is constructed |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
303 by appending the branch to ARG which defaults to \"-r\"." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
304 (let ((branch (cvs-prefix-get 'cvs-branch-prefix))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
305 ;; deactivate the secondary prefix, even if not used. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
306 (cvs-prefix-get 'cvs-secondary-branch-prefix) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
307 (if branch (cons (concat (or arg "-r") branch) flags) flags))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
308 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
309 (cvs-prefix-define cvs-secondary-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
310 "Current secondary selected branch." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
311 "version" |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
312 (cons cvs-vendor-branch cvs-branches) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
313 cvs-qtypedesc-tag) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
314 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
315 (defun cvs-set-secondary-branch-prefix (arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
316 "Set the branch prefix to take action at the next command. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
317 See `cvs-prefix-set' for a further the description of the behavior. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
318 \\[universal-argument] 1 selects the vendor branch |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
319 and \\[universal-argument] 2 selects the HEAD." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
320 (interactive "P") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
321 (cvs-mode!) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
322 (cvs-prefix-set 'cvs-secondary-branch-prefix arg)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
323 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
324 (defun cvs-add-secondary-branch-prefix (flags &optional arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
325 "Add branch selection argument if the secondary branch prefix was set. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
326 The argument is added (or not) to the list of FLAGS and is constructed |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
327 by appending the branch to ARG which defaults to \"-r\". |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
328 Since the `cvs-secondary-branch-prefix' is only active if the primary |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
329 prefix is active, it is important to read the secondary prefix before |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
330 the primay since reading the primary can deactivate it." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
331 (let ((branch (and (cvs-prefix-get 'cvs-branch-prefix 'read-only) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
332 (cvs-prefix-get 'cvs-secondary-branch-prefix)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
333 (if branch (cons (concat (or arg "-r") branch) flags) flags))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
334 |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
335 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
336 |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
337 (define-minor-mode cvs-minor-mode |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
338 "This mode is used for buffers related to a main *cvs* buffer. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
339 All the `cvs-mode' buffer operations are simply rebound under |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
340 the \\[cvs-mode-map] prefix." |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
341 nil " CVS") |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
342 (put 'cvs-minor-mode 'permanent-local t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
343 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
344 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
345 (defvar cvs-temp-buffers nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
346 (defun cvs-temp-buffer (&optional cmd normal nosetup) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
347 "Create a temporary buffer to run CMD in. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
348 If CMD is a string, use it to lookup `cvs-buffer-name-alist' to find |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
349 the buffer name to be used and its `major-mode'. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
350 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
351 The selected window will not be changed. The new buffer will not maintain undo |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
352 information and will be read-only unless NORMAL is non-nil. It will be emptied |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
353 \(unless NOSETUP is non-nil\) and its `default-directory' will be inherited |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
354 from the current buffer." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
355 (let* ((cvs-buf (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
356 (info (cdr (assoc cmd cvs-buffer-name-alist))) |
30618
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
357 (name (eval (nth 0 info))) |
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
358 (mode (nth 1 info)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
359 (dir default-directory) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
360 (buf (cond |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
361 (name (cvs-get-buffer-create name)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
362 ((and (bufferp cvs-temp-buffer) (buffer-name cvs-temp-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
363 cvs-temp-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
364 (t |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
365 (set (make-local-variable 'cvs-temp-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
366 (cvs-get-buffer-create |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
367 (eval cvs-temp-buffer-name) 'noreuse)))))) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
368 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
369 ;; handle the potential pre-existing process |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
370 (let ((proc (get-buffer-process buf))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
371 (when (and (not normal) (processp proc) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
372 (memq (process-status proc) '(run stop))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
373 (error "Can not run two cvs processes simultaneously"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
374 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
375 (if (not name) (kill-local-variable 'other-window-scroll-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
376 ;; Strangely, if no window is created, `display-buffer' ends up |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
377 ;; doing a `switch-to-buffer' which does a `set-buffer', hence |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
378 ;; the need for `save-excursion'. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
379 (unless nosetup (save-excursion (display-buffer buf))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
380 ;; FIXME: this doesn't do the right thing if the user later on |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
381 ;; does a `find-file-other-window' and `scroll-other-window' |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
382 (set (make-local-variable 'other-window-scroll-buffer) buf)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
383 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
384 (add-to-list 'cvs-temp-buffers buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
385 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
386 (with-current-buffer buf |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
387 (setq buffer-read-only nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
388 (setq default-directory dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
389 (unless nosetup (erase-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
390 (set (make-local-variable 'cvs-buffer) cvs-buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
391 ;;(cvs-minor-mode 1) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
392 (let ((lbd list-buffers-directory)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
393 (if (fboundp mode) (funcall mode) (fundamental-mode)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
394 (when lbd (set (make-local-variable 'list-buffers-directory) lbd))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
395 (cvs-minor-mode 1) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
396 ;;(set (make-local-variable 'cvs-buffer) cvs-buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
397 (unless normal |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
398 (setq buffer-read-only t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
399 (buffer-disable-undo)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
400 buf))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
401 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
402 (defun cvs-mode-kill-buffers () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
403 "Kill all the \"temporary\" buffers created by the *cvs* buffer." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
404 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
405 (dolist (buf cvs-temp-buffers) (ignore-errors (kill-buffer buf)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
406 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
407 (defun cvs-make-cvs-buffer (dir &optional new) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
408 "Create the *cvs* buffer for directory DIR. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
409 If non-nil, NEW means to create a new buffer no matter what." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
410 ;; the real cvs-buffer creation |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
411 (setq dir (cvs-expand-dir-name dir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
412 (let* ((buffer-name (eval cvs-buffer-name)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
413 (buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
414 (or (and (not new) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
415 (eq cvs-reuse-cvs-buffer 'current) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
416 (cvs-buffer-p) ;reuse the current buffer if possible |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
417 (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
418 ;; look for another cvs buffer visiting the same directory |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
419 (save-excursion |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
420 (unless new |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
421 (dolist (buffer (cons (current-buffer) (buffer-list))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
422 (set-buffer buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
423 (and (cvs-buffer-p) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
424 (case cvs-reuse-cvs-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
425 (always t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
426 (subdir |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
427 (or (cvs-string-prefix-p default-directory dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
428 (cvs-string-prefix-p dir default-directory))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
429 (samedir (string= default-directory dir))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
430 (return buffer))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
431 ;; we really have to create a new buffer: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
432 ;; we temporarily bind cwd to "" to prevent |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
433 ;; create-file-buffer from using directory info |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
434 ;; unless it is explicitly in the cvs-buffer-name. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
435 (cvs-get-buffer-create buffer-name new)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
436 (with-current-buffer buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
437 (or |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
438 (and (string= dir default-directory) (cvs-buffer-p) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
439 ;; just a refresh |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
440 (ignore-errors |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
441 (cvs-cleanup-collection cvs-cookies nil nil t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
442 (current-buffer))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
443 ;; setup from scratch |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
444 (progn |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
445 (setq default-directory dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
446 (setq buffer-read-only nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
447 (erase-buffer) |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
448 (insert "\ |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
449 Repository : " (directory-file-name (cvs-get-cvsroot)) " |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
450 Module : " (cvs-get-module) " |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
451 Working dir: " (abbreviate-file-name dir) " |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
452 |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
453 ") |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
454 (setq buffer-read-only t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
455 (cvs-mode) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
456 (set (make-local-variable 'list-buffers-directory) buffer-name) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
457 ;;(set (make-local-variable 'cvs-temp-buffer) (cvs-temp-buffer)) |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
458 (let ((cookies (ewoc-create 'cvs-fileinfo-pp "\n" ""))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
459 (set (make-local-variable 'cvs-cookies) cookies) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
460 (add-hook 'kill-buffer-hook |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
461 (lambda () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
462 (ignore-errors (kill-buffer cvs-temp-buffer))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
463 nil t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
464 ;;(set-buffer buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
465 buffer)))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
466 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
467 (defun* cvs-cmd-do (cmd dir flags fis new |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
468 &key cvsargs noexist dont-change-disc noshow) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
469 (let* ((dir (file-name-as-directory |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
470 (abbreviate-file-name (expand-file-name dir)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
471 (cvsbuf (cvs-make-cvs-buffer dir new))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
472 ;; Check that dir is under CVS control. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
473 (unless (file-directory-p dir) |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
474 (error "%s is not a directory" dir)) |
45325
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
475 (unless (or noexist (file-directory-p (expand-file-name "CVS" dir)) |
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
476 (file-expand-wildcards (expand-file-name "*/CVS" dir))) |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
477 (error "%s does not contain CVS controlled files" dir)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
478 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
479 (set-buffer cvsbuf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
480 (cvs-mode-run cmd flags fis |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
481 :cvsargs cvsargs :dont-change-disc dont-change-disc) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
482 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
483 (if noshow cvsbuf |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
484 (let ((pop-up-windows nil)) (pop-to-buffer cvsbuf))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
485 ;; (funcall (if (and (boundp 'pop-up-frames) pop-up-frames) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
486 ;; 'pop-to-buffer 'switch-to-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
487 ;; cvsbuf)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
488 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
489 (defun cvs-run-process (args fis postprocess &optional single-dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
490 (assert (cvs-buffer-p cvs-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
491 (save-current-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
492 (let ((procbuf (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
493 (cvsbuf cvs-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
494 (single-dir (or single-dir (eq cvs-execute-single-dir t)))) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
495 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
496 (set-buffer procbuf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
497 (goto-char (point-max)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
498 (unless (bolp) (let ((inhibit-read-only t)) (insert "\n"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
499 ;; find the set of files we'll process in this round |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
500 (let* ((dir+files+rest |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
501 (if (or (null fis) (not single-dir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
502 ;; not single-dir mode: just process the whole thing |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
503 (list "" (mapcar 'cvs-fileinfo->full-path fis) nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
504 ;; single-dir mode: extract the same-dir-elements |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
505 (let ((dir (cvs-fileinfo->dir (car fis)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
506 ;; output the concerned dir so the parser can translate paths |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
507 (let ((inhibit-read-only t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
508 (insert "pcl-cvs: descending directory " dir "\n")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
509 ;; loop to find the same-dir-elems |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
510 (do* ((files () (cons (cvs-fileinfo->file fi) files)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
511 (fis fis (cdr fis)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
512 (fi (car fis) (car fis))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
513 ((not (and fis (string= dir (cvs-fileinfo->dir fi)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
514 (list dir files fis)))))) |
30618
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
515 (dir (nth 0 dir+files+rest)) |
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
516 (files (nth 1 dir+files+rest)) |
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
517 (rest (nth 2 dir+files+rest))) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
518 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
519 ;; setup the (current) process buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
520 (set (make-local-variable 'cvs-postprocess) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
521 (if (null rest) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
522 ;; this is the last invocation |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
523 postprocess |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
524 ;; else, we have to register ourselves to be rerun on the rest |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
525 `(cvs-run-process ',args ',rest ',postprocess ',single-dir))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
526 (add-hook 'kill-buffer-hook |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
527 (lambda () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
528 (let ((proc (get-buffer-process (current-buffer)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
529 (when (processp proc) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
530 (set-process-filter proc nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
531 (set-process-sentinel proc nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
532 (delete-process proc)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
533 nil t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
534 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
535 ;; create the new process and setup the procbuffer correspondingly |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
536 (let* ((args (append (cvs-flags-query 'cvs-cvs-flags nil 'noquery) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
537 (if cvs-cvsroot (list "-d" cvs-cvsroot)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
538 args |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
539 files)) |
47211
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
540 ;; If process-connection-type is nil and the repository |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
541 ;; is accessed via SSH, a bad interaction between libc, |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
542 ;; CVS and SSH can lead to garbled output. |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
543 ;; It might be a glibc-specific problem. |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
544 ;; Until the problem is cleared, we'll use a pty rather than |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
545 ;; a pipe. |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
546 ;; (process-connection-type nil) ; Use a pipe, not a pty. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
547 (process |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
548 ;; the process will be run in the selected dir |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
549 (let ((default-directory (cvs-expand-dir-name dir))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
550 (apply 'start-process "cvs" procbuf cvs-program args)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
551 (set-process-sentinel process 'cvs-sentinel) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
552 (set-process-filter process 'cvs-update-filter) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
553 (set-marker (process-mark process) (point-max)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
554 (ignore-errors (process-send-eof process)) ;close its stdin to avoid hangs |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
555 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
556 ;; now finish setting up the cvs-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
557 (set-buffer cvsbuf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
558 (setq cvs-mode-line-process (symbol-name (process-status process))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
559 (force-mode-line-update))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
560 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
561 ;; The following line is said to improve display updates on some |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
562 ;; emacsen. It shouldn't be needed, but it does no harm. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
563 (sit-for 0)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
564 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
565 (defun cvs-update-header (args fis) ; inline |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
566 (let* ((lastarg nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
567 (args (mapcar (lambda (arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
568 (cond |
47211
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
569 ;; filter out the largish commit message |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
570 ((and (eq lastarg nil) (string= arg "commit")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
571 (setq lastarg 'commit) arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
572 ((and (eq lastarg 'commit) (string= arg "-m")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
573 (setq lastarg '-m) arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
574 ((eq lastarg '-m) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
575 (setq lastarg 'done) "<log message>") |
47211
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
576 ;; filter out the largish `admin -mrev:msg' message |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
577 ((and (eq lastarg nil) (string= arg "admin")) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
578 (setq lastarg 'admin) arg) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
579 ((and (eq lastarg 'admin) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
580 (string-match "\\`-m[^:]*:" arg)) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
581 (setq lastarg 'done) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
582 (concat (match-string 0 arg) "<log message>")) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
583 ;; Keep the rest as is. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
584 (t arg))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
585 args)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
586 ;; turn them into a string |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
587 (arg (cvs-strings->string |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
588 (append (cvs-flags-query 'cvs-cvs-flags nil 'noquery) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
589 (if cvs-cvsroot (list "-d" cvs-cvsroot)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
590 args |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
591 (mapcar 'cvs-fileinfo->full-path fis)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
592 (str (if args (concat "-- Running " cvs-program " " arg " ...\n") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
593 "\n"))) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
594 (if nil (insert str) ;inline |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
595 ;;(with-current-buffer cvs-buffer |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
596 (let* ((prev-msg (car (ewoc-get-hf cvs-cookies))) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
597 (tin (ewoc-nth cvs-cookies 0))) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
598 ;; look for the first *real* fileinfo (to determine emptyness) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
599 (while |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
600 (and tin |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
601 (memq (cvs-fileinfo->type (ewoc-data tin)) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
602 '(MESSAGE DIRCHANGE))) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
603 (setq tin (ewoc-next cvs-cookies tin))) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
604 ;; cleanup the prev-msg |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
605 (when (string-match "Running \\(.*\\) ...\n" prev-msg) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
606 (setq prev-msg |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
607 (concat |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
608 "-- last cmd: " |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
609 (match-string 1 prev-msg) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
610 " --"))) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
611 ;; set the new header and footer |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
612 (ewoc-set-hf cvs-cookies |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
613 str (concat "\n--------------------- " |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
614 (if tin "End" "Empty") |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
615 " ---------------------\n" |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
616 prev-msg)))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
617 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
618 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
619 (defun cvs-sentinel (proc msg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
620 "Sentinel for the cvs update process. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
621 This is responsible for parsing the output from the cvs update when |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
622 it is finished." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
623 (when (memq (process-status proc) '(signal exit)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
624 (if (null (buffer-name (process-buffer proc))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
625 ;;(set-process-buffer proc nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
626 (error "cvs' process buffer was killed") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
627 (let* ((obuf (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
628 (procbuffer (process-buffer proc))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
629 (set-buffer (with-current-buffer procbuffer cvs-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
630 (setq cvs-mode-line-process (symbol-name (process-status proc))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
631 (force-mode-line-update) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
632 (set-buffer procbuffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
633 (let ((cvs-postproc cvs-postprocess)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
634 ;; Since the buffer and mode line will show that the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
635 ;; process is dead, we can delete it now. Otherwise it |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
636 ;; will stay around until M-x list-processes. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
637 (delete-process proc) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
638 (setq cvs-postprocess nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
639 ;; do the postprocessing like parsing and such |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
640 (save-excursion (eval cvs-postproc)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
641 ;; check whether something is left |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
642 (unless cvs-postprocess |
47211
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
643 ;; IIRC, we enable undo again once the process is finished |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
644 ;; for cases where the output was inserted in *vc-diff* or |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
645 ;; in a file-like buffer. -stef |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
646 (buffer-enable-undo) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
647 (with-current-buffer cvs-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
648 (cvs-update-header nil nil) ;FIXME: might need to be inline |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
649 (message "CVS process has completed")))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
650 ;; This might not even be necessary |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
651 (set-buffer obuf))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
652 |
45999
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
653 (defun cvs-parse-process (dcd &optional subdir old-fis) |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
654 "Parse the output of a cvs process. |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
655 DCD is the `dont-change-disc' flag to use when parsing that output. |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
656 SUBDIR is the subdirectory (if any) where this command was run. |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
657 OLD-FIS is the list of fileinfos on which the cvs command was applied and |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
658 which should be considered up-to-date if they are missing from the output." |
46002
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
659 (let* ((fileinfos (cvs-parse-buffer 'cvs-parse-table dcd subdir)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
660 last) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
661 (with-current-buffer cvs-buffer |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
662 ;; Expand OLD-FIS to actual files. |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
663 (let ((fis nil)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
664 (dolist (fi old-fis) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
665 (setq fis (if (eq (cvs-fileinfo->type fi) 'DIRCHANGE) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
666 (nconc (ewoc-collect cvs-cookies 'cvs-dir-member-p |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
667 (cvs-fileinfo->dir fi)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
668 fis) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
669 (cons fi fis)))) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
670 (setq old-fis fis)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
671 ;; Drop OLD-FIS which were already up-to-date. |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
672 (let ((fis nil)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
673 (dolist (fi old-fis) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
674 (unless (eq (cvs-fileinfo->type fi) 'UP-TO-DATE) (push fi fis))) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
675 (setq old-fis fis)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
676 ;; Add the new fileinfos to the ewoc. |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
677 (dolist (fi fileinfos) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
678 (setq last (cvs-addto-collection cvs-cookies fi last)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
679 ;; This FI was in the output, so remove it from OLD-FIS. |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
680 (setq old-fis (delq (ewoc-data last) old-fis))) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
681 ;; Process the "silent output" (i.e. absence means up-to-date). |
45999
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
682 (dolist (fi old-fis) |
46002
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
683 (setf (cvs-fileinfo->type fi) 'UP-TO-DATE) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
684 (setq last (cvs-addto-collection cvs-cookies fi last))) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
685 (setq fileinfos (nconc old-fis fileinfos)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
686 ;; Clean up the ewoc as requested by the user. |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
687 (cvs-cleanup-collection cvs-cookies |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
688 (eq cvs-auto-remove-handled t) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
689 cvs-auto-remove-directories |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
690 nil) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
691 ;; Revert buffers if necessary. |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
692 (when (and cvs-auto-revert (not dcd) (not cvs-from-vc)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
693 (cvs-revert-if-needed fileinfos))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
694 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
695 (defmacro defun-cvs-mode (fun args docstring interact &rest body) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
696 "Define a function to be used in a *cvs* buffer. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
697 This will look for a *cvs* buffer and execute BODY in it. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
698 Since the interactive arguments might need to be queried after |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
699 switching to the *cvs* buffer, the generic code is rather ugly, |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
700 but luckily we can often use simpler alternatives. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
701 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
702 FUN can be either a symbol (i.e. STYLE is nil) or a cons (FUN . STYLE). |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
703 ARGS and DOCSTRING are the normal argument list. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
704 INTERACT is the interactive specification or nil for non-commands. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
705 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
706 STYLE can be either SIMPLE, NOARGS or DOUBLE. It's an error for it |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
707 to have any other value, unless other details of the function make it |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
708 clear what alternative to use. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
709 - SIMPLE will get all the interactive arguments from the original buffer. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
710 - NOARGS will get all the arguments from the *cvs* buffer and will |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
711 always behave as if called interactively. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
712 - DOUBLE is the generic case." |
47211
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
713 (declare (debug (&define sexp lambda-list stringp ("interactive" interactive) def-body))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
714 (let ((style (cvs-cdr fun)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
715 (fun (cvs-car fun))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
716 (cond |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
717 ;; a trivial interaction, no need to move it |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
718 ((or (eq style 'SIMPLE) |
30618
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
719 (null (nth 1 interact)) |
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
720 (stringp (nth 1 interact))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
721 `(defun ,fun ,args ,docstring ,interact |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
722 (cvs-mode! (lambda () ,@body)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
723 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
724 ;; fun is only called interactively: move all the args to the inner fun |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
725 ((eq style 'NOARGS) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
726 `(defun ,fun () ,docstring (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
727 (cvs-mode! (lambda ,args ,interact ,@body)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
728 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
729 ;; bad case |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
730 ((eq style 'DOUBLE) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
731 (string-match ".*" docstring) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
732 (let ((line1 (match-string 0 docstring)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
733 (restdoc (substring docstring (match-end 0))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
734 (fun-1 (intern (concat (symbol-name fun) "-1")))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
735 `(progn |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
736 (defun ,fun-1 ,args |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
737 ,(concat docstring "\nThis function only works within a *cvs* buffer. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
738 For interactive use, use `" (symbol-name fun) "' instead.") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
739 ,interact |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
740 ,@body) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
741 (defun ,fun () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
742 ,(concat line1 "\nWrapper function that switches to a *cvs* buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
743 before calling the real function `" (symbol-name fun-1) "'.\n") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
744 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
745 (cvs-mode! ',fun-1))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
746 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
747 (t (error "unknown style %s in `defun-cvs-mode'" style))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
748 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
749 (defun-cvs-mode cvs-mode-kill-process () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
750 "Kill the temporary buffer and associated process." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
751 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
752 (when (and (bufferp cvs-temp-buffer) (buffer-name cvs-temp-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
753 (let ((proc (get-buffer-process cvs-temp-buffer))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
754 (when proc (delete-process proc))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
755 |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
756 ;; |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
757 ;; Maintaining the collection in the face of updates |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
758 ;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
759 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
760 (defun cvs-addto-collection (c fi &optional tin) |
32488
1fd2c9a94ec3
* pcvs.el (cvs-make-cvs-buffer, cvs-run-process):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32309
diff
changeset
|
761 "Add FI to C and return FI's corresponding tin. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
762 FI is inserted in its proper place or maybe even merged with a preexisting |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
763 fileinfo if applicable. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
764 TIN specifies an optional starting point." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
765 (unless tin (setq tin (ewoc-nth c 0))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
766 (while (and tin (cvs-fileinfo< fi (ewoc-data tin))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
767 (setq tin (ewoc-prev c tin))) |
32488
1fd2c9a94ec3
* pcvs.el (cvs-make-cvs-buffer, cvs-run-process):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32309
diff
changeset
|
768 (if (null tin) (ewoc-enter-first c fi) ;empty collection |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
769 (assert (not (cvs-fileinfo< fi (ewoc-data tin)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
770 (let ((next-tin (ewoc-next c tin))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
771 (while (not (or (null next-tin) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
772 (cvs-fileinfo< fi (ewoc-data next-tin)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
773 (setq tin next-tin next-tin (ewoc-next c next-tin))) |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
774 (if (or (cvs-fileinfo< (ewoc-data tin) fi) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
775 (eq (cvs-fileinfo->type fi) 'MESSAGE)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
776 ;; tin < fi < next-tin |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
777 (ewoc-enter-after c tin fi) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
778 ;; fi == tin |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
779 (cvs-fileinfo-update (ewoc-data tin) fi) |
32488
1fd2c9a94ec3
* pcvs.el (cvs-make-cvs-buffer, cvs-run-process):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32309
diff
changeset
|
780 (ewoc-invalidate c tin) |
46002
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
781 ;; Move cursor back to where it belongs. |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
782 (when (bolp) (cvs-move-to-goal-column)) |
32488
1fd2c9a94ec3
* pcvs.el (cvs-make-cvs-buffer, cvs-run-process):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32309
diff
changeset
|
783 tin)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
784 |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
785 (defcustom cvs-cleanup-functions nil |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
786 "Functions to tweak the cleanup process. |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
787 The functions are called with a single argument (a FILEINFO) and should |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
788 return a non-nil value if that fileinfo should be removed." |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
789 :group 'pcl-cvs |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
790 :type '(hook :options (cvs-cleanup-removed))) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
791 |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
792 (defun cvs-cleanup-removed (fi) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
793 "Non-nil if FI has been cvs-removed but still exists. |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
794 This is intended for use on `cvs-cleanup-functions' when you have cvs-removed |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
795 automatically generated files (which should hence not be under CVS control) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
796 but can't commit the removal because the repository's owner doesn't understand |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
797 the problem." |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
798 (and (or (eq (cvs-fileinfo->type fi) 'REMOVED) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
799 (and (eq (cvs-fileinfo->type fi) 'CONFLICT) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
800 (eq (cvs-fileinfo->subtype fi) 'REMOVED))) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
801 (file-exists-p (cvs-fileinfo->full-path fi)))) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
802 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
803 ;; called at the following times: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
804 ;; - postparse ((eq cvs-auto-remove-handled t) cvs-auto-remove-directories nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
805 ;; - pre-run ((eq cvs-auto-remove-handled 'delayed) nil t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
806 ;; - remove-handled (t (or cvs-auto-remove-directories 'handled) t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
807 ;; - cvs-cmd-do (nil nil t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
808 ;; - post-ignore (nil nil nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
809 ;; - acknowledge (nil nil nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
810 ;; - remove (nil nil nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
811 (defun cvs-cleanup-collection (c rm-handled rm-dirs rm-msgs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
812 "Remove undesired entries. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
813 C is the collection |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
814 RM-HANDLED if non-nil means remove handled entries. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
815 RM-DIRS behaves like `cvs-auto-remove-directories'. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
816 RM-MSGS if non-nil means remove messages." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
817 (let (last-fi first-dir (rerun t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
818 (while rerun |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
819 (setq rerun nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
820 (setq first-dir t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
821 (setq last-fi (cvs-create-fileinfo 'DEAD "../" "" "")) ;place-holder |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
822 (ewoc-filter |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
823 c (lambda (fi) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
824 (let* ((type (cvs-fileinfo->type fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
825 (subtype (cvs-fileinfo->subtype fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
826 (keep |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
827 (case type |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
828 ;; remove temp messages and keep the others |
28862
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
829 (MESSAGE (not (or rm-msgs (eq subtype 'TEMP)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
830 ;; remove entries |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
831 (DEAD nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
832 ;; handled also? |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
833 (UP-TO-DATE (not rm-handled)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
834 ;; keep the rest |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
835 (t (not (run-hook-with-args-until-success |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
836 'cvs-cleanup-functions fi)))))) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
837 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
838 ;; mark dirs for removal |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
839 (when (and keep rm-dirs |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
840 (eq (cvs-fileinfo->type last-fi) 'DIRCHANGE) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
841 (not (when first-dir (setq first-dir nil) t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
842 (or (eq rm-dirs 'all) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
843 (not (cvs-string-prefix-p |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
844 (cvs-fileinfo->dir last-fi) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
845 (cvs-fileinfo->dir fi))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
846 (and (eq type 'DIRCHANGE) (eq rm-dirs 'empty)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
847 (eq subtype 'FOOTER))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
848 (setf (cvs-fileinfo->type last-fi) 'DEAD) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
849 (setq rerun t)) |
28862
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
850 (when keep (setq last-fi fi))))) |
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
851 ;; remove empty last dir |
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
852 (when (and rm-dirs |
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
853 (not first-dir) |
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
854 (eq (cvs-fileinfo->type last-fi) 'DIRCHANGE)) |
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
855 (setf (cvs-fileinfo->type last-fi) 'DEAD) |
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
856 (setq rerun t))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
857 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
858 (defun cvs-get-cvsroot () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
859 "Gets the CVSROOT for DIR." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
860 (let ((cvs-cvsroot-file (expand-file-name "Root" "CVS"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
861 (or (cvs-file-to-string cvs-cvsroot-file t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
862 cvs-cvsroot |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
863 (getenv "CVSROOT") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
864 "?????"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
865 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
866 (defun cvs-get-module () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
867 "Return the current CVS module. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
868 This usually doesn't really work but is a handy initval in a prompt." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
869 (let* ((repfile (expand-file-name "Repository" "CVS")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
870 (rep (cvs-file-to-string repfile t))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
871 (cond |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
872 ((null rep) "") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
873 ((not (file-name-absolute-p rep)) rep) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
874 (t |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
875 (let* ((root (cvs-get-cvsroot)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
876 (str (concat (file-name-as-directory (or root "/")) " || " rep))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
877 (if (and root (string-match "\\(.*\\) || \\1\\(.*\\)\\'" str)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
878 (match-string 2 str) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
879 (file-name-nondirectory rep))))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
880 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
881 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
882 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
883 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
884 ;;;; running a "cvs checkout". |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
885 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
886 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
887 ;;;###autoload |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
888 (defun cvs-checkout (modules dir flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
889 "Run a 'cvs checkout MODULES' in DIR. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
890 Feed the output to a *cvs* buffer, display it in the current window, |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
891 and run `cvs-mode' on it. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
892 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
893 With a prefix argument, prompt for cvs FLAGS to use." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
894 (interactive |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
895 (list (cvs-string->strings (read-string "Module(s): " (cvs-get-module))) |
48003
d892c6e810f9
(cvs-checkout): Use read-directory-name.
Kim F. Storm <storm@cua.dk>
parents:
47729
diff
changeset
|
896 (read-directory-name "CVS Checkout Directory: " |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
897 nil default-directory nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
898 (cvs-add-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
899 (cvs-flags-query 'cvs-checkout-flags "cvs checkout flags")))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
900 (when (eq flags t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
901 (setf flags (cvs-flags-query 'cvs-checkout-flags nil 'noquery))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
902 (cvs-cmd-do "checkout" (or dir default-directory) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
903 (append flags modules) nil 'new |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
904 :noexist t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
905 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
906 |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
907 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
908 ;;;; The code for running a "cvs update" and friends in various ways. |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
909 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
910 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
911 (defun-cvs-mode (cvs-mode-revert-buffer . SIMPLE) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
912 (&optional ignore-auto noconfirm) |
35623
d88382df7b52
(cvs-mode-revert-buffer): Doc fix.
Dave Love <fx@gnu.org>
parents:
34653
diff
changeset
|
913 "Rerun `cvs-examine' on the current directory with the default flags." |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
914 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
915 (cvs-examine default-directory t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
916 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
917 (defun cvs-query-directory (msg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
918 ;; last-command-char = ?\r hints that the command was run via M-x |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
919 (if (and (cvs-buffer-p) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
920 (not current-prefix-arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
921 (not (eq last-command-char ?\r))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
922 default-directory |
48003
d892c6e810f9
(cvs-checkout): Use read-directory-name.
Kim F. Storm <storm@cua.dk>
parents:
47729
diff
changeset
|
923 (read-directory-name msg nil default-directory nil))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
924 |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
925 ;;;###autoload |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
926 (defun cvs-quickdir (dir &optional flags noshow) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
927 "Open a *cvs* buffer on DIR without running cvs. |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
928 With a prefix argument, prompt for a directory to use. |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
929 A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]), |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
930 prevents reuse of an existing *cvs* buffer. |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
931 Optional argument NOSHOW if non-nil means not to display the buffer. |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
932 FLAGS is ignored." |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
933 (interactive (list (cvs-query-directory "CVS quickdir (directory): "))) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
934 ;; FIXME: code duplication with cvs-cmd-do and cvs-parse-process |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
935 (let* ((dir (file-name-as-directory |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
936 (abbreviate-file-name (expand-file-name dir)))) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
937 (new (> (prefix-numeric-value current-prefix-arg) 8)) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
938 (cvsbuf (cvs-make-cvs-buffer dir new)) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
939 last) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
940 ;; Check that dir is under CVS control. |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
941 (unless (file-directory-p dir) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
942 (error "%s is not a directory" dir)) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
943 (unless (file-directory-p (expand-file-name "CVS" dir)) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
944 (error "%s does not contain CVS controlled files" dir)) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
945 (set-buffer cvsbuf) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
946 (dolist (fi (cvs-fileinfo-from-entries "")) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
947 (setq last (cvs-addto-collection cvs-cookies fi last))) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
948 (cvs-cleanup-collection cvs-cookies |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
949 (eq cvs-auto-remove-handled t) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
950 cvs-auto-remove-directories |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
951 nil) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
952 (if noshow cvsbuf |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
953 (let ((pop-up-windows nil)) (pop-to-buffer cvsbuf))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
954 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
955 ;;;###autoload |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
956 (defun cvs-examine (directory flags &optional noshow) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
957 "Run a `cvs -n update' in the specified DIRECTORY. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
958 That is, check what needs to be done, but don't change the disc. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
959 Feed the output to a *cvs* buffer and run `cvs-mode' on it. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
960 With a prefix argument, prompt for a directory and cvs FLAGS to use. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
961 A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]), |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
962 prevents reuse of an existing *cvs* buffer. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
963 Optional argument NOSHOW if non-nil means not to display the buffer." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
964 (interactive (list (cvs-query-directory "CVS Examine (directory): ") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
965 (cvs-flags-query 'cvs-update-flags "cvs -n update flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
966 (when (eq flags t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
967 (setf flags (cvs-flags-query 'cvs-update-flags nil 'noquery))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
968 (cvs-cmd-do "update" directory flags nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
969 (> (prefix-numeric-value current-prefix-arg) 8) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
970 :cvsargs '("-n") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
971 :noshow noshow |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
972 :dont-change-disc t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
973 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
974 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
975 ;;;###autoload |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
976 (defun cvs-update (directory flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
977 "Run a `cvs update' in the current working DIRECTORY. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
978 Feed the output to a *cvs* buffer and run `cvs-mode' on it. |
47729
8dcdf2a8c1f8
(cvs-mode-find-file): Look up font-lock-face so it also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47470
diff
changeset
|
979 With a \\[universal-argument] prefix argument, prompt for a directory to use. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
980 A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]), |
47729
8dcdf2a8c1f8
(cvs-mode-find-file): Look up font-lock-face so it also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47470
diff
changeset
|
981 prevents reuse of an existing *cvs* buffer. |
8dcdf2a8c1f8
(cvs-mode-find-file): Look up font-lock-face so it also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47470
diff
changeset
|
982 The prefix is also passed to `cvs-flags-query' to select the FLAGS |
8dcdf2a8c1f8
(cvs-mode-find-file): Look up font-lock-face so it also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47470
diff
changeset
|
983 passed to cvs." |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
984 (interactive (list (cvs-query-directory "CVS Update (directory): ") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
985 (cvs-flags-query 'cvs-update-flags "cvs update flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
986 (when (eq flags t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
987 (setf flags (cvs-flags-query 'cvs-update-flags nil 'noquery))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
988 (cvs-cmd-do "update" directory flags nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
989 (> (prefix-numeric-value current-prefix-arg) 8))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
990 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
991 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
992 ;;;###autoload |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
993 (defun cvs-status (directory flags &optional noshow) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
994 "Run a `cvs status' in the current working DIRECTORY. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
995 Feed the output to a *cvs* buffer and run `cvs-mode' on it. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
996 With a prefix argument, prompt for a directory and cvs FLAGS to use. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
997 A prefix arg >8 (ex: \\[universal-argument] \\[universal-argument]), |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
998 prevents reuse of an existing *cvs* buffer. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
999 Optional argument NOSHOW if non-nil means not to display the buffer." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1000 (interactive (list (cvs-query-directory "CVS Status (directory): ") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1001 (cvs-flags-query 'cvs-status-flags "cvs status flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1002 (when (eq flags t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1003 (setf flags (cvs-flags-query 'cvs-status-flags nil 'noquery))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1004 (cvs-cmd-do "status" directory flags nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1005 (> (prefix-numeric-value current-prefix-arg) 8) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1006 :noshow noshow :dont-change-disc t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1007 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1008 (defun cvs-update-filter (proc string) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1009 "Filter function for pcl-cvs. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1010 This function gets the output that CVS sends to stdout. It inserts |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1011 the STRING into (process-buffer PROC) but it also checks if CVS is waiting |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1012 for a lock file. If so, it inserts a message cookie in the *cvs* buffer." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1013 (save-match-data |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1014 (with-current-buffer (process-buffer proc) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1015 (let ((inhibit-read-only t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1016 (save-excursion |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1017 ;; Insert the text, moving the process-marker. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1018 (goto-char (process-mark proc)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1019 (insert string) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1020 (set-marker (process-mark proc) (point)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1021 ;; FIXME: Delete any old lock message |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1022 ;;(if (tin-nth cookies 1) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1023 ;; (tin-delete cookies |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1024 ;; (tin-nth cookies 1))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1025 ;; Check if CVS is waiting for a lock. |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1026 (beginning-of-line 0) ;Move to beginning of last complete line. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1027 (when (looking-at "^[ a-z]+: \\(.*waiting for .*lock in \\(.*\\)\\)$") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1028 (let ((msg (match-string 1)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1029 (lock (match-string 2))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1030 (with-current-buffer cvs-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1031 (set (make-local-variable 'cvs-lock-file) lock) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1032 ;; display the lock situation in the *cvs* buffer: |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1033 (ewoc-enter-last |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1034 cvs-cookies |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1035 (cvs-create-fileinfo |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1036 'MESSAGE "" " " |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1037 (concat msg |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1038 (when (file-exists-p lock) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1039 (substitute-command-keys |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1040 "\n\t(type \\[cvs-mode-delete-lock] to delete it)"))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1041 :subtype 'TEMP)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1042 (pop-to-buffer (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1043 (goto-char (point-max)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1044 (beep))))))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1045 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1046 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1047 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1048 ;;;; The cvs-mode and its associated commands. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1049 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1050 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1051 (cvs-prefix-define cvs-force-command "" "" '("/F") cvs-qtypedesc-string1) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1052 (defun-cvs-mode cvs-mode-force-command (arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1053 "Force the next cvs command to operate on all the selected files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1054 By default, cvs commands only operate on files on which the command |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1055 \"makes sense\". This overrides the safety feature on the next cvs command. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1056 It actually behaves as a toggle. If prefixed by \\[universal-argument] \\[universal-argument], |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1057 the override will persist until the next toggle." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1058 (interactive "P") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1059 (cvs-prefix-set 'cvs-force-command arg)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1060 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1061 (put 'cvs-mode 'mode-class 'special) |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1062 (define-derived-mode cvs-mode fundamental-mode "CVS" |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1063 "Mode used for PCL-CVS, a frontend to CVS. |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1064 Full documentation is in the Texinfo file." |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1065 (setq mode-line-process |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1066 '("" cvs-force-command cvs-ignore-marks-modif |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1067 ":" (cvs-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1068 ("" cvs-branch-prefix (cvs-secondary-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1069 ("->" cvs-secondary-branch-prefix)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1070 " " cvs-mode-line-process)) |
47211
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1071 (buffer-disable-undo) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1072 ;;(set (make-local-variable 'goal-column) cvs-cursor-column) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1073 (set (make-local-variable 'revert-buffer-function) 'cvs-mode-revert-buffer) |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1074 (setq truncate-lines t) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1075 (cvs-prefix-make-local 'cvs-branch-prefix) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1076 (cvs-prefix-make-local 'cvs-secondary-branch-prefix) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1077 (cvs-prefix-make-local 'cvs-force-command) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1078 (cvs-prefix-make-local 'cvs-ignore-marks-modif) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1079 (make-local-variable 'cvs-mode-line-process) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1080 (make-local-variable 'cvs-temp-buffers)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1081 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1082 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1083 (defun cvs-buffer-p (&optional buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1084 "Return whether the (by default current) BUFFER is a `cvs-mode' buffer." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1085 (save-excursion |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1086 (if buffer (set-buffer buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1087 (and (eq major-mode 'cvs-mode)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1088 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1089 (defun cvs-buffer-check () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1090 "Check that the current buffer follows cvs-buffer's conventions." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1091 (let ((buf (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1092 (check 'none)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1093 (or (and (setq check 'collection) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1094 (eq (ewoc-buffer cvs-cookies) buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1095 (setq check 'cvs-temp-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1096 (or (null cvs-temp-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1097 (null (buffer-name cvs-temp-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1098 (and (eq (with-current-buffer cvs-temp-buffer cvs-buffer) buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1099 (equal (with-current-buffer cvs-temp-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1100 default-directory) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1101 default-directory))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1102 t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1103 (error "Inconsistent %s in buffer %s" check (buffer-name buf))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1104 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1105 |
34376
25976c39c41e
* pcvs.el (cvs-menu): Use `cvs-menu' rather than `cvs-menu-map'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34304
diff
changeset
|
1106 (defun cvs-mode-quit () |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1107 "Quit PCL-CVS, killing the *cvs* buffer." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1108 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1109 (and (y-or-n-p "Quit pcl-cvs? ") (kill-buffer (current-buffer)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1110 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1111 ;; Give help.... |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1112 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1113 (defun cvs-help () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1114 "Display help for various PCL-CVS commands." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1115 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1116 (if (eq last-command 'cvs-help) |
34408
0f95f2e53b1f
Update references to CVS-Edit (now Log-Edit).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34376
diff
changeset
|
1117 (describe-function 'cvs-mode) ; would need minor-mode for log-edit-mode |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1118 (message |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1119 (substitute-command-keys |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1120 "`\\[cvs-help]':help `\\[cvs-mode-add]':add `\\[cvs-mode-commit]':commit \ |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1121 `\\[cvs-mode-diff-map]':diff* `\\[cvs-mode-log]':log \ |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1122 `\\[cvs-mode-remove]':remove `\\[cvs-mode-status]':status \ |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1123 `\\[cvs-mode-undo]':undo")))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1124 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1125 ;; Move around in the buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1126 |
46002
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
1127 (defun cvs-move-to-goal-column () |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
1128 (let* ((eol (line-end-position)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
1129 (fpos (next-single-property-change (point) 'cvs-goal-column nil eol))) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
1130 (when (< fpos eol) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
1131 (goto-char fpos)))) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
1132 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1133 (defun-cvs-mode cvs-mode-previous-line (arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1134 "Go to the previous line. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1135 If a prefix argument is given, move by that many lines." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1136 (interactive "p") |
44384
3626a12fe452
* pcvs.el (cvs-mode-previous-line, cvs-mode-next-line): Move to
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42966
diff
changeset
|
1137 (ewoc-goto-prev cvs-cookies arg) |
46002
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
1138 (cvs-move-to-goal-column)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1139 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1140 (defun-cvs-mode cvs-mode-next-line (arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1141 "Go to the next line. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1142 If a prefix argument is given, move by that many lines." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1143 (interactive "p") |
44384
3626a12fe452
* pcvs.el (cvs-mode-previous-line, cvs-mode-next-line): Move to
Kai Großjohann <kgrossjo@eu.uu.net>
parents:
42966
diff
changeset
|
1144 (ewoc-goto-next cvs-cookies arg) |
46002
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
1145 (cvs-move-to-goal-column)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1146 |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
1147 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1148 ;;;; Mark handling |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
1149 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1150 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1151 (defun-cvs-mode cvs-mode-mark (&optional arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1152 "Mark the fileinfo on the current line. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1153 If the fileinfo is a directory, all the contents of that directory are |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1154 marked instead. A directory can never be marked." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1155 (interactive) |
30879
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
1156 (let* ((tin (ewoc-locate cvs-cookies)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1157 (fi (ewoc-data tin))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1158 (if (eq (cvs-fileinfo->type fi) 'DIRCHANGE) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1159 ;; it's a directory: let's mark all files inside |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1160 (ewoc-map |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1161 (lambda (f dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1162 (when (cvs-dir-member-p f dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1163 (setf (cvs-fileinfo->marked f) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1164 (not (if (eq arg 'toggle) (cvs-fileinfo->marked f) arg))) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1165 t)) ;Tell cookie to redisplay this cookie. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1166 cvs-cookies |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1167 (cvs-fileinfo->dir fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1168 ;; not a directory: just do the obvious |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1169 (setf (cvs-fileinfo->marked fi) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1170 (not (if (eq arg 'toggle) (cvs-fileinfo->marked fi) arg))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1171 (ewoc-invalidate cvs-cookies tin) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1172 (cvs-mode-next-line 1)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1173 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1174 (defun cvs-mouse-toggle-mark (e) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1175 "Toggle the mark of the entry under the mouse." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1176 (interactive "e") |
30879
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
1177 (save-excursion |
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
1178 (mouse-set-point e) |
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
1179 (cvs-mode-mark 'toggle))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1180 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1181 (defun-cvs-mode cvs-mode-unmark () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1182 "Unmark the fileinfo on the current line." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1183 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1184 (cvs-mode-mark t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1185 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1186 (defun-cvs-mode cvs-mode-mark-all-files () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1187 "Mark all files." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1188 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1189 (ewoc-map (lambda (cookie) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1190 (unless (eq (cvs-fileinfo->type cookie) 'DIRCHANGE) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1191 (setf (cvs-fileinfo->marked cookie) t))) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1192 cvs-cookies)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1193 |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1194 (defun-cvs-mode (cvs-mode-mark-on-state . SIMPLE) (state) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1195 "Mark all files in state STATE." |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1196 (interactive |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1197 (list |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1198 (let ((default |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1199 (condition-case nil |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1200 (downcase |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1201 (symbol-name |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1202 (cvs-fileinfo->type |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1203 (cvs-mode-marked nil nil :read-only t :one t :noquery t)))) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1204 (error nil)))) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1205 (intern |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1206 (upcase |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1207 (completing-read |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1208 (concat |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1209 "Mark files in state" (if default (concat " [" default "]")) ": ") |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1210 (mapcar (lambda (x) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1211 (list (downcase (symbol-name (car x))))) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1212 cvs-states) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1213 nil t nil nil default)))))) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1214 (ewoc-map (lambda (fi) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1215 (when (eq (cvs-fileinfo->type fi) state) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1216 (setf (cvs-fileinfo->marked fi) t))) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1217 cvs-cookies)) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1218 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1219 (defun-cvs-mode cvs-mode-mark-matching-files (regex) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1220 "Mark all files matching REGEX." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1221 (interactive "sMark files matching: ") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1222 (ewoc-map (lambda (cookie) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1223 (when (and (not (eq (cvs-fileinfo->type cookie) 'DIRCHANGE)) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1224 (string-match regex (cvs-fileinfo->file cookie))) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1225 (setf (cvs-fileinfo->marked cookie) t))) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1226 cvs-cookies)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1227 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1228 (defun-cvs-mode cvs-mode-unmark-all-files () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1229 "Unmark all files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1230 Directories are also unmarked, but that doesn't matter, since |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1231 they should always be unmarked." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1232 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1233 (ewoc-map (lambda (cookie) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1234 (setf (cvs-fileinfo->marked cookie) nil) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1235 t) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1236 cvs-cookies)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1237 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1238 (defun-cvs-mode cvs-mode-unmark-up () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1239 "Unmark the file on the previous line." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1240 (interactive) |
30879
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
1241 (let ((tin (ewoc-goto-prev cvs-cookies 1))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1242 (when tin |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1243 (setf (cvs-fileinfo->marked (ewoc-data tin)) nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1244 (ewoc-invalidate cvs-cookies tin)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1245 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1246 (defconst cvs-ignore-marks-alternatives |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1247 '(("toggle-marks" . "/TM") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1248 ("force-marks" . "/FM") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1249 ("ignore-marks" . "/IM"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1250 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1251 (cvs-prefix-define cvs-ignore-marks-modif |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1252 "Prefix to decide whether to ignore marks or not." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1253 "active" |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1254 (mapcar 'cdr cvs-ignore-marks-alternatives) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1255 (cvs-qtypedesc-create |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1256 (lambda (str) (cdr (assoc str cvs-ignore-marks-alternatives))) |
36615
c3af189df631
(cvs-ignore-marks-modif): Use `rassoc' rather than `member*'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35707
diff
changeset
|
1257 (lambda (obj) (car (rassoc obj cvs-ignore-marks-alternatives))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1258 (lambda () cvs-ignore-marks-alternatives) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1259 nil t)) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
1260 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1261 (defun-cvs-mode cvs-mode-toggle-marks (arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1262 "Toggle whether the next CVS command uses marks. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1263 See `cvs-prefix-set' for further description of the behavior. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1264 \\[universal-argument] 1 selects `force-marks', |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1265 \\[universal-argument] 2 selects `ignore-marks', |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1266 \\[universal-argument] 3 selects `toggle-marks'." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1267 (interactive "P") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1268 (cvs-prefix-set 'cvs-ignore-marks-modif arg)) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
1269 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1270 (defun cvs-ignore-marks-p (cmd &optional read-only) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1271 (let ((default (if (member cmd cvs-invert-ignore-marks) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1272 (not cvs-default-ignore-marks) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1273 cvs-default-ignore-marks)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1274 (modif (cvs-prefix-get 'cvs-ignore-marks-modif read-only))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1275 (cond |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1276 ((equal modif "/IM") t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1277 ((equal modif "/TM") (not default)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1278 ((equal modif "/FM") nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1279 (t default)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1280 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1281 (defun cvs-mode-mark-get-modif (cmd) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1282 (if (cvs-ignore-marks-p cmd 'read-only) "/IM" "/FM")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1283 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1284 (defvar cvs-minor-current-files) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1285 (defun cvs-get-marked (&optional ignore-marks ignore-contents) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1286 "Return a list of all selected fileinfos. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1287 If there are any marked tins, and IGNORE-MARKS is nil, return them. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1288 Otherwise, if the cursor selects a directory, and IGNORE-CONTENTS is |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1289 nil, return all files in it, else return just the directory. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1290 Otherwise return (a list containing) the file the cursor points to, or |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1291 an empty list if it doesn't point to a file at all. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1292 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1293 Args: &optional IGNORE-MARKS IGNORE-CONTENTS." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1294 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1295 (let ((fis nil)) |
30717
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1296 (dolist (fi (if (and (boundp 'cvs-minor-current-files) |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1297 (consp cvs-minor-current-files)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1298 (mapcar |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1299 (lambda (f) |
30717
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1300 (if (cvs-fileinfo-p f) f |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1301 (let ((f (file-relative-name f))) |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1302 (if (file-directory-p f) |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1303 (cvs-create-fileinfo |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1304 'DIRCHANGE (file-name-as-directory f) "." "") |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1305 (let ((dir (file-name-directory f)) |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1306 (file (file-name-nondirectory f))) |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1307 (cvs-create-fileinfo |
e6e5480e5b25
(cvs-menu): Don't move point. Use popup-menu.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30618
diff
changeset
|
1308 'UNKNOWN (or dir "") file "")))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1309 cvs-minor-current-files) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1310 (or (and (not ignore-marks) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1311 (ewoc-collect cvs-cookies 'cvs-fileinfo->marked)) |
30879
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
1312 (list (ewoc-data (ewoc-locate cvs-cookies)))))) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
1313 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1314 (if (or ignore-contents (not (eq (cvs-fileinfo->type fi) 'DIRCHANGE))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1315 (push fi fis) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1316 ;; If a directory is selected, return members, if any. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1317 (setq fis |
34412
da1ec51d3da7
(cvs-mode-marked): Set up the default for CMD manually.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34408
diff
changeset
|
1318 (append (ewoc-collect |
da1ec51d3da7
(cvs-mode-marked): Set up the default for CMD manually.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34408
diff
changeset
|
1319 cvs-cookies 'cvs-dir-member-p (cvs-fileinfo->dir fi)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1320 fis)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1321 (nreverse fis))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1322 |
34412
da1ec51d3da7
(cvs-mode-marked): Set up the default for CMD manually.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34408
diff
changeset
|
1323 (defun* cvs-mode-marked (filter &optional cmd |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1324 &key read-only one file noquery) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1325 "Get the list of marked FIS. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1326 CMD is used to determine whether to use the marks or not. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1327 Only files for which FILTER is applicable are returned. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1328 If READ-ONLY is non-nil, the current toggling is left intact. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1329 If ONE is non-nil, marks are ignored and a single FI is returned. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1330 If FILE is non-nil, directory entries won't be selected." |
34412
da1ec51d3da7
(cvs-mode-marked): Set up the default for CMD manually.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34408
diff
changeset
|
1331 (unless cmd (setq cmd (symbol-name filter))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1332 (let* ((fis (cvs-get-marked (or one (cvs-ignore-marks-p cmd read-only)) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1333 (and (not file) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1334 (cvs-applicable-p 'DIRCHANGE filter)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1335 (force (cvs-prefix-get 'cvs-force-command)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1336 (fis (car (cvs-partition |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1337 (lambda (fi) (cvs-applicable-p fi (and (not force) filter))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1338 fis)))) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1339 (when (and (or (null fis) (and one (cdr fis))) (not noquery)) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1340 (message (if (null fis) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1341 "`%s' is not applicable to any of the selected files." |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1342 "`%s' is only applicable to a single file.") cmd) |
34412
da1ec51d3da7
(cvs-mode-marked): Set up the default for CMD manually.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34408
diff
changeset
|
1343 (sit-for 1) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1344 (setq fis (list (cvs-insert-file |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1345 (read-file-name (format "File to %s: " cmd)))))) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1346 (if one (car fis) fis))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1347 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1348 (defun cvs-enabledp (filter) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1349 "Determine whether FILTER applies to at least one of the selected files." |
33359
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
1350 (ignore-errors (cvs-mode-marked filter nil :read-only t :noquery t))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1351 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1352 (defun cvs-mode-files (&rest -cvs-mode-files-args) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1353 (cvs-mode! |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1354 (lambda () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1355 (mapcar 'cvs-fileinfo->full-path |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1356 (apply 'cvs-mode-marked -cvs-mode-files-args))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1357 |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1358 ;; |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1359 ;; Interface between Log-Edit and PCL-CVS |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1360 ;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1361 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1362 (defun cvs-mode-commit-setup () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1363 "Run `cvs-mode-commit' with setup." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1364 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1365 (cvs-mode-commit 'force)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1366 |
40479
2930fd135efa
(cvs-mode-commit-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39392
diff
changeset
|
1367 (defcustom cvs-mode-commit-hook nil |
2930fd135efa
(cvs-mode-commit-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39392
diff
changeset
|
1368 "Hook run after setting up the commit buffer." |
2930fd135efa
(cvs-mode-commit-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39392
diff
changeset
|
1369 :type 'hook |
2930fd135efa
(cvs-mode-commit-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39392
diff
changeset
|
1370 :options '(cvs-mode-diff)) |
2930fd135efa
(cvs-mode-commit-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39392
diff
changeset
|
1371 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1372 (defun cvs-mode-commit (setup) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1373 "Check in all marked files, or the current file. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1374 The user will be asked for a log message in a buffer. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1375 The buffer's mode and name is determined by the \"message\" setting |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1376 of `cvs-buffer-name-alist'. |
34408
0f95f2e53b1f
Update references to CVS-Edit (now Log-Edit).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34376
diff
changeset
|
1377 The POSTPROC specified there (typically `log-edit') is then called, |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1378 passing it the SETUP argument." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1379 (interactive "P") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1380 ;; It seems that the save-excursion that happens if I use the better |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1381 ;; form of `(cvs-mode! (lambda ...))' screws up a couple things which |
34408
0f95f2e53b1f
Update references to CVS-Edit (now Log-Edit).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34376
diff
changeset
|
1382 ;; end up being rather annoying (like log-edit-mode's message being |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1383 ;; displayed in the wrong minibuffer). |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1384 (cvs-mode!) |
34408
0f95f2e53b1f
Update references to CVS-Edit (now Log-Edit).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34376
diff
changeset
|
1385 (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup)) |
0f95f2e53b1f
Update references to CVS-Edit (now Log-Edit).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34376
diff
changeset
|
1386 (lbd list-buffers-directory) |
30618
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
1387 (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist))) |
34408
0f95f2e53b1f
Update references to CVS-Edit (now Log-Edit).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34376
diff
changeset
|
1388 'log-edit))) |
0f95f2e53b1f
Update references to CVS-Edit (now Log-Edit).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34376
diff
changeset
|
1389 (funcall setupfun 'cvs-do-commit setup 'cvs-commit-filelist buf) |
0f95f2e53b1f
Update references to CVS-Edit (now Log-Edit).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34376
diff
changeset
|
1390 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-commit-minor-wrap) |
40479
2930fd135efa
(cvs-mode-commit-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39392
diff
changeset
|
1391 (set (make-local-variable 'list-buffers-directory) lbd) |
2930fd135efa
(cvs-mode-commit-hook): New hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39392
diff
changeset
|
1392 (run-hooks 'cvs-mode-commit-hook))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1393 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1394 (defun cvs-commit-minor-wrap (buf f) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1395 (let ((cvs-ignore-marks-modif (cvs-mode-mark-get-modif "commit"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1396 (funcall f))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1397 |
33359
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
1398 (defun cvs-commit-filelist () |
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
1399 (cvs-mode-files 'commit nil :read-only t :file t :noquery t)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1400 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1401 (defun cvs-do-commit (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1402 "Do the actual commit, using the current buffer as the log message." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1403 (interactive (list (cvs-flags-query 'cvs-commit-flags "cvs commit flags"))) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
1404 (let ((msg (buffer-substring-no-properties (point-min) (point-max)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1405 (cvs-mode!) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1406 ;;(pop-to-buffer cvs-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1407 (cvs-mode-do "commit" (list* "-m" msg flags) 'commit))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1408 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1409 |
47211
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1410 ;;;; Editing existing commit log messages. |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1411 |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1412 (defun cvs-edit-log-text-at-point () |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1413 (save-excursion |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1414 (end-of-line) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1415 (when (re-search-backward "^revision " nil t) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1416 (forward-line 1) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1417 (if (looking-at "date:") (forward-line 1)) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1418 (if (looking-at "branches:") (forward-line 1)) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1419 (buffer-substring |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1420 (point) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1421 (if (re-search-forward |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1422 "^\\(-\\{28\\}\\|=\\{77\\}\\|revision [.0-9]+\\)$" |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1423 nil t) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1424 (match-beginning 0) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1425 (point)))))) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1426 |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1427 (defun cvs-mode-edit-log (rev &optional text) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1428 "Edit the log message at point. |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1429 This is best called from a `log-view-mode' buffer." |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1430 (interactive |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1431 (list |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1432 (or (cvs-mode! (lambda () (cvs-prefix-get 'cvs-branch-prefix))) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1433 (read-string "Revision to edit: ")) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1434 (cvs-edit-log-text-at-point))) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1435 ;; It seems that the save-excursion that happens if I use the better |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1436 ;; form of `(cvs-mode! (lambda ...))' screws up a couple things which |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1437 ;; end up being rather annoying (like log-edit-mode's message being |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1438 ;; displayed in the wrong minibuffer). |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1439 (cvs-mode!) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1440 (let ((buf (cvs-temp-buffer "message" 'normal 'nosetup)) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1441 (lbd list-buffers-directory) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1442 (setupfun (or (nth 2 (cdr (assoc "message" cvs-buffer-name-alist))) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1443 'log-edit))) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1444 (funcall setupfun 'cvs-do-edit-log nil 'cvs-edit-log-filelist buf) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1445 (when text (erase-buffer) (insert text)) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1446 (set (make-local-variable 'cvs-edit-log-revision) rev) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1447 (set (make-local-variable 'cvs-minor-wrap-function) 'cvs-edit-log-minor-wrap) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1448 (set (make-local-variable 'list-buffers-directory) lbd) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1449 ;; (run-hooks 'cvs-mode-commit-hook) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1450 )) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1451 |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1452 (defun cvs-edit-log-minor-wrap (buf f) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1453 (let ((cvs-ignore-marks-modif (cvs-mode-mark-get-modif "commit"))) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1454 (funcall f))) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1455 |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1456 (defun cvs-edit-log-filelist () |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1457 (cvs-mode-files nil nil :read-only t :file t :noquery t)) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1458 |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1459 (defun cvs-do-edit-log (rev) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1460 "Do the actual commit, using the current buffer as the log message." |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1461 (interactive (list cvs-edit-log-revision)) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1462 (let ((msg (buffer-substring-no-properties (point-min) (point-max)))) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1463 (cvs-mode!) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1464 (cvs-mode-do "admin" (list (concat "-m" rev ":" msg)) nil))) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1465 |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1466 |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
1467 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1468 ;;;; CVS Mode commands |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
1469 ;;;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1470 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1471 (defun-cvs-mode (cvs-mode-insert . NOARGS) (file) |
45325
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
1472 "Insert an entry for a specific file into the current listing. |
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
1473 This is typically used if the file is up-to-date (or has been added |
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
1474 outside of PCL-CVS) and one wants to do some operation on it." |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1475 (interactive |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1476 (list (read-file-name |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1477 "File to insert: " |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1478 ;; Can't use ignore-errors here because interactive |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1479 ;; specs aren't byte-compiled. |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1480 (condition-case nil |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1481 (file-name-as-directory |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1482 (expand-file-name |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1483 (cvs-fileinfo->dir |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1484 (cvs-mode-marked nil nil :read-only t :one t :noquery t)))) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1485 (error nil))))) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1486 (cvs-insert-file file)) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1487 |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1488 (defun cvs-insert-file (file) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1489 "Insert FILE (and its contents if it's a dir) and return its FI." |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1490 (let ((file (file-relative-name (directory-file-name file))) last) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1491 (dolist (fi (cvs-fileinfo-from-entries file)) |
32488
1fd2c9a94ec3
* pcvs.el (cvs-make-cvs-buffer, cvs-run-process):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32309
diff
changeset
|
1492 (setq last (cvs-addto-collection cvs-cookies fi last))) |
1fd2c9a94ec3
* pcvs.el (cvs-make-cvs-buffer, cvs-run-process):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32309
diff
changeset
|
1493 ;; There should have been at least one entry. |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1494 (goto-char (ewoc-location last)) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1495 (ewoc-data last))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1496 |
35707
1285b34a630d
(cvs-mark-fis-dead): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35623
diff
changeset
|
1497 (defun cvs-mark-fis-dead (fis) |
1285b34a630d
(cvs-mark-fis-dead): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35623
diff
changeset
|
1498 ;; Helper function, introduced because of the need for macro-expansion. |
1285b34a630d
(cvs-mark-fis-dead): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35623
diff
changeset
|
1499 (dolist (fi fis) |
1285b34a630d
(cvs-mark-fis-dead): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35623
diff
changeset
|
1500 (setf (cvs-fileinfo->type fi) 'DEAD))) |
1285b34a630d
(cvs-mark-fis-dead): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35623
diff
changeset
|
1501 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1502 (defun-cvs-mode (cvs-mode-add . SIMPLE) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1503 "Add marked files to the cvs repository. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1504 With prefix argument, prompt for cvs flags." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1505 (interactive (list (cvs-flags-query 'cvs-add-flags "cvs add flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1506 (let ((fis (cvs-mode-marked 'add)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1507 (needdesc nil) (dirs nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1508 ;; find directories and look for fis needing a description |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1509 (dolist (fi fis) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1510 (cond |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1511 ((file-directory-p (cvs-fileinfo->full-path fi)) (push fi dirs)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1512 ((eq (cvs-fileinfo->type fi) 'UNKNOWN) (setq needdesc t)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1513 ;; prompt for description if necessary |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1514 (let* ((msg (if (and needdesc |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1515 (or current-prefix-arg (not cvs-add-default-message))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1516 (read-from-minibuffer "Enter description: ") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1517 (or cvs-add-default-message ""))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1518 (flags (list* "-m" msg flags)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1519 (postproc |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1520 ;; setup postprocessing for the directory entries |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1521 (when dirs |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1522 `((cvs-run-process (list "-n" "update") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1523 ',dirs |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1524 '(cvs-parse-process t)) |
35707
1285b34a630d
(cvs-mark-fis-dead): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
35623
diff
changeset
|
1525 (cvs-mark-fis-dead ',dirs))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1526 (cvs-mode-run "add" flags fis :postproc postproc)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1527 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1528 (defun-cvs-mode (cvs-mode-diff . DOUBLE) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1529 "Diff the selected files against the repository. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1530 This command compares the files in your working area against the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1531 revision which they are based upon." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1532 (interactive |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1533 (list (cvs-add-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1534 (cvs-add-secondary-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1535 (cvs-flags-query 'cvs-diff-flags "cvs diff flags"))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1536 (cvs-mode-do "diff" flags 'diff |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1537 :show t)) ;; :ignore-exit t |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1538 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1539 (defun-cvs-mode (cvs-mode-diff-head . SIMPLE) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1540 "Diff the selected files against the head of the current branch. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1541 See ``cvs-mode-diff'' for more info." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1542 (interactive (list (cvs-flags-query 'cvs-diff-flags "cvs diff flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1543 (cvs-mode-diff-1 (cons "-rHEAD" flags))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1544 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1545 (defun-cvs-mode (cvs-mode-diff-vendor . SIMPLE) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1546 "Diff the selected files against the head of the vendor branch. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1547 See ``cvs-mode-diff'' for more info." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1548 (interactive (list (cvs-flags-query 'cvs-diff-flags "cvs diff flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1549 (cvs-mode-diff-1 (cons (concat "-r" cvs-vendor-branch) flags))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1550 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1551 ;; sadly, this is not provided by cvs, so we have to roll our own |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1552 (defun-cvs-mode (cvs-mode-diff-backup . SIMPLE) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1553 "Diff the files against the backup file. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1554 This command can be used on files that are marked with \"Merged\" |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1555 or \"Conflict\" in the *cvs* buffer." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1556 (interactive (list (cvs-flags-query 'cvs-diff-flags "diff flags"))) |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37339
diff
changeset
|
1557 (unless (listp flags) (error "flags should be a list of strings")) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1558 (save-some-buffers) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1559 (let* ((filter 'diff) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1560 (marked (cvs-get-marked (cvs-ignore-marks-p "diff"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1561 ;;(tins (cvs-filter-applicable filter marked)) |
33359
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
1562 (fis (car (cvs-partition 'cvs-fileinfo->backup-file marked)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1563 (unless (consp fis) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1564 (error "No files with a backup file selected!")) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1565 ;; let's extract some info into the environment for `buffer-name' |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1566 (let* ((dir (cvs-fileinfo->dir (car fis))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1567 (file (cvs-fileinfo->file (car fis)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1568 (set-buffer (cvs-temp-buffer "diff"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1569 (message "cvs diff backup...") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1570 (cvs-execute-single-file-list fis 'cvs-diff-backup-extractor |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1571 cvs-diff-program flags)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1572 (message "cvs diff backup... Done.")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1573 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1574 (defun cvs-diff-backup-extractor (fileinfo) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1575 "Return the filename and the name of the backup file as a list. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1576 Signal an error if there is no backup file." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1577 (let ((backup-file (cvs-fileinfo->backup-file fileinfo))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1578 (unless backup-file |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37339
diff
changeset
|
1579 (error "%s has no backup file" (cvs-fileinfo->full-path fileinfo))) |
34653
433f1bff06f5
(cvs-diff-backup-extractor): Return full-path for file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34412
diff
changeset
|
1580 (list backup-file (cvs-fileinfo->full-path fileinfo)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1581 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1582 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1583 ;; Emerge support |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1584 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1585 (defun cvs-emerge-diff (b1 b2) (emerge-buffers b1 b2 b1)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1586 (defun cvs-emerge-merge (b1 b2 base out) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1587 (emerge-buffers-with-ancestor b1 b2 base (find-file-noselect out))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1588 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1589 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1590 ;; Ediff support |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
1591 ;; |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1592 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1593 (defvar ediff-after-quit-destination-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1594 (defvar cvs-transient-buffers) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1595 (defun cvs-ediff-startup-hook () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1596 (add-hook 'ediff-after-quit-hook-internal |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1597 `(lambda () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1598 (cvs-ediff-exit-hook |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1599 ',ediff-after-quit-destination-buffer ',cvs-transient-buffers)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1600 nil 'local)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1601 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1602 (defun cvs-ediff-exit-hook (cvs-buf tmp-bufs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1603 ;; kill the temp buffers (and their associated windows) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1604 (dolist (tb tmp-bufs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1605 (when (and tb (buffer-live-p tb) (not (buffer-modified-p tb))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1606 (let ((win (get-buffer-window tb t))) |
31977
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
1607 (kill-buffer tb) |
32187
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1608 (when (window-live-p win) (ignore-errors (delete-window win)))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1609 ;; switch back to the *cvs* buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1610 (when (and cvs-buf (buffer-live-p cvs-buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1611 (not (get-buffer-window cvs-buf t))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1612 (ignore-errors (switch-to-buffer cvs-buf)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1613 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1614 (defun cvs-ediff-diff (b1 b2) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1615 (let ((ediff-after-quit-destination-buffer (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1616 (startup-hook '(cvs-ediff-startup-hook))) |
31977
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
1617 (ediff-buffers b1 b2 startup-hook 'ediff-revision))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1618 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1619 (defun cvs-ediff-merge (b1 b2 base out) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1620 (let ((ediff-after-quit-destination-buffer (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1621 (startup-hook '(cvs-ediff-startup-hook))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1622 (ediff-merge-buffers-with-ancestor |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1623 b1 b2 base startup-hook |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1624 'ediff-merge-revisions-with-ancestor |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1625 out))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1626 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1627 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1628 ;; Interactive merge/diff support. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1629 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1630 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1631 (defun cvs-retrieve-revision (fileinfo rev) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1632 "Retrieve the given REVision of the file in FILEINFO into a new buffer." |
32187
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1633 (let* ((file (cvs-fileinfo->full-path fileinfo)) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1634 (buffile (concat file "." rev))) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1635 (or (find-buffer-visiting buffile) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1636 (with-current-buffer (create-file-buffer buffile) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1637 (message "Retrieving revision %s..." rev) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1638 (let ((res (call-process cvs-program nil t nil |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1639 "-q" "update" "-p" "-r" rev file))) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1640 (when (and res (not (and (equal 0 res)))) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1641 (error "Something went wrong retrieving revision %s: %s" rev res)) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1642 (set-buffer-modified-p nil) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1643 (let ((buffer-file-name (expand-file-name file))) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1644 (after-find-file)) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1645 (toggle-read-only 1) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1646 (message "Retrieving revision %s... Done" rev) |
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
1647 (current-buffer)))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1648 |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1649 (eval-and-compile (autoload 'smerge-ediff "smerge-mode")) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1650 |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1651 ;; FIXME: The user should be able to specify ancestor/head/backup and we should |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1652 ;; provide sensible defaults when merge info is unavailable (rather than rely |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1653 ;; on smerge-ediff). Also provide sane defaults for need-merge files. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1654 (defun-cvs-mode cvs-mode-imerge () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1655 "Merge interactively appropriate revisions of the selected file." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1656 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1657 (let ((fi (cvs-mode-marked 'merge nil :one t :file t))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1658 (let ((merge (cvs-fileinfo->merge fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1659 (file (cvs-fileinfo->full-path fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1660 (backup-file (cvs-fileinfo->backup-file fi))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1661 (if (not (and merge backup-file)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1662 (let ((buf (find-file-noselect file))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1663 (message "Missing merge info or backup file, using VC.") |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1664 (with-current-buffer buf |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1665 (smerge-ediff))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1666 (let* ((ancestor-buf (cvs-retrieve-revision fi (car merge))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1667 (head-buf (cvs-retrieve-revision fi (cdr merge))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1668 (backup-buf (let ((auto-mode-alist nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1669 (find-file-noselect backup-file))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1670 ;; this binding is used by cvs-ediff-startup-hook |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1671 (cvs-transient-buffers (list ancestor-buf backup-buf head-buf))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1672 (with-current-buffer backup-buf |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1673 (let ((buffer-file-name (expand-file-name file))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1674 (after-find-file))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1675 (funcall (cdr cvs-idiff-imerge-handlers) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1676 backup-buf head-buf ancestor-buf file)))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1677 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1678 (cvs-flags-define cvs-idiff-version |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1679 (list "BASE" cvs-vendor-branch cvs-vendor-branch "BASE" "BASE") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1680 "version: " cvs-qtypedesc-tag) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1681 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1682 (defun-cvs-mode (cvs-mode-idiff . NOARGS) (&optional rev1 rev2) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1683 "Diff interactively current file to revisions." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1684 (interactive |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1685 (let* ((rev1 (cvs-prefix-get 'cvs-branch-prefix)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1686 (rev2 (and rev1 (cvs-prefix-get 'cvs-secondary-branch-prefix)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1687 (list (or rev1 (cvs-flags-query 'cvs-idiff-version)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1688 rev2))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1689 (let ((fi (cvs-mode-marked 'diff "idiff" :one t :file t))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1690 (let* ((file (cvs-fileinfo->full-path fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1691 (rev1-buf (cvs-retrieve-revision fi (or rev1 "BASE"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1692 (rev2-buf (if rev2 (cvs-retrieve-revision fi rev2))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1693 ;; this binding is used by cvs-ediff-startup-hook |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1694 (cvs-transient-buffers (list rev1-buf rev2-buf))) |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1695 (funcall (car cvs-idiff-imerge-handlers) |
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1696 rev1-buf (or rev2-buf (find-file-noselect file)))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1697 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1698 (defun-cvs-mode (cvs-mode-idiff-other . NOARGS) () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1699 "Diff interactively current file to revisions." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1700 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1701 (let* ((rev1 (cvs-prefix-get 'cvs-branch-prefix)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1702 (rev2 (and rev1 (cvs-prefix-get 'cvs-secondary-branch-prefix))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1703 (fis (cvs-mode-marked 'diff "idiff" :file t))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1704 (when (> (length fis) 2) |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37339
diff
changeset
|
1705 (error "idiff-other cannot be applied to more than 2 files at a time")) |
30879
3a1ff1caafe2
* emacs-lisp/ewoc.el (ewoc-locate): Default POS to (point).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30717
diff
changeset
|
1706 (let* ((fi1 (car fis)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1707 (rev1-buf (if rev1 (cvs-retrieve-revision fi1 rev1) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1708 (find-file-noselect (cvs-fileinfo->full-path fi1)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1709 rev2-buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1710 (if (cdr fis) |
30618
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
1711 (let ((fi2 (nth 1 fis))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1712 (setq rev2-buf |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1713 (if rev2 (cvs-retrieve-revision fi2 rev2) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1714 (find-file-noselect (cvs-fileinfo->full-path fi2))))) |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37339
diff
changeset
|
1715 (error "idiff-other doesn't know what other file/buffer to use")) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1716 (let* (;; this binding is used by cvs-ediff-startup-hook |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1717 (cvs-transient-buffers (list rev1-buf rev2-buf))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1718 (funcall (car cvs-idiff-imerge-handlers) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1719 rev1-buf rev2-buf))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1720 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1721 |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1722 (defun cvs-is-within-p (fis dir) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1723 "Non-nil is buffer is inside one of FIS (in DIR)." |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1724 (when (stringp buffer-file-name) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1725 (setq buffer-file-name (expand-file-name buffer-file-name)) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1726 (let (ret) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1727 (dolist (fi (or fis (list (cvs-create-fileinfo 'DIRCHANGE "" "." "")))) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1728 (when (cvs-string-prefix-p |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1729 (expand-file-name (cvs-fileinfo->full-path fi) dir) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1730 buffer-file-name) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1731 (setq ret t))) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1732 ret))) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1733 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1734 (defun* cvs-mode-run (cmd flags fis |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1735 &key (buf (cvs-temp-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1736 dont-change-disc cvsargs postproc) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1737 "Generic cvs-mode-<foo> function. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1738 Executes `cvs CVSARGS CMD FLAGS FIS'. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1739 BUF is the buffer to be used for cvs' output. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1740 DONT-CHANGE-DISC non-nil indicates that the command will not change the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1741 contents of files. This is only used by the parser. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1742 POSTPROC is a list of expressions to be evaluated at the very end (after |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1743 parsing if applicable). It will be prepended with `progn' is necessary." |
28256
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1744 (let ((def-dir default-directory)) |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1745 ;; Save the relevant buffers |
06cfa273543d
* pcvs.el: Add a minimal leading commentary.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28088
diff
changeset
|
1746 (save-some-buffers nil (lambda () (cvs-is-within-p fis def-dir)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1747 (unless (listp flags) (error "flags should be a list of strings")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1748 (let* ((cvs-buf (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1749 (single-dir (or (not (listp cvs-execute-single-dir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1750 (member cmd cvs-execute-single-dir))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1751 (parse (member cmd cvs-parse-known-commands)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1752 (args (append cvsargs (list cmd) flags)) |
30618
9dd1a6504bdd
Use `nth' instead of `first', `second', and `third'.
Gerd Moellmann <gerd@gnu.org>
parents:
30612
diff
changeset
|
1753 (after-mode (nth 2 (cdr (assoc cmd cvs-buffer-name-alist))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1754 (cvs-cleanup-collection cvs-cookies ;cleanup remaining messages |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1755 (eq cvs-auto-remove-handled 'delayed) nil t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1756 (when (fboundp after-mode) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1757 (setq postproc (append postproc `((,after-mode))))) |
45999
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
1758 (when parse |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
1759 (let ((old-fis |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
1760 (when (member cmd '("status" "update")) ;FIXME: Yuck!! |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
1761 ;; absence of `cvs update' output has a specific meaning. |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
1762 (or fis (list (cvs-create-fileinfo 'DIRCHANGE "" "." "")))))) |
6efc3066895b
(cvs-fileinfo-kill): Remove.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45904
diff
changeset
|
1763 (push `(cvs-parse-process ',dont-change-disc nil ',old-fis) postproc))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1764 (setq postproc (if (cdr postproc) (cons 'progn postproc) (car postproc))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1765 (cvs-update-header args fis) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1766 (with-current-buffer buf |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1767 ;;(set (make-local-variable 'cvs-buffer) cvs-buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1768 (let ((inhibit-read-only t)) (erase-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1769 (message "Running cvs %s ..." cmd) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1770 (cvs-run-process args fis postproc single-dir)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1771 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1772 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1773 (defun* cvs-mode-do (cmd flags filter |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1774 &key show dont-change-disc parse cvsargs postproc) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1775 "Generic cvs-mode-<foo> function. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1776 Executes `cvs CVSARGS CMD FLAGS' on the selected files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1777 FILTER is passed to `cvs-applicable-p' to only apply the command to |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1778 files for which it makes sense. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1779 SHOW indicates that CMD should be not be run in the default temp buffer and |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1780 should be shown to the user. The buffer and mode to be used is determined |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1781 by `cvs-buffer-name-alist'. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1782 DONT-CHANGE-DISC non-nil indicates that the command will not change the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1783 contents of files. This is only used by the parser." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1784 (cvs-mode-run cmd flags (cvs-mode-marked filter cmd) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1785 :buf (cvs-temp-buffer (when show cmd)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1786 :dont-change-disc dont-change-disc |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1787 :cvsargs cvsargs |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1788 :postproc postproc)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1789 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1790 (defun-cvs-mode (cvs-mode-status . SIMPLE) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1791 "Show cvs status for all marked files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1792 With prefix argument, prompt for cvs flags." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1793 (interactive (list (cvs-flags-query 'cvs-status-flags "cvs status flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1794 (cvs-mode-do "status" flags nil :dont-change-disc t :show t |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1795 :postproc (when (eq cvs-auto-remove-handled 'status) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1796 '((with-current-buffer ,(current-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1797 (cvs-mode-remove-handled)))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1798 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1799 (defun-cvs-mode (cvs-mode-tree . SIMPLE) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1800 "Call cvstree using the file under the point as a keyfile." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1801 (interactive (list (cvs-flags-query 'cvs-status-flags "cvs status flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1802 (cvs-mode-run "status" (cons "-v" flags) (cvs-mode-marked nil "status") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1803 :buf (cvs-temp-buffer "tree") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1804 :dont-change-disc t |
33234
39c359a5c419
(cvs-mode-marked): New arg `noquery'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33195
diff
changeset
|
1805 :postproc '((cvs-status-cvstrees)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1806 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1807 ;; cvs log |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1808 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1809 (defun-cvs-mode (cvs-mode-log . NOARGS) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1810 "Display the cvs log of all selected files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1811 With prefix argument, prompt for cvs flags." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1812 (interactive (list (cvs-add-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1813 (cvs-flags-query 'cvs-log-flags "cvs log flags")))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1814 (cvs-mode-do "log" flags nil :show t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1815 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1816 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1817 (defun-cvs-mode (cvs-mode-update . NOARGS) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1818 "Update all marked files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1819 With a prefix argument, prompt for cvs flags." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1820 (interactive |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1821 (list (cvs-add-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1822 (cvs-add-secondary-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1823 (cvs-flags-query 'cvs-update-flags "cvs update flags") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1824 "-j") "-j"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1825 (cvs-mode-do "update" flags 'update)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1826 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1827 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1828 (defun-cvs-mode (cvs-mode-examine . NOARGS) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1829 "Re-examine all marked files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1830 With a prefix argument, prompt for cvs flags." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1831 (interactive |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1832 (list (cvs-add-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1833 (cvs-add-secondary-branch-prefix |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1834 (cvs-flags-query 'cvs-update-flags "cvs -n update flags") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1835 "-j") "-j"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1836 (cvs-mode-do "update" flags nil :cvsargs '("-n") :dont-change-disc t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1837 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1838 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1839 (defun-cvs-mode cvs-mode-ignore (&optional pattern) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1840 "Arrange so that CVS ignores the selected files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1841 This command ignores files that are not flagged as `Unknown'." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1842 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1843 (dolist (fi (cvs-mode-marked 'ignore)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1844 (cvs-append-to-ignore (cvs-fileinfo->dir fi) (cvs-fileinfo->file fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1845 (setf (cvs-fileinfo->type fi) 'DEAD)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1846 (cvs-cleanup-collection cvs-cookies nil nil nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1847 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1848 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1849 (defun cvs-append-to-ignore (dir str) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1850 "Add STR to the .cvsignore file in DIR." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1851 (save-window-excursion |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1852 (set-buffer (find-file-noselect (expand-file-name ".cvsignore" dir))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1853 (when (ignore-errors |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1854 (and buffer-read-only |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1855 (eq 'CVS (vc-backend buffer-file-name)) |
32309
bb96b2ece52b
(cvs-append-to-ignore, cvs-vc-command-advice)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32187
diff
changeset
|
1856 (not (vc-editable-p buffer-file-name)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1857 ;; CVSREAD=on special case |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1858 (vc-toggle-read-only)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1859 (goto-char (point-max)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1860 (unless (zerop (current-column)) (insert "\n")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1861 (insert str "\n") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1862 (if cvs-sort-ignore-file (sort-lines nil (point-min) (point-max))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1863 (save-buffer))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1864 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1865 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1866 (defun cvs-mode-find-file-other-window (e) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1867 "Select a buffer containing the file in another window." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1868 (interactive (list last-input-event)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1869 (cvs-mode-find-file e t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1870 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1871 |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1872 (defun cvs-mode-display-file (e) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1873 "Show a buffer containing the file in another window." |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1874 (interactive (list last-input-event)) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1875 (cvs-mode-find-file e 'dont-select)) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1876 |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1877 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1878 (defun cvs-find-modif (fi) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1879 (with-temp-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1880 (call-process cvs-program nil (current-buffer) nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1881 "-f" "diff" (cvs-fileinfo->file fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1882 (goto-char (point-min)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1883 (if (re-search-forward "^\\([0-9]+\\)" nil t) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1884 (string-to-number (match-string 1)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1885 1))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1886 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1887 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1888 (defun cvs-mode-find-file (e &optional other) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1889 "Select a buffer containing the file. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1890 With a prefix, opens the buffer in an OTHER window." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1891 (interactive (list last-input-event current-prefix-arg)) |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1892 (when (ignore-errors (mouse-set-point e) t) ;for invocation via the mouse |
47729
8dcdf2a8c1f8
(cvs-mode-find-file): Look up font-lock-face so it also
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47470
diff
changeset
|
1893 (unless (memq (get-text-property (1- (line-end-position)) 'font-lock-face) |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1894 '(cvs-header-face cvs-filename-face)) |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
1895 (error "Not a file name"))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1896 (cvs-mode! |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1897 (lambda (&optional rev) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1898 (interactive (list (cvs-prefix-get 'cvs-branch-prefix))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1899 (let* ((cvs-buf (current-buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1900 (fi (cvs-mode-marked nil nil :one t))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1901 (if (eq (cvs-fileinfo->type fi) 'DIRCHANGE) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1902 (let ((odir default-directory)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1903 (setq default-directory |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1904 (cvs-expand-dir-name (cvs-fileinfo->dir fi))) |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1905 (cond ((eq other 'dont-select) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1906 (display-buffer (find-file-noselect default-directory))) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1907 (other (dired-other-window default-directory)) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1908 (t (dired default-directory))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1909 (set-buffer cvs-buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1910 (setq default-directory odir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1911 (let ((buf (if rev (cvs-retrieve-revision fi rev) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1912 (find-file-noselect (cvs-fileinfo->full-path fi))))) |
37339
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1913 (funcall (cond ((eq other 'dont-select) 'display-buffer) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1914 (other 'switch-to-buffer-other-window) |
31271d7f21c9
(cvs-addto-collection): Don't merge MESSAGE fileinfos.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36615
diff
changeset
|
1915 (t 'switch-to-buffer)) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1916 buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1917 (when (and cvs-find-file-and-jump (cvs-applicable-p fi 'diff-base)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1918 (goto-line (cvs-find-modif fi))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1919 buf)))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1920 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1921 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1922 (defun-cvs-mode (cvs-mode-undo . SIMPLE) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1923 "Undo local changes to all marked files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1924 The file is removed and `cvs update FILE' is run." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1925 ;;"With prefix argument, prompt for cvs FLAGS." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1926 (interactive (list nil));; (cvs-flags-query 'cvs-undo-flags "undo flags") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1927 (if current-prefix-arg (call-interactively 'cvs-mode-revert-to-rev) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1928 (let* ((fis (cvs-do-removal 'undo "update" 'all)) |
47211
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1929 (removedp (lambda (fi) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1930 (or (eq (cvs-fileinfo->type fi) 'REMOVED) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1931 (and (eq (cvs-fileinfo->type fi) 'CONFLICT) |
3a7c7e0c12f7
(cvs-run-process): Use a pty rather than a pipe to work
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
46002
diff
changeset
|
1932 (eq (cvs-fileinfo->subtype fi) 'REMOVED))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1933 (fis-split (cvs-partition removedp fis)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1934 (fis-removed (car fis-split)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1935 (fis-other (cdr fis-split))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1936 (if (null fis-other) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1937 (when fis-removed (cvs-mode-run "add" nil fis-removed)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1938 (cvs-mode-run "update" flags fis-other |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1939 :postproc |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1940 (when fis-removed |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1941 `((with-current-buffer ,(current-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1942 (cvs-mode-run "add" nil ',fis-removed))))))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1943 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1944 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1945 (defun-cvs-mode (cvs-mode-revert-to-rev . NOARGS) (rev) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1946 "Revert the selected files to an old revision." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1947 (interactive |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1948 (list (or (cvs-prefix-get 'cvs-branch-prefix) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1949 (let ((current-prefix-arg '(4))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1950 (cvs-flags-query 'cvs-idiff-version))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1951 (let* ((fis (cvs-mode-marked 'revert "revert" :file t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1952 (tag (concat "tmp_pcl_tag_" (make-temp-name ""))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1953 (untag `((with-current-buffer ,(current-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1954 (cvs-mode-run "tag" (list "-d" ',tag) ',fis)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1955 (update `((with-current-buffer ,(current-buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1956 (cvs-mode-run "update" (list "-j" ',tag "-j" ',rev) ',fis |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1957 :postproc ',untag))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1958 (cvs-mode-run "tag" (list tag) fis :postproc update))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1959 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1960 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1961 (defun-cvs-mode cvs-mode-delete-lock () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1962 "Delete the lock file that CVS is waiting for. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1963 Note that this can be dangerous. You should only do this |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1964 if you are convinced that the process that created the lock is dead." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1965 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1966 (let* ((default-directory (cvs-expand-dir-name cvs-lock-file)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1967 (locks (directory-files default-directory nil cvs-lock-file-regexp))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1968 (cond |
38422
7a94f1c588c4
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
37339
diff
changeset
|
1969 ((not locks) (error "No lock files found")) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1970 ((yes-or-no-p (concat "Really delete locks in " cvs-lock-file "? ")) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1971 (dolist (lock locks) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1972 (cond ((file-directory-p lock) (delete-directory lock)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1973 ((file-exists-p lock) (delete-file lock)))))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1974 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1975 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1976 (defun-cvs-mode cvs-mode-remove-handled () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1977 "Remove all lines that are handled. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1978 Empty directories are removed." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1979 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1980 (cvs-cleanup-collection cvs-cookies |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1981 t (or cvs-auto-remove-directories 'handled) t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1982 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1983 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1984 (defun-cvs-mode cvs-mode-acknowledge () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1985 "Remove all marked files from the buffer." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1986 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1987 (dolist (fi (cvs-get-marked (cvs-ignore-marks-p "acknowledge") t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1988 (setf (cvs-fileinfo->type fi) 'DEAD)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1989 (cvs-cleanup-collection cvs-cookies nil nil nil)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1990 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1991 (defun cvs-do-removal (filter &optional cmd all) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1992 "Remove files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1993 Returns a list of FIS that should be `cvs remove'd." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1994 (let* ((files (cvs-mode-marked filter cmd :file t :read-only t)) |
33359
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
1995 (fis (cdr (cvs-partition (lambda (fi) |
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
1996 (eq (cvs-fileinfo->type fi) 'UNKNOWN)) |
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
1997 (cvs-mode-marked filter cmd)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1998 (silent (or (not cvs-confirm-removals) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1999 (cvs-every (lambda (fi) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2000 (or (not (file-exists-p |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2001 (cvs-fileinfo->full-path fi))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2002 (cvs-applicable-p fi 'safe-rm))) |
33359
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
2003 files))) |
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
2004 (tmpbuf (cvs-temp-buffer))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2005 (when (and (not silent) (equal cvs-confirm-removals 'list)) |
33359
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
2006 (with-current-buffer tmpbuf |
47470
344fed0ec431
(cvs-do-removal): Bind inhibit-read-only while modifying the buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47468
diff
changeset
|
2007 (let ((inhibit-read-only t)) |
344fed0ec431
(cvs-do-removal): Bind inhibit-read-only while modifying the buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47468
diff
changeset
|
2008 (cvs-insert-strings (mapcar 'cvs-fileinfo->full-path fis)) |
344fed0ec431
(cvs-do-removal): Bind inhibit-read-only while modifying the buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47468
diff
changeset
|
2009 (cvs-pop-to-buffer-same-frame (current-buffer)) |
344fed0ec431
(cvs-do-removal): Bind inhibit-read-only while modifying the buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
47468
diff
changeset
|
2010 (shrink-window-if-larger-than-buffer)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2011 (if (not (or silent |
33359
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
2012 (unwind-protect |
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
2013 (yes-or-no-p (format "Delete %d files? " (length files))) |
5ef2137ce754
(cvs-enabledp): Ignore errors.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
33339
diff
changeset
|
2014 (cvs-bury-buffer tmpbuf cvs-buffer)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2015 (progn (message "Aborting") nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2016 (dolist (fi files) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2017 (let* ((type (cvs-fileinfo->type fi)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2018 (file (cvs-fileinfo->full-path fi))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2019 (when (or all (eq type 'UNKNOWN)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2020 (when (file-exists-p file) (delete-file file)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2021 (unless all (setf (cvs-fileinfo->type fi) 'DEAD) t)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2022 fis))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2023 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2024 (defun-cvs-mode (cvs-mode-remove . SIMPLE) (flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2025 "Remove all marked files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2026 With prefix argument, prompt for cvs flags." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2027 (interactive (list (cvs-flags-query 'cvs-remove-flags "cvs remove flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2028 (let ((fis (cvs-do-removal 'remove))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2029 (if fis (cvs-mode-run "remove" (cons "-f" flags) fis) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2030 (cvs-cleanup-collection cvs-cookies nil nil nil)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2031 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2032 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2033 (defvar cvs-tag-name "") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2034 (defun-cvs-mode (cvs-mode-tag . SIMPLE) (tag &optional flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2035 "Run `cvs tag TAG' on all selected files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2036 With prefix argument, prompt for cvs flags." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2037 (interactive |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2038 (list (setq cvs-tag-name |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2039 (cvs-query-read cvs-tag-name "Tag name: " cvs-qtypedesc-tag)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2040 (cvs-flags-query 'cvs-tag-flags "tag flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2041 (cvs-mode-do "tag" (append flags (list tag)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2042 (when cvs-force-dir-tag 'tag))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2043 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2044 (defun-cvs-mode (cvs-mode-untag . SIMPLE) (tag &optional flags) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2045 "Run `cvs tag -d TAG' on all selected files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2046 With prefix argument, prompt for cvs flags." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2047 (interactive |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2048 (list (setq cvs-tag-name |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2049 (cvs-query-read cvs-tag-name "Tag to delete: " cvs-qtypedesc-tag)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2050 (cvs-flags-query 'cvs-tag-flags "tag flags"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2051 (cvs-mode-do "tag" (append '("-d") flags (list tag)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2052 (when cvs-force-dir-tag 'tag))) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
2053 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2054 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2055 ;; Byte compile files. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2056 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2057 (defun-cvs-mode cvs-mode-byte-compile-files () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2058 "Run byte-compile-file on all selected files that end in '.el'." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2059 (interactive) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2060 (let ((marked (cvs-get-marked (cvs-ignore-marks-p "byte-compile")))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2061 (dolist (fi marked) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2062 (let ((filename (cvs-fileinfo->full-path fi))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2063 (when (string-match "\\.el\\'" filename) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2064 (byte-compile-file filename)))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2065 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2066 ;; ChangeLog support. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2067 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2068 (defun-cvs-mode cvs-mode-add-change-log-entry-other-window () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2069 "Add a ChangeLog entry in the ChangeLog of the current directory." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2070 (interactive) |
45325
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
2071 (dolist (fi (cvs-mode-marked nil nil)) |
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
2072 (let ((default-directory (cvs-expand-dir-name (cvs-fileinfo->dir fi))) |
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
2073 (buffer-file-name (expand-file-name (cvs-fileinfo->file fi)))) |
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
2074 (kill-local-variable 'change-log-default-name) |
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
2075 (save-excursion (add-change-log-entry-other-window))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2076 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2077 ;; interactive commands to set optional flags |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2078 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2079 (defun cvs-mode-set-flags (flag) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2080 "Ask for new setting of cvs-FLAG-flags." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2081 (interactive |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2082 (list (completing-read |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2083 "Which flag: " |
45325
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
2084 '("cvs" "diff" "update" "status" "log" "tag" ;"rtag" |
8b7e7b9551fe
(cvs-cmd-do): Accept non-CVS dirs with CVS-ctrl'd subdirs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
44384
diff
changeset
|
2085 "commit" "remove" "undo" "checkout") |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2086 nil t))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2087 (let* ((sym (intern (concat "cvs-" flag "-flags")))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2088 (let ((current-prefix-arg '(16))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2089 (cvs-flags-query sym (concat flag " flags"))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2090 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2091 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2092 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2093 ;;;; Utilities for the *cvs* buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2094 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2095 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2096 (defun cvs-dir-member-p (fileinfo dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2097 "Return true if FILEINFO represents a file in directory DIR." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2098 (and (not (eq (cvs-fileinfo->type fileinfo) 'DIRCHANGE)) |
28862
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
2099 (cvs-string-prefix-p dir (cvs-fileinfo->dir fileinfo)))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2100 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2101 (defun cvs-execute-single-file (fi extractor program constant-args) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2102 "Internal function for `cvs-execute-single-file-list'." |
34653
433f1bff06f5
(cvs-diff-backup-extractor): Return full-path for file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34412
diff
changeset
|
2103 (let* ((arg-list (funcall extractor fi)) |
433f1bff06f5
(cvs-diff-backup-extractor): Return full-path for file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34412
diff
changeset
|
2104 (inhibit-read-only t)) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
2105 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2106 ;; Execute the command unless extractor returned t. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2107 (when (listp arg-list) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2108 (let* ((args (append constant-args arg-list))) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
2109 |
34653
433f1bff06f5
(cvs-diff-backup-extractor): Return full-path for file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34412
diff
changeset
|
2110 (insert (format "=== %s %s\n\n" |
433f1bff06f5
(cvs-diff-backup-extractor): Return full-path for file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34412
diff
changeset
|
2111 program (cvs-strings->string args))) |
30569
f7a0912532da
* pcvs.el (cvs-do-commit): Use `buffer-substring-no-properties'
Sam Steingold <sds@gnu.org>
parents:
29577
diff
changeset
|
2112 |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2113 ;; FIXME: return the exit status? |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2114 (apply 'call-process program nil t t args) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2115 (goto-char (point-max)))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2116 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2117 ;; FIXME: make this run in the background ala cvs-run-process... |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2118 (defun cvs-execute-single-file-list (fis extractor program constant-args) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2119 "Run PROGRAM on all elements on FIS. |
34653
433f1bff06f5
(cvs-diff-backup-extractor): Return full-path for file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34412
diff
changeset
|
2120 CONSTANT-ARGS is a list of strings to pass as arguments to PROGRAM. |
433f1bff06f5
(cvs-diff-backup-extractor): Return full-path for file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34412
diff
changeset
|
2121 The arguments given to the program will be CONSTANT-ARGS followed by |
433f1bff06f5
(cvs-diff-backup-extractor): Return full-path for file.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
34412
diff
changeset
|
2122 the list that EXTRACTOR returns. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2123 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2124 EXTRACTOR will be called once for each file on FIS. It is given |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2125 one argument, the cvs-fileinfo. It can return t, which means ignore |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2126 this file, or a list of arguments to send to the program." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2127 (dolist (fi fis) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2128 (cvs-execute-single-file fi extractor program constant-args))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2129 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2130 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2131 (defun cvs-revert-if-needed (fis) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2132 (dolist (fileinfo fis) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2133 (let* ((file (cvs-fileinfo->full-path fileinfo)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2134 (buffer (find-buffer-visiting file))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2135 ;; For a revert to happen the user must be editing the file... |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2136 (unless (or (null buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2137 (eq (cvs-fileinfo->type fileinfo) 'MESSAGE) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2138 ;; FIXME: check whether revert is really needed. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2139 ;; `(verify-visited-file-modtime buffer)' doesn't cut it |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2140 ;; because it only looks at the time stamp (it ignores |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2141 ;; read-write changes) which is not changed by `commit'. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2142 (buffer-modified-p buffer)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2143 (with-current-buffer buffer |
31977
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
2144 (ignore-errors |
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
2145 (revert-buffer 'ignore-auto 'dont-ask 'preserve-modes) |
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
2146 ;; `preserve-modes' avoids changing the (minor) modes. But we |
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
2147 ;; do want to reset the mode for VC, so we do it explicitly. |
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
2148 (vc-find-file-hook) |
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
2149 (when (eq (cvs-fileinfo->type fileinfo) 'CONFLICT) |
2f79c1ebd1fe
(cvs-ediff-exit-hook): Kill buffer before window.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
30879
diff
changeset
|
2150 (smerge-mode 1)))))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2151 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2152 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2153 (defun cvs-change-cvsroot (newroot) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2154 "Change the cvsroot." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2155 (interactive "DNew repository: ") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2156 (if (or (file-directory-p (expand-file-name "CVSROOT" newroot)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2157 (y-or-n-p (concat "Warning: no CVSROOT found inside repository." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2158 " Change cvs-cvsroot anyhow?"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2159 (setq cvs-cvsroot newroot))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2160 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2161 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2162 ;;;; useful global settings |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2163 ;;;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2164 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2165 ;;;###autoload |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2166 (add-to-list 'completion-ignored-extensions "CVS/") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2167 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2168 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2169 ;; Hook to allow calling PCL-CVS by visiting the /CVS subdirectory |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2170 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2171 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2172 ;;;###autoload |
32187
418444640a1e
(cvs-ediff-exit-hook): Expect delete-window to fail.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
31977
diff
changeset
|
2173 (defcustom cvs-dired-action 'cvs-quickdir |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
2174 "The action to be performed when opening a CVS directory. |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
2175 Sensible values are `cvs-examine', `cvs-status' and `cvs-quickdir'." |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
2176 :group 'pcl-cvs |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
2177 :type '(choice (const cvs-examine) (const cvs-status) (const cvs-quickdir))) |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
2178 |
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
2179 ;;;###autoload |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2180 (defcustom cvs-dired-use-hook '(4) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2181 "Whether or not opening a CVS directory should run PCL-CVS. |
42206 | 2182 nil means never do it. |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2183 ALWAYS means to always do it unless a prefix argument is given to the |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2184 command that prompted the opening of the directory. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2185 Anything else means to do it only if the prefix arg is equal to this value." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2186 :group 'pcl-cvs |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2187 :type '(choice (const :tag "Never" nil) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2188 (const :tag "Always" always) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2189 (const :tag "Prefix" (4)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2190 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2191 ;;;###autoload |
28862
d089f0a330a0
(cvs-cleanup-collection): Remove obsolete code for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28256
diff
changeset
|
2192 (progn (defun cvs-dired-noselect (dir) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2193 "Run `cvs-examine' if DIR is a CVS administrative directory. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2194 The exact behavior is determined also by `cvs-dired-use-hook'." |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2195 (when (stringp dir) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2196 (setq dir (directory-file-name dir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2197 (when (and (string= "CVS" (file-name-nondirectory dir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2198 (file-readable-p (expand-file-name "Entries" dir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2199 cvs-dired-use-hook |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2200 (if (eq cvs-dired-use-hook 'always) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2201 (not current-prefix-arg) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2202 (equal current-prefix-arg cvs-dired-use-hook))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2203 (save-excursion |
29577
ce3a0229bee7
(cvs-parse-process): Don't blindly refresh all cookies.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
28862
diff
changeset
|
2204 (funcall cvs-dired-action (file-name-directory dir) t t)))))) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2205 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2206 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2207 ;; hook into VC |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2208 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2209 |
32309
bb96b2ece52b
(cvs-append-to-ignore, cvs-vc-command-advice)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32187
diff
changeset
|
2210 (add-hook 'vc-post-command-functions 'cvs-vc-command-advice) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2211 |
32309
bb96b2ece52b
(cvs-append-to-ignore, cvs-vc-command-advice)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32187
diff
changeset
|
2212 (defun cvs-vc-command-advice (command file flags) |
bb96b2ece52b
(cvs-append-to-ignore, cvs-vc-command-advice)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32187
diff
changeset
|
2213 (when (and (equal command "cvs") |
45904
4c3a4e9f96e7
(cvs-vc-command-advice): Handle the case where args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45325
diff
changeset
|
2214 (progn |
4c3a4e9f96e7
(cvs-vc-command-advice): Handle the case where args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45325
diff
changeset
|
2215 (while (and (stringp (car flags)) |
4c3a4e9f96e7
(cvs-vc-command-advice): Handle the case where args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45325
diff
changeset
|
2216 (string-match "\\`-" (car flags))) |
4c3a4e9f96e7
(cvs-vc-command-advice): Handle the case where args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45325
diff
changeset
|
2217 (pop flags)) |
4c3a4e9f96e7
(cvs-vc-command-advice): Handle the case where args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45325
diff
changeset
|
2218 ;; don't parse output we don't understand. |
4c3a4e9f96e7
(cvs-vc-command-advice): Handle the case where args
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45325
diff
changeset
|
2219 (member (car flags) cvs-parse-known-commands))) |
46002
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
2220 (save-current-buffer |
32309
bb96b2ece52b
(cvs-append-to-ignore, cvs-vc-command-advice)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32187
diff
changeset
|
2221 (let ((buffer (current-buffer)) |
bb96b2ece52b
(cvs-append-to-ignore, cvs-vc-command-advice)
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
32187
diff
changeset
|
2222 (dir default-directory) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2223 (cvs-from-vc t)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2224 (dolist (cvs-buf (buffer-list)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2225 (set-buffer cvs-buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2226 ;; look for a corresponding pcl-cvs buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2227 (when (and (eq major-mode 'cvs-mode) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2228 (cvs-string-prefix-p default-directory dir)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2229 (let ((subdir (substring dir (length default-directory)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2230 (set-buffer buffer) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2231 (set (make-local-variable 'cvs-buffer) cvs-buf) |
46002
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
2232 ;; `cvs -q add file' produces no useful output :-( |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
2233 (when (and (equal (car flags) "add") |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
2234 (goto-char (point-min)) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
2235 (looking-at ".*to add this file permanently\n\\'")) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
2236 (insert "cvs add: scheduling file `" |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
2237 (file-name-nondirectory file) |
6f298513c731
(cvs-parse-process): Don't save/restore point.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
45999
diff
changeset
|
2238 "' for addition\n")) |
28088
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2239 ;; VC never (?) does `cvs -n update' so dcd=nil |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2240 ;; should probably always be the right choice. |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2241 (cvs-parse-process nil subdir)))))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2242 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2243 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2244 ;; Hook into write-buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2245 ;; |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2246 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2247 (defun cvs-mark-buffer-changed () |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2248 (let* ((file (expand-file-name buffer-file-name)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2249 (version (and (fboundp 'vc-backend) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2250 (eq (vc-backend file) 'CVS) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2251 (vc-workfile-version file)))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2252 (when version |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2253 (save-excursion |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2254 (dolist (cvs-buf (buffer-list)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2255 (set-buffer cvs-buf) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2256 ;; look for a corresponding pcl-cvs buffer |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2257 (when (and (eq major-mode 'cvs-mode) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2258 (cvs-string-prefix-p default-directory file)) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2259 (let* ((file (substring file (length default-directory))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2260 (fi (cvs-create-fileinfo |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2261 (if (string= "0" version) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2262 'ADDED 'MODIFIED) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2263 (or (file-name-directory file) "") |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2264 (file-name-nondirectory file) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2265 "cvs-mark-buffer-changed"))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2266 (cvs-addto-collection cvs-cookies fi)))))))) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2267 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2268 (add-hook 'after-save-hook 'cvs-mark-buffer-changed) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2269 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2270 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2271 (provide 'pcvs) |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2272 |
b442dfc3cef0
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2273 ;;; pcvs.el ends here |