Mercurial > emacs
annotate lisp/vc-arch.el @ 99834:296816e24605
(Frame Commands): Mention "minimize" terminology.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Sun, 23 Nov 2008 04:21:41 +0000 |
parents | 248f432fca05 |
children | 5a223111838e |
rev | line source |
---|---|
54396 | 1 ;;; vc-arch.el --- VC backend for the Arch version-control system |
2 | |
79721 | 3 ;; Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
54396 | 4 |
5 ;; Author: FSF (see vc.el for full credits) | |
6 ;; Maintainer: Stefan Monnier <monnier@gnu.org> | |
7 | |
8 ;; This file is part of GNU Emacs. | |
9 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94563
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
54396 | 11 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94563
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94563
diff
changeset
|
13 ;; (at your option) any later version. |
54396 | 14 |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94563
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
54396 | 22 |
23 ;;; Commentary: | |
24 | |
25 ;; The home page of the Arch version control system is at | |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
26 ;; |
54396 | 27 ;; http://www.gnuarch.org/ |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
28 ;; |
54396 | 29 ;; This is derived from vc-mcvs.el as follows: |
30 ;; - cp vc-mcvs.el vc-arch.el and then M-% mcvs RET arch RET | |
31 ;; | |
32 ;; Then of course started the hacking. | |
33 ;; | |
34 ;; What has been partly tested: | |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
35 ;; - Open a file. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
36 ;; - C-x v = without any prefix arg. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
37 ;; - C-x v v to commit a change to a single file. |
54396 | 38 |
39 ;; Bugs: | |
40 | |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
41 ;; - *VC-log*'s initial content lacks the `Summary:' lines. |
54396 | 42 ;; - All files under the tree are considered as "under Arch's control" |
43 ;; without regards to =tagging-method and such. | |
44 ;; - Files are always considered as `edited'. | |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
45 ;; - C-x v l does not work. |
54396 | 46 ;; - C-x v i does not work. |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
47 ;; - C-x v ~ does not work. |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
48 ;; - C-x v u does not work. |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
49 ;; - C-x v s does not work. |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
50 ;; - C-x v r does not work. |
94542
16651da1e3ed
Fix some comments to remove references to vc-dired.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94521
diff
changeset
|
51 ;; - VC directory listings do not work. |
54396 | 52 ;; - And more... |
53 | |
54 ;;; Code: | |
55 | |
54532
87ca639a4eca
Require CL for `case'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54531
diff
changeset
|
56 (eval-when-compile (require 'vc) (require 'cl)) |
54396 | 57 |
94563
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94542
diff
changeset
|
58 ;;; Properties of the backend |
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94542
diff
changeset
|
59 |
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94542
diff
changeset
|
60 (defun vc-arch-revision-granularity () 'repository) |
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94542
diff
changeset
|
61 (defun vc-arch-checkout-model (files) 'implicit) |
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94542
diff
changeset
|
62 |
54396 | 63 ;;; |
64 ;;; Customization options | |
65 ;;; | |
66 | |
99784
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
67 (define-obsolete-variable-alias 'vc-arch-command 'vc-arch-program "23.1") |
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
68 |
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
69 (defcustom vc-arch-program |
81379
fa58a242b75e
(vc-arch-command): Remove bzr. It's a different program.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81326
diff
changeset
|
70 (let ((candidates '("tla" "baz"))) |
54396 | 71 (while (and candidates (not (executable-find (car candidates)))) |
72 (setq candidates (cdr candidates))) | |
99784
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
73 (or (car candidates) "tla")) |
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
74 "Name of the Arch executable." |
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
75 :type 'string |
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
76 :group 'vc) |
54396 | 77 |
78 ;; Clear up the cache to force vc-call to check again and discover | |
79 ;; new functions when we reload this file. | |
80 (put 'Arch 'vc-functions nil) | |
81 | |
82 ;;;###autoload (defun vc-arch-registered (file) | |
57094
7883de80034e
(vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57026
diff
changeset
|
83 ;;;###autoload (if (vc-find-root file "{arch}/=tagging-method") |
7883de80034e
(vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57026
diff
changeset
|
84 ;;;###autoload (progn |
7883de80034e
(vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57026
diff
changeset
|
85 ;;;###autoload (load "vc-arch") |
7883de80034e
(vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57026
diff
changeset
|
86 ;;;###autoload (vc-arch-registered file)))) |
54396 | 87 |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
88 (defun vc-arch-add-tagline () |
54396 | 89 "Add an `arch-tag' to the end of the current file." |
90 (interactive) | |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
91 (comment-normalize-vars) |
54396 | 92 (goto-char (point-max)) |
93 (forward-comment -1) | |
81620
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
94 (skip-chars-forward " \t\n") |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
95 (cond |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
96 ((not (bolp)) (insert "\n\n")) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
97 ((not (eq ?\n (char-before (1- (point))))) (insert "\n"))) |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
98 (let ((beg (point)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
99 (idfile (and buffer-file-name |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
100 (expand-file-name |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
101 (concat ".arch-ids/" |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
102 (file-name-nondirectory buffer-file-name) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
103 ".id") |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
104 (file-name-directory buffer-file-name))))) |
54396 | 105 (insert "arch-tag: ") |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
106 (if (and idfile (file-exists-p idfile)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
107 ;; If the file is unreadable, we do want to get an error here. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
108 (progn |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
109 (insert-file-contents idfile) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
110 (forward-line 1) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
111 (delete-file idfile)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
112 (condition-case nil |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
113 (call-process "uuidgen" nil t) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
114 (file-error (insert (format "%s <%s> %s" |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
115 (current-time-string) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
116 user-mail-address |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
117 (+ (nth 2 (current-time)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
118 (buffer-size))))))) |
54396 | 119 (comment-region beg (point)))) |
120 | |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
121 (defconst vc-arch-tagline-re "^\\W*arch-tag:[ \t]*\\(.*[^ \t\n]\\)") |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
122 |
76769
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
123 (defmacro vc-with-current-file-buffer (file &rest body) |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
124 (declare (indent 2) (debug t)) |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
125 `(let ((-kill-buf- nil) |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
126 (-file- ,file)) |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
127 (with-current-buffer (or (find-buffer-visiting -file-) |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
128 (setq -kill-buf- (generate-new-buffer " temp"))) |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
129 ;; Avoid find-file-literally since it can do many undesirable extra |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
130 ;; things (among which, call us back into an infinite loop). |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
131 (if -kill-buf- (insert-file-contents -file-)) |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
132 (unwind-protect |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
133 (progn ,@body) |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
134 (if (buffer-live-p -kill-buf-) (kill-buffer -kill-buf-)))))) |
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
135 |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
136 (defun vc-arch-file-source-p (file) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
137 "Can return nil, `maybe' or a non-nil value. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
138 Only the value `maybe' can be trusted :-(." |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
139 ;; FIXME: Check the tag and name of parent dirs. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
140 (unless (string-match "\\`[,+]" (file-name-nondirectory file)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
141 (or (string-match "\\`{arch}/" |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
142 (file-relative-name file (vc-arch-root file))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
143 (file-exists-p |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
144 ;; Check the presence of an ID file. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
145 (expand-file-name |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
146 (concat ".arch-ids/" (file-name-nondirectory file) ".id") |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
147 (file-name-directory file))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
148 ;; Check the presence of a tagline. |
76769
3693d2ee35b8
(vc-with-current-file-buffer): New macro.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75469
diff
changeset
|
149 (vc-with-current-file-buffer file |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
150 (save-excursion |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
151 (goto-char (point-max)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
152 (or (re-search-backward vc-arch-tagline-re (- (point) 1000) t) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
153 (progn |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
154 (goto-char (point-min)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
155 (re-search-forward vc-arch-tagline-re (+ (point) 1000) t))))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
156 ;; FIXME: check =tagging-method to see whether untagged files might |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
157 ;; be source or not. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
158 (with-current-buffer |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
159 (find-file-noselect (expand-file-name "{arch}/=tagging-method" |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
160 (vc-arch-root file))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
161 (let ((untagged-source t)) ;Default is `names'. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
162 (save-excursion |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
163 (goto-char (point-min)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
164 (if (re-search-forward "^[ \t]*\\(\\(tagline\\|implicit\\|names\\)\\|explicit\\)" nil t) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
165 (setq untagged-source (match-end 2))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
166 (if (re-search-forward "^[ \t]*untagged-source[ \t]+\\(\\(source\\)\\|precious\\|backup\\|junk\\|unrecognized\\)" nil t) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
167 (setq untagged-source (match-end 2)))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
168 (if untagged-source 'maybe)))))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
169 |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
170 (defun vc-arch-file-id (file) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
171 ;; Don't include the kind of ID this is because it seems to be too messy. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
172 (let ((idfile (expand-file-name |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
173 (concat ".arch-ids/" (file-name-nondirectory file) ".id") |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
174 (file-name-directory file)))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
175 (if (file-exists-p idfile) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
176 (with-temp-buffer |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
177 (insert-file-contents idfile) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
178 (looking-at ".*[^ \n\t]") |
75469
d2adef0ec2f0
(vc-arch-file-id): Move with-current-buffer inside the if.
Richard M. Stallman <rms@gnu.org>
parents:
75347
diff
changeset
|
179 (match-string 0)) |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
180 (with-current-buffer (find-file-noselect file) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
181 (save-excursion |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
182 (goto-char (point-max)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
183 (if (or (re-search-backward vc-arch-tagline-re (- (point) 1000) t) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
184 (progn |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
185 (goto-char (point-min)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
186 (re-search-forward vc-arch-tagline-re (+ (point) 1000) t))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
187 (match-string 1) |
75469
d2adef0ec2f0
(vc-arch-file-id): Move with-current-buffer inside the if.
Richard M. Stallman <rms@gnu.org>
parents:
75347
diff
changeset
|
188 (concat "./" (file-relative-name file (vc-arch-root file))))))))) |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
189 |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
190 (defun vc-arch-tagging-method (file) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
191 (with-current-buffer |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
192 (find-file-noselect |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
193 (expand-file-name "{arch}/=tagging-method" (vc-arch-root file))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
194 (save-excursion |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
195 (goto-char (point-min)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
196 (if (re-search-forward |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
197 "^[ \t]*\\(tagline\\|implicit\\|names\\|explicit\\)" nil t) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
198 (intern (match-string 1)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
199 'names)))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
200 |
54396 | 201 (defun vc-arch-root (file) |
202 "Return the root directory of a Arch project, if any." | |
203 (or (vc-file-getprop file 'arch-root) | |
87574
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
204 ;; Check the =tagging-method, in case someone naively manually |
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
205 ;; creates a {arch} directory somewhere. |
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
206 (let ((root (vc-find-root file "{arch}/=tagging-method"))) |
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
207 (when root |
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
208 (vc-file-setprop |
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
86002
diff
changeset
|
209 file 'arch-root root))))) |
54396 | 210 |
81960
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
211 (defun vc-arch-register (files &optional rev comment) |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
212 (if rev (error "Explicit initial revision not supported for Arch")) |
81960
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
213 (dolist (file files) |
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
214 (let ((tagmet (vc-arch-tagging-method file))) |
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
215 (if (and (memq tagmet '(tagline implicit)) comment-start) |
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
216 (with-current-buffer (find-file-noselect file) |
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
217 (if (buffer-modified-p) |
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
218 (error "Save %s first" (buffer-name))) |
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
219 (vc-arch-add-tagline) |
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
220 (save-buffer))))) |
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
221 (vc-arch-command nil 0 files "add")) |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
222 |
54396 | 223 (defun vc-arch-registered (file) |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
224 ;; Don't seriously check whether it's source or not. Checking would |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
225 ;; require running TLA, so it's better to not do it, so it also works if |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
226 ;; TLA is not installed. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
227 (and (vc-arch-root file) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
228 (vc-arch-file-source-p file))) |
54396 | 229 |
230 (defun vc-arch-default-version (file) | |
231 (or (vc-file-getprop (vc-arch-root file) 'arch-default-version) | |
232 (let* ((root (vc-arch-root file)) | |
233 (f (expand-file-name "{arch}/++default-version" root))) | |
234 (if (file-readable-p f) | |
235 (vc-file-setprop | |
236 root 'arch-default-version | |
237 (with-temp-buffer | |
238 (insert-file-contents f) | |
239 ;; Strip the terminating newline. | |
240 (buffer-substring (point-min) (1- (point-max))))))))) | |
241 | |
54409
a9f1e9611612
(vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54396
diff
changeset
|
242 (defun vc-arch-workfile-unchanged-p (file) |
a9f1e9611612
(vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54396
diff
changeset
|
243 "Check if FILE is unchanged by diffing against the master version. |
a9f1e9611612
(vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54396
diff
changeset
|
244 Return non-nil if FILE is unchanged." |
a9f1e9611612
(vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54396
diff
changeset
|
245 nil) |
a9f1e9611612
(vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54396
diff
changeset
|
246 |
54396 | 247 (defun vc-arch-state (file) |
248 ;; There's no checkout operation and merging is not done from VC | |
249 ;; so the only operation that's state dependent that VC supports is commit | |
250 ;; which is only activated if the file is `edited'. | |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
251 (let* ((root (vc-arch-root file)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
252 (ver (vc-arch-default-version file)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
253 (pat (concat "\\`" (subst-char-in-string ?/ ?% ver))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
254 (dir (expand-file-name ",,inode-sigs/" |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
255 (expand-file-name "{arch}" root))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
256 (sigfile nil)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
257 (dolist (f (if (file-directory-p dir) (directory-files dir t pat))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
258 (if (or (not sigfile) (file-newer-than-file-p f sigfile)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
259 (setq sigfile f))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
260 (if (not sigfile) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
261 'edited ;We know nothing. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
262 (let ((id (vc-arch-file-id file))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
263 (setq id (replace-regexp-in-string "[ \t]" "_" id)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
264 (with-current-buffer (find-file-noselect sigfile) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
265 (goto-char (point-min)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
266 (while (and (search-forward id nil 'move) |
57026
992d9837a265
(vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56954
diff
changeset
|
267 (save-excursion |
992d9837a265
(vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56954
diff
changeset
|
268 (goto-char (- (match-beginning 0) 2)) |
992d9837a265
(vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56954
diff
changeset
|
269 ;; For `names', the lines start with `?./foo/bar'. |
992d9837a265
(vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56954
diff
changeset
|
270 ;; For others there's 2 chars before the ./foo/bar. |
992d9837a265
(vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56954
diff
changeset
|
271 (or (not (or (bolp) (looking-at "\n?"))) |
992d9837a265
(vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56954
diff
changeset
|
272 ;; Ignore E_ entries used for foo.id files. |
992d9837a265
(vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56954
diff
changeset
|
273 (looking-at "E_"))))) |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
274 (if (eobp) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
275 ;; ID not found. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
276 (if (equal (file-name-nondirectory sigfile) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
277 (subst-char-in-string |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84374
diff
changeset
|
278 ?/ ?% (vc-arch-working-revision file))) |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
279 'added |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
280 ;; Might be `added' or `up-to-date' as well. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
281 ;; FIXME: Check in the patch logs to find out. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
282 'edited) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
283 ;; Found the ID, let's check the inode. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
284 (if (not (re-search-forward |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
285 "\t.*mtime=\\([0-9]+\\):size=\\([0-9]+\\)" |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
286 (line-end-position) t)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
287 ;; Buh? Unexpected format. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
288 'edited |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
289 (let ((ats (file-attributes file))) |
55873
304d478aa594
(vc-arch-state): Don't assume the file exists.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55814
diff
changeset
|
290 (if (and (eq (nth 7 ats) (string-to-number (match-string 2))) |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
291 (equal (format-time-string "%s" (nth 5 ats)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
292 (match-string 1))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
293 'up-to-date |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
294 'edited))))))))) |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
295 |
98776
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
296 (defun vc-arch-dir-status (dir callback) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
297 "Run 'tla inventory' for DIR and pass results to CALLBACK. |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
298 CALLBACK expects (ENTRIES &optional MORE-TO-COME); see |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
299 `vc-dir-refresh'." |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
300 (let ((default-directory dir)) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
301 (vc-arch-command t 'async nil "changes")) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
302 ;; The updating could be done asynchronously. |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
303 (vc-exec-after |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
304 `(vc-arch-after-dir-status ',callback))) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
305 |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
306 (defun vc-arch-after-dir-status (callback) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
307 (let* ((state-map '(("M " . edited) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
308 ("Mb" . edited) ;binary |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
309 ("D " . removed) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
310 ("D/" . removed) ;directory |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
311 ("A " . added) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
312 ("A/" . added) ;directory |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
313 ("=>" . renamed) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
314 ("/>" . renamed) ;directory |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
315 ("lf" . symlink-to-file) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
316 ("fl" . file-to-symlink) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
317 ("--" . permissions-changed) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
318 ("-/" . permissions-changed) ;directory |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
319 )) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
320 (state-map-regexp (regexp-opt (mapcar 'car state-map) t)) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
321 (entry-regexp (concat "^" state-map-regexp " \\(.*\\)$")) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
322 result) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
323 (goto-char (point-min)) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
324 ;;(message "Got %s" (buffer-string)) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
325 (while (re-search-forward entry-regexp nil t) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
326 (let* ((state-string (match-string 1)) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
327 (state (cdr (assoc state-string state-map))) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
328 (filename (match-string 2))) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
329 (push (list filename state) result))) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
330 |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
331 (funcall callback result nil))) |
58d0fa1979cb
* vc-arch.el (vc-arch-dir-status): New function.
Magnus Henoch <mange@freemail.hu>
parents:
96899
diff
changeset
|
332 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84374
diff
changeset
|
333 (defun vc-arch-working-revision (file) |
54396 | 334 (let* ((root (expand-file-name "{arch}" (vc-arch-root file))) |
335 (defbranch (vc-arch-default-version file))) | |
59313
ad91f130fbdf
(vc-arch-workfile-version): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59312
diff
changeset
|
336 (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*?\\)\\(?:--.*\\)?\\)--.*\\)\\'" defbranch)) |
54396 | 337 (let* ((archive (match-string 1 defbranch)) |
338 (category (match-string 4 defbranch)) | |
339 (branch (match-string 3 defbranch)) | |
340 (version (match-string 2 defbranch)) | |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
341 (sealed nil) (rev-nb 0) |
54396 | 342 (rev nil) |
343 logdir tmp) | |
344 (setq logdir (expand-file-name category root)) | |
345 (setq logdir (expand-file-name branch logdir)) | |
346 (setq logdir (expand-file-name version logdir)) | |
347 (setq logdir (expand-file-name archive logdir)) | |
348 (setq logdir (expand-file-name "patch-log" logdir)) | |
57566
d50f313f6fdd
(vc-arch-workfile-version): Don't burp if the patch-log directory is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57094
diff
changeset
|
349 (dolist (file (if (file-directory-p logdir) (directory-files logdir))) |
d50f313f6fdd
(vc-arch-workfile-version): Don't burp if the patch-log directory is missing.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57094
diff
changeset
|
350 ;; Revision names go: base-0, patch-N, version-0, versionfix-M. |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
351 (when (and (eq (aref file 0) ?v) (not sealed)) |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
352 (setq sealed t rev-nb 0)) |
54396 | 353 (if (and (string-match "-\\([0-9]+\\)\\'" file) |
354 (setq tmp (string-to-number (match-string 1 file))) | |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
355 (or (not sealed) (eq (aref file 0) ?v)) |
54396 | 356 (>= tmp rev-nb)) |
357 (setq rev-nb tmp rev file))) | |
56954
242cddb00aef
(vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56283
diff
changeset
|
358 ;; Use "none-000" if the tree hasn't yet been committed on the |
242cddb00aef
(vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56283
diff
changeset
|
359 ;; default branch. We'll then get "Arch:000[branch]" on the mode-line. |
242cddb00aef
(vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56283
diff
changeset
|
360 (concat defbranch "--" (or rev "none-000")))))) |
54396 | 361 |
362 | |
363 (defcustom vc-arch-mode-line-rewrite | |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
364 '(("\\`.*--\\(.*--.*\\)--\\(v?\\).*-\\([0-9]+\\)\\'" . "\\2\\3[\\1]")) |
54396 | 365 "Rewrite rules to shorten Arch's revision names on the mode-line." |
56283
9d529d2aac14
(vc-arch-mode-line-rewrite): Add :group 'vc.
Kim F. Storm <storm@cua.dk>
parents:
55873
diff
changeset
|
366 :type '(repeat (cons regexp string)) |
9d529d2aac14
(vc-arch-mode-line-rewrite): Add :group 'vc.
Kim F. Storm <storm@cua.dk>
parents:
55873
diff
changeset
|
367 :group 'vc) |
54396 | 368 |
369 (defun vc-arch-mode-line-string (file) | |
370 "Return string for placement in modeline by `vc-mode-line' for FILE." | |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84374
diff
changeset
|
371 (let ((rev (vc-working-revision file))) |
54396 | 372 (dolist (rule vc-arch-mode-line-rewrite) |
373 (if (string-match (car rule) rev) | |
374 (setq rev (replace-match (cdr rule) t nil rev)))) | |
375 (format "Arch%c%s" | |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
376 (case (vc-state file) |
94521
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87903
diff
changeset
|
377 ((up-to-date needs-update) ?-) |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
378 (added ?@) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
379 (t ?:)) |
54396 | 380 rev))) |
381 | |
382 (defun vc-arch-diff3-rej-p (rej) | |
54531
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
383 (let ((attrs (file-attributes rej))) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
384 (and attrs (< (nth 7 attrs) 60) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
385 (with-temp-buffer |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
386 (insert-file-contents rej) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
387 (goto-char (point-min)) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
388 (looking-at "Conflicts occured, diff3 conflict markers left in file\\."))))) |
54396 | 389 |
390 (defun vc-arch-delete-rej-if-obsolete () | |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
391 "For use in `after-save-hook'." |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
392 (save-excursion |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
393 (let ((rej (concat buffer-file-name ".rej"))) |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
394 (when (and buffer-file-name (vc-arch-diff3-rej-p rej)) |
79848
316ed7573095
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79721
diff
changeset
|
395 (unless (re-search-forward "^<<<<<<< " nil t) |
316ed7573095
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79721
diff
changeset
|
396 ;; The .rej file is obsolete. |
316ed7573095
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79721
diff
changeset
|
397 (condition-case nil (delete-file rej) (error nil)) |
316ed7573095
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79721
diff
changeset
|
398 ;; Remove the hook so that it is not called multiple times. |
316ed7573095
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79721
diff
changeset
|
399 (remove-hook 'after-save-hook 'vc-arch-delete-rej-if-obsolete t)))))) |
54396 | 400 |
401 (defun vc-arch-find-file-hook () | |
402 (let ((rej (concat buffer-file-name ".rej"))) | |
403 (when (and buffer-file-name (file-exists-p rej)) | |
404 (if (vc-arch-diff3-rej-p rej) | |
405 (save-excursion | |
406 (goto-char (point-min)) | |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
407 (if (not (re-search-forward "^<<<<<<< " nil t)) |
54396 | 408 ;; The .rej file is obsolete. |
409 (condition-case nil (delete-file rej) (error nil)) | |
410 (smerge-mode 1) | |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
411 (add-hook 'after-save-hook |
54396 | 412 'vc-arch-delete-rej-if-obsolete nil t) |
413 (message "There are unresolved conflicts in this file"))) | |
414 (message "There are unresolved conflicts in %s" | |
415 (file-name-nondirectory rej)))))) | |
416 | |
81960
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
417 (defun vc-arch-checkin (files rev comment) |
63423
8269aa11cce4
(vc-arch-checkin, vc-arch-diff): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
59444
diff
changeset
|
418 (if rev (error "Committing to a specific revision is unsupported")) |
81960
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
419 ;; FIXME: This implementation probably only works for singleton filesets |
84374
1224dec49333
(vc-arch-checkin): Fix typo.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82502
diff
changeset
|
420 (let ((summary (file-relative-name (car files) (vc-arch-root (car files))))) |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
421 ;; Extract a summary from the comment. |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
422 (when (or (string-match "\\`Summary:[ \t]*\\(.*[^ \t\n]\\)\\([ \t]*\n\\)*" comment) |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
423 (string-match "\\`[ \t]*\\(.*[^ \t\n]\\)[ \t]*\\(\n?\\'\\|\n\\([ \t]*\n\\)+\\)" comment)) |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
424 (setq summary (match-string 1 comment)) |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
425 (setq comment (substring comment (match-end 0)))) |
81960
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
426 (vc-arch-command nil 0 files "commit" "-s" summary "-L" comment "--" |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
427 (vc-switches 'Arch 'checkin)))) |
54396 | 428 |
81960
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
429 (defun vc-arch-diff (files &optional oldvers newvers buffer) |
5a8f965c55ba
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81804
diff
changeset
|
430 "Get a difference report using Arch between two versions of FILES." |
82000
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
431 ;; FIXME: This implementation only works for singleton filesets. To make |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
432 ;; it work for more cases, we have to either call `file-diffs' manually on |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
433 ;; each and every `file' in the fileset, or use `changes --diffs' (and |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
434 ;; variants) and maybe filter the output with `filterdiff' to only include |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
435 ;; the files in which we're interested. |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
436 (let ((file (car files))) |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
437 (if (and newvers |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
438 (vc-up-to-date-p file) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84374
diff
changeset
|
439 (equal newvers (vc-working-revision file))) |
82000
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
440 ;; Newvers is the base revision and the current file is unchanged, |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
441 ;; so we can diff with the current file. |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
442 (setq newvers nil)) |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
443 (if newvers |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
444 (error "Diffing specific revisions not implemented") |
86002
613df1ba1584
* vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85457
diff
changeset
|
445 (let* ((async (not vc-disable-async-diff)) |
82000
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
446 ;; Run the command from the root dir. |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
447 (default-directory (vc-arch-root file)) |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
448 (status |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
449 (vc-arch-command |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
450 (or buffer "*vc-diff*") |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
451 (if async 'async 1) |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
452 nil "file-diffs" |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
453 ;; Arch does not support the typical flags. |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
454 ;; (vc-switches 'Arch 'diff) |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
455 (file-relative-name file) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84374
diff
changeset
|
456 (if (equal oldvers (vc-working-revision file)) |
82000
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
457 nil |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
458 oldvers)))) |
066eaef90bfb
(vc-arch-diff): Fix last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81960
diff
changeset
|
459 (if async 1 status))))) ; async diff, pessimistic assumption. |
54396 | 460 |
461 (defun vc-arch-delete-file (file) | |
462 (vc-arch-command nil 0 file "rm")) | |
463 | |
464 (defun vc-arch-rename-file (old new) | |
465 (vc-arch-command nil 0 new "mv" (file-relative-name old))) | |
466 | |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
467 (defalias 'vc-arch-responsible-p 'vc-arch-root) |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
468 |
54396 | 469 (defun vc-arch-command (buffer okstatus file &rest flags) |
470 "A wrapper around `vc-do-command' for use in vc-arch.el." | |
99784
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
471 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-arch-program file flags)) |
54396 | 472 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84374
diff
changeset
|
473 (defun vc-arch-init-revision () nil) |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
474 |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
475 ;;; Completion of versions and revisions. |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
476 |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
477 (defun vc-arch--version-completion-table (root string) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
478 (delq nil |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
479 (mapcar |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
480 (lambda (d) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
481 (when (string-match "/\\([^/]+\\)/\\([^/]+\\)\\'" d) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
482 (concat (match-string 2 d) "/" (match-string 1 d)))) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
483 (let ((default-directory root)) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
484 (file-expand-wildcards |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
485 (concat "*/*/" |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
486 (if (string-match "/" string) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
487 (concat (substring string (match-end 0)) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
488 "*/" (substring string 0 (match-beginning 0))) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
489 (concat "*/" string)) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
490 "*")))))) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
491 |
85457
e58eb1e72d23
(vc-arch-revision-completion-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85139
diff
changeset
|
492 (defun vc-arch-revision-completion-table (files) |
e58eb1e72d23
(vc-arch-revision-completion-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85139
diff
changeset
|
493 (lexical-let ((files files)) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
494 (lambda (string pred action) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
495 ;; FIXME: complete revision patches as well. |
85457
e58eb1e72d23
(vc-arch-revision-completion-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85139
diff
changeset
|
496 (let* ((root (expand-file-name "{arch}" (vc-arch-root (car files)))) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
497 (table (vc-arch--version-completion-table root string))) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
498 (complete-with-action action table string pred))))) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
499 |
81620
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
500 ;;; Trimming revision libraries. |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
501 |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
502 ;; This code is not directly related to VC and there are many variants of |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
503 ;; this functionality available as scripts, but I like this version better, |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
504 ;; so maybe others will like it too. |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
505 |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
506 (defun vc-arch-trim-find-least-useful-rev (revs) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
507 (let* ((first (pop revs)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
508 (second (pop revs)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
509 (third (pop revs)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
510 ;; We try to give more importance to recent revisions. The idea is |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
511 ;; that it's OK if checking out a revision 1000-patch-old is ten |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
512 ;; times slower than checking out a revision 100-patch-old. But at |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
513 ;; the same time a 2-patch-old rev isn't really ten times more |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
514 ;; important than a 20-patch-old, so we use an arbitrary constant |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
515 ;; "100" to reduce this effect for recent revisions. Making this |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
516 ;; constant a float has the side effect of causing the subsequent |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
517 ;; computations to be done as floats as well. |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
518 (max (+ 100.0 (car (or (car (last revs)) third)))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
519 (cost (lambda () (/ (- (car third) (car first)) (- max (car second))))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
520 (minrev second) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
521 (mincost (funcall cost))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
522 (while revs |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
523 (setq first second) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
524 (setq second third) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
525 (setq third (pop revs)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
526 (when (< (funcall cost) mincost) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
527 (setq minrev second) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
528 (setq mincost (funcall cost)))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
529 minrev)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
530 |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
531 (defun vc-arch-trim-make-sentinel (revs) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
532 (if (null revs) (lambda (proc msg) (message "VC-Arch trimming ... done")) |
96899
7df3d9a17631
(vc-arch-trim-make-sentinel): Use a closure.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94847
diff
changeset
|
533 (lexical-let ((revs revs)) |
7df3d9a17631
(vc-arch-trim-make-sentinel): Use a closure.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94847
diff
changeset
|
534 (lambda (proc msg) |
7df3d9a17631
(vc-arch-trim-make-sentinel): Use a closure.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94847
diff
changeset
|
535 (message "VC-Arch trimming %s..." (file-name-nondirectory (car revs))) |
7df3d9a17631
(vc-arch-trim-make-sentinel): Use a closure.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94847
diff
changeset
|
536 (rename-file (car revs) (concat (car revs) "*rm*")) |
81620
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
537 (setq proc (start-process "vc-arch-trim" nil |
96899
7df3d9a17631
(vc-arch-trim-make-sentinel): Use a closure.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94847
diff
changeset
|
538 "rm" "-rf" (concat (car revs) "*rm*"))) |
7df3d9a17631
(vc-arch-trim-make-sentinel): Use a closure.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94847
diff
changeset
|
539 (set-process-sentinel proc (vc-arch-trim-make-sentinel (cdr revs))))))) |
81620
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
540 |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
541 (defun vc-arch-trim-one-revlib (dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
542 "Delete half of the revisions in the revision library." |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
543 (interactive "Ddirectory: ") |
96899
7df3d9a17631
(vc-arch-trim-make-sentinel): Use a closure.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94847
diff
changeset
|
544 (let ((garbage (directory-files dir 'full "\\`,," 'nosort))) |
7df3d9a17631
(vc-arch-trim-make-sentinel): Use a closure.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94847
diff
changeset
|
545 (when garbage |
7df3d9a17631
(vc-arch-trim-make-sentinel): Use a closure.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94847
diff
changeset
|
546 (funcall (vc-arch-trim-make-sentinel garbage) nil nil))) |
81620
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
547 (let ((revs |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
548 (sort (delq nil |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
549 (mapcar |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
550 (lambda (f) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
551 (when (string-match "-\\([0-9]+\\)\\'" f) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
552 (cons (string-to-number (match-string 1 f)) f))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
553 (directory-files dir nil nil 'nosort))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
554 'car-less-than-car)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
555 (subdirs nil)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
556 (when (cddr revs) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
557 (dotimes (i (/ (length revs) 2)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
558 (let ((minrev (vc-arch-trim-find-least-useful-rev revs))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
559 (setq revs (delq minrev revs)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
560 (push minrev subdirs))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
561 (funcall (vc-arch-trim-make-sentinel |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
562 (mapcar (lambda (x) (expand-file-name (cdr x) dir)) subdirs)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
563 nil nil)))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
564 |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
565 (defun vc-arch-trim-revlib () |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
566 "Delete half of the revisions in the revision library." |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
567 (interactive) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
568 (let ((rl-dir (with-output-to-string |
99784
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
569 (call-process vc-arch-program nil standard-output nil |
81620
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
570 "my-revision-library")))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
571 (while (string-match "\\(.*\\)\n" rl-dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
572 (let ((dir (match-string 1 rl-dir))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
573 (setq rl-dir |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
574 (if (and (file-directory-p dir) (file-writable-p dir)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
575 dir |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
576 (substring rl-dir (match-end 0)))))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
577 (unless (file-writable-p rl-dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
578 (error "No writable revlib directory found")) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
579 (message "Revlib at %s" rl-dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
580 (let* ((archives (directory-files rl-dir 'full "[^.]\\|...")) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
581 (categories |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
582 (apply 'append |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
583 (mapcar (lambda (dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
584 (when (file-directory-p dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
585 (directory-files dir 'full "[^.]\\|..."))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
586 archives))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
587 (branches |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
588 (apply 'append |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
589 (mapcar (lambda (dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
590 (when (file-directory-p dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
591 (directory-files dir 'full "[^.]\\|..."))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
592 categories))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
593 (versions |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
594 (apply 'append |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
595 (mapcar (lambda (dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
596 (when (file-directory-p dir) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
597 (directory-files dir 'full "--.*--"))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
598 branches)))) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
599 (mapc 'vc-arch-trim-one-revlib versions)) |
205f0e2270e9
(vc-arch-add-tagline): Do a slightly cleaner job.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81379
diff
changeset
|
600 )) |
82502
2a2056106d16
(vc-arch-extra-menu-map): New var and fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
82140
diff
changeset
|
601 |
78822
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78359
diff
changeset
|
602 (defvar vc-arch-extra-menu-map |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78359
diff
changeset
|
603 (let ((map (make-sparse-keymap))) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78359
diff
changeset
|
604 (define-key map [add-tagline] |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78359
diff
changeset
|
605 '(menu-item "Add tagline" vc-arch-add-tagline)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78359
diff
changeset
|
606 map)) |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78359
diff
changeset
|
607 |
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78359
diff
changeset
|
608 (defun vc-arch-extra-menu () vc-arch-extra-menu-map) |
99784
248f432fca05
(vc-arch-program): Rename from vc-arch-command, for
Glenn Morris <rgm@gnu.org>
parents:
98776
diff
changeset
|
609 |
78822
1926a08e8926
* vc-arch.el (vc-arch-extra-menu-map): New var and fun.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78359
diff
changeset
|
610 |
74940
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
611 ;;; Less obvious implementations. |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
612 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
84374
diff
changeset
|
613 (defun vc-arch-find-revision (file rev buffer) |
74940
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
614 (let ((out (make-temp-file "vc-out"))) |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
615 (unwind-protect |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
616 (progn |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
617 (with-temp-buffer |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
618 (vc-arch-command (current-buffer) 1 nil "file-diffs" file rev) |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
619 (call-process-region (point-min) (point-max) |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
620 "patch" nil nil nil "-R" "-o" out file)) |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
621 (with-current-buffer buffer |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
622 (insert-file-contents out))) |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
623 (delete-file out)))) |
f0d812b53a76
(vc-arch-find-version): New function.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68651
diff
changeset
|
624 |
54396 | 625 (provide 'vc-arch) |
626 | |
56954
242cddb00aef
(vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56283
diff
changeset
|
627 ;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704 |
54396 | 628 ;;; vc-arch.el ends here |