Mercurial > emacs
annotate lisp/vc-arch.el @ 63874:56e33caef84f
(occur-1): Do not set the `buffer-read-only' and modified flags for the occur
buffer when no matches are found, because the buffer has already been deleted.
author | Juanma Barranquero <lekktu@gmail.com> |
---|---|
date | Thu, 30 Jun 2005 13:01:26 +0000 |
parents | 8269aa11cce4 |
children | 6fb026ad601f a1b34dec1104 |
rev | line source |
---|---|
54396 | 1 ;;; vc-arch.el --- VC backend for the Arch version-control system |
2 | |
59312
945a627eedd9
(vc-arch-workfile-version): Handle the empty-branch case.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57566
diff
changeset
|
3 ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 |
56954
242cddb00aef
(vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56283
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
54396 | 5 |
6 ;; Author: FSF (see vc.el for full credits) | |
7 ;; Maintainer: Stefan Monnier <monnier@gnu.org> | |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
13 ;; the Free Software Foundation; either version 2, or (at your option) | |
14 ;; any later version. | |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
23 ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, | |
24 ;; Boston, MA 02111-1307, USA. | |
25 | |
26 ;;; Commentary: | |
27 | |
28 ;; 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
|
29 ;; |
54396 | 30 ;; 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
|
31 ;; |
54396 | 32 ;; This is derived from vc-mcvs.el as follows: |
33 ;; - cp vc-mcvs.el vc-arch.el and then M-% mcvs RET arch RET | |
34 ;; | |
35 ;; Then of course started the hacking. | |
36 ;; | |
37 ;; 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
|
38 ;; - 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
|
39 ;; - 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
|
40 ;; - C-x v v to commit a change to a single file. |
54396 | 41 |
42 ;; Bugs: | |
43 | |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
44 ;; - *VC-log*'s initial content lacks the `Summary:' lines. |
54396 | 45 ;; - All files under the tree are considered as "under Arch's control" |
46 ;; without regards to =tagging-method and such. | |
47 ;; - 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
|
48 ;; - C-x v l does not work. |
54396 | 49 ;; - 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
|
50 ;; - 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
|
51 ;; - 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
|
52 ;; - 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
|
53 ;; - C-x v r does not work. |
54396 | 54 ;; - VC-dired does not work. |
55 ;; - And more... | |
56 | |
57 ;;; Code: | |
58 | |
54532
87ca639a4eca
Require CL for `case'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54531
diff
changeset
|
59 (eval-when-compile (require 'vc) (require 'cl)) |
54396 | 60 |
61 ;;; | |
62 ;;; Customization options | |
63 ;;; | |
64 | |
65 (defvar vc-arch-command | |
66 (let ((candidates '("tla"))) | |
67 (while (and candidates (not (executable-find (car candidates)))) | |
68 (setq candidates (cdr candidates))) | |
69 (or (car candidates) "tla"))) | |
70 | |
71 ;; Clear up the cache to force vc-call to check again and discover | |
72 ;; new functions when we reload this file. | |
73 (put 'Arch 'vc-functions nil) | |
74 | |
75 ;;;###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
|
76 ;;;###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
|
77 ;;;###autoload (progn |
7883de80034e
(vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57026
diff
changeset
|
78 ;;;###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
|
79 ;;;###autoload (vc-arch-registered file)))) |
54396 | 80 |
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
|
81 (defun vc-arch-add-tagline () |
54396 | 82 "Add an `arch-tag' to the end of the current file." |
83 (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
|
84 (comment-normalize-vars) |
54396 | 85 (goto-char (point-max)) |
86 (forward-comment -1) | |
87 (unless (bolp) (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
|
88 (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
|
89 (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
|
90 (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
|
91 (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
|
92 (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
|
93 ".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
|
94 (file-name-directory buffer-file-name))))) |
54396 | 95 (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
|
96 (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
|
97 ;; 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
|
98 (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
|
99 (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
|
100 (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
|
101 (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
|
102 (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
|
103 (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
|
104 (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
|
105 (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
|
106 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
|
107 (+ (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
|
108 (buffer-size))))))) |
54396 | 109 (comment-region beg (point)))) |
110 | |
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
|
111 (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
|
112 |
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 (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
|
114 "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
|
115 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
|
116 ;; 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
|
117 (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
|
118 (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
|
119 (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
|
120 (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
|
121 ;; 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
|
122 (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
|
123 (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
|
124 (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
|
125 ;; Check the presence of a tagline. |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
126 (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
|
127 (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
|
128 (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
|
129 (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
|
130 (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
|
131 (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
|
132 (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
|
133 ;; 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
|
134 ;; 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
|
135 (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
|
136 (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
|
137 (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
|
138 (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
|
139 (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
|
140 (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
|
141 (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
|
142 (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
|
143 (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
|
144 (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
|
145 (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
|
146 |
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 (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
|
148 ;; 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
|
149 (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
|
150 (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
|
151 (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
|
152 (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
|
153 (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
|
154 (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
|
155 (looking-at ".*[^ \n\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 (match-string 0))) |
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 (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
|
158 (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
|
159 (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
|
160 (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
|
161 (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
|
162 (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
|
163 (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
|
164 (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
|
165 (concat "./" (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
|
166 |
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 (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
|
168 (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
|
169 (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
|
170 (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
|
171 (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
|
172 (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
|
173 (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
|
174 "^[ \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
|
175 (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
|
176 '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
|
177 |
54396 | 178 (defun vc-arch-root (file) |
179 "Return the root directory of a Arch project, if any." | |
180 (or (vc-file-getprop file 'arch-root) | |
63423
8269aa11cce4
(vc-arch-checkin, vc-arch-diff): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
59444
diff
changeset
|
181 (vc-file-setprop |
57094
7883de80034e
(vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57026
diff
changeset
|
182 ;; Check the =tagging-method, in case someone naively manually |
7883de80034e
(vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57026
diff
changeset
|
183 ;; creates a {arch} directory somewhere. |
7883de80034e
(vc-arch-root, vc-arch-registered): Use vc-find-root.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
57026
diff
changeset
|
184 file 'arch-root (vc-find-root file "{arch}/=tagging-method")))) |
54396 | 185 |
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
|
186 (defun vc-arch-register (file &optional rev comment) |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
187 (if rev (error "Explicit initial revision not supported for Arch")) |
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
|
188 (let ((tagmet (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
|
189 (if (and (memq tagmet '(tagline implicit)) comment-start) |
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 (with-current-buffer (find-file-noselect file) |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
191 (if (buffer-modified-p) |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
192 (error "Save %s first" (buffer-name))) |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
193 (vc-arch-add-tagline) |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
194 (save-buffer)) |
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
|
195 (vc-arch-command nil 0 file "add")))) |
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 |
54396 | 197 (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
|
198 ;; 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
|
199 ;; 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
|
200 ;; 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
|
201 (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
|
202 (vc-arch-file-source-p file))) |
54396 | 203 |
204 (defun vc-arch-default-version (file) | |
205 (or (vc-file-getprop (vc-arch-root file) 'arch-default-version) | |
206 (let* ((root (vc-arch-root file)) | |
207 (f (expand-file-name "{arch}/++default-version" root))) | |
208 (if (file-readable-p f) | |
209 (vc-file-setprop | |
210 root 'arch-default-version | |
211 (with-temp-buffer | |
212 (insert-file-contents f) | |
213 ;; Strip the terminating newline. | |
214 (buffer-substring (point-min) (1- (point-max))))))))) | |
215 | |
54409
a9f1e9611612
(vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54396
diff
changeset
|
216 (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
|
217 "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
|
218 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
|
219 nil) |
a9f1e9611612
(vc-arch-workfile-unchanged-p): Define to avoid dup-diff.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54396
diff
changeset
|
220 |
54396 | 221 (defun vc-arch-state (file) |
222 ;; There's no checkout operation and merging is not done from VC | |
223 ;; so the only operation that's state dependent that VC supports is commit | |
224 ;; 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
|
225 (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
|
226 (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
|
227 (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
|
228 (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
|
229 (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
|
230 (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
|
231 (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
|
232 (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
|
233 (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
|
234 (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
|
235 '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
|
236 (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
|
237 (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
|
238 (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
|
239 (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
|
240 (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
|
241 (save-excursion |
992d9837a265
(vc-arch-state): Fix parsing for `names' method.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56954
diff
changeset
|
242 (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
|
243 ;; 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
|
244 ;; 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
|
245 (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
|
246 ;; 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
|
247 (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
|
248 (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
|
249 ;; 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
|
250 (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
|
251 (subst-char-in-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
|
252 ?/ ?% (vc-arch-workfile-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 '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
|
254 ;; 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
|
255 ;; 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
|
256 '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
|
257 ;; 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
|
258 (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
|
259 "\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
|
260 (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
|
261 ;; 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
|
262 '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
|
263 (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
|
264 (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
|
265 (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
|
266 (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
|
267 '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
|
268 'edited))))))))) |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
269 |
54396 | 270 (defun vc-arch-workfile-version (file) |
271 (let* ((root (expand-file-name "{arch}" (vc-arch-root file))) | |
272 (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
|
273 (when (and defbranch (string-match "\\`\\(.+@[^/\n]+\\)/\\(\\(\\(.*?\\)\\(?:--.*\\)?\\)--.*\\)\\'" defbranch)) |
54396 | 274 (let* ((archive (match-string 1 defbranch)) |
275 (category (match-string 4 defbranch)) | |
276 (branch (match-string 3 defbranch)) | |
277 (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
|
278 (sealed nil) (rev-nb 0) |
54396 | 279 (rev nil) |
280 logdir tmp) | |
281 (setq logdir (expand-file-name category root)) | |
282 (setq logdir (expand-file-name branch logdir)) | |
283 (setq logdir (expand-file-name version logdir)) | |
284 (setq logdir (expand-file-name archive logdir)) | |
285 (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
|
286 (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
|
287 ;; 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
|
288 (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
|
289 (setq sealed t rev-nb 0)) |
54396 | 290 (if (and (string-match "-\\([0-9]+\\)\\'" file) |
291 (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
|
292 (or (not sealed) (eq (aref file 0) ?v)) |
54396 | 293 (>= tmp rev-nb)) |
294 (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
|
295 ;; 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
|
296 ;; 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
|
297 (concat defbranch "--" (or rev "none-000")))))) |
54396 | 298 |
299 | |
300 (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
|
301 '(("\\`.*--\\(.*--.*\\)--\\(v?\\).*-\\([0-9]+\\)\\'" . "\\2\\3[\\1]")) |
54396 | 302 "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
|
303 :type '(repeat (cons regexp string)) |
9d529d2aac14
(vc-arch-mode-line-rewrite): Add :group 'vc.
Kim F. Storm <storm@cua.dk>
parents:
55873
diff
changeset
|
304 :group 'vc) |
54396 | 305 |
306 (defun vc-arch-mode-line-string (file) | |
307 "Return string for placement in modeline by `vc-mode-line' for FILE." | |
308 (let ((rev (vc-workfile-version file))) | |
309 (dolist (rule vc-arch-mode-line-rewrite) | |
310 (if (string-match (car rule) rev) | |
311 (setq rev (replace-match (cdr rule) t nil rev)))) | |
312 (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
|
313 (case (vc-state 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
|
314 ((up-to-date needs-patch) ?-) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
315 (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
|
316 (t ?:)) |
54396 | 317 rev))) |
318 | |
319 (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
|
320 (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
|
321 (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
|
322 (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
|
323 (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
|
324 (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
|
325 (looking-at "Conflicts occured, diff3 conflict markers left in file\\."))))) |
54396 | 326 |
327 (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
|
328 "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
|
329 (save-excursion |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
330 (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
|
331 (when (and buffer-file-name (vc-arch-diff3-rej-p rej)) |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
332 (if (not (re-search-forward "^<<<<<<< " nil t)) |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
333 ;; The .rej file is obsolete. |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
334 (condition-case nil (delete-file rej) (error nil))))))) |
54396 | 335 |
336 (defun vc-arch-find-file-hook () | |
337 (let ((rej (concat buffer-file-name ".rej"))) | |
338 (when (and buffer-file-name (file-exists-p rej)) | |
339 (if (vc-arch-diff3-rej-p rej) | |
340 (save-excursion | |
341 (goto-char (point-min)) | |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
342 (if (not (re-search-forward "^<<<<<<< " nil t)) |
54396 | 343 ;; The .rej file is obsolete. |
344 (condition-case nil (delete-file rej) (error nil)) | |
345 (smerge-mode 1) | |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
346 (add-hook 'after-save-hook |
54396 | 347 'vc-arch-delete-rej-if-obsolete nil t) |
348 (message "There are unresolved conflicts in this file"))) | |
349 (message "There are unresolved conflicts in %s" | |
350 (file-name-nondirectory rej)))))) | |
351 | |
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
|
352 (defun vc-arch-find-file-not-found-hook () |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
353 ;; Do nothing. We are not sure whether the file is `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
|
354 ;; so we shouldn't ask the user whether she wants to check it 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
|
355 ) |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
356 |
54396 | 357 (defun vc-arch-checkout-model (file) 'implicit) |
358 | |
359 (defun vc-arch-checkin (file rev comment) | |
63423
8269aa11cce4
(vc-arch-checkin, vc-arch-diff): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
59444
diff
changeset
|
360 (if rev (error "Committing to a specific revision is unsupported")) |
54415
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
361 (let ((summary (file-relative-name file (vc-arch-root file)))) |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
362 ;; 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
|
363 (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
|
364 (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
|
365 (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
|
366 (setq comment (substring comment (match-end 0)))) |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
367 (vc-arch-command nil 0 file "commit" "-s" summary "-L" comment "--" |
504aef04e493
(vc-arch-workfile-version, vc-arch-mode-line-rewrite):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54409
diff
changeset
|
368 (vc-switches 'Arch 'checkin)))) |
54396 | 369 |
55814
45f2afeb662b
(vc-arch-diff): Add optional `buffer' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54806
diff
changeset
|
370 (defun vc-arch-diff (file &optional oldvers newvers buffer) |
54396 | 371 "Get a difference report using Arch between two versions of 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
|
372 (if (and newvers |
2ae29225b85c
(vc-arch-diff): Handle the special case where `newvers' is equivalent to nil.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54415
diff
changeset
|
373 (vc-up-to-date-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
|
374 (equal newvers (vc-workfile-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
|
375 ;; Newvers is the base revision and the current file is unchanged, |
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 ;; so we can diff with the current 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
|
377 (setq newvers nil)) |
54396 | 378 (if newvers |
63423
8269aa11cce4
(vc-arch-checkin, vc-arch-diff): Follow error conventions.
Juanma Barranquero <lekktu@gmail.com>
parents:
59444
diff
changeset
|
379 (error "Diffing specific revisions not implemented") |
59444
5173e8c74cae
(vc-arch-diff): Don't diff asynchronously if vc-disable-async-diff is
André Spiegel <spiegel@gnu.org>
parents:
59313
diff
changeset
|
380 (let* ((async (and (not vc-disable-async-diff) (fboundp 'start-process))) |
54396 | 381 ;; Run the command from the root dir. |
382 (default-directory (vc-arch-root file)) | |
383 (status | |
384 (vc-arch-command | |
55814
45f2afeb662b
(vc-arch-diff): Add optional `buffer' arg.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54806
diff
changeset
|
385 (or buffer "*vc-diff*") |
54396 | 386 (if async 'async 1) |
387 nil "file-diffs" | |
388 ;; Arch does not support the typical flags. | |
389 ;; (vc-switches 'Arch 'diff) | |
390 (file-relative-name file) | |
391 (if (equal oldvers (vc-workfile-version file)) | |
392 nil | |
393 oldvers)))) | |
394 (if async 1 status)))) ; async diff, pessimistic assumption. | |
395 | |
396 (defun vc-arch-delete-file (file) | |
397 (vc-arch-command nil 0 file "rm")) | |
398 | |
399 (defun vc-arch-rename-file (old new) | |
400 (vc-arch-command nil 0 new "mv" (file-relative-name old))) | |
401 | |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
402 (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
|
403 |
54396 | 404 (defun vc-arch-command (buffer okstatus file &rest flags) |
405 "A wrapper around `vc-do-command' for use in vc-arch.el." | |
406 (apply 'vc-do-command buffer okstatus vc-arch-command file flags)) | |
407 | |
54806
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
408 (defun vc-arch-init-version () nil) |
e16241d08bbc
(vc-arch-root): Be a bit more careful.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
54532
diff
changeset
|
409 |
54396 | 410 (provide 'vc-arch) |
411 | |
56954
242cddb00aef
(vc-arch-workfile-version): Handle the special case before the first commit.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56283
diff
changeset
|
412 ;; arch-tag: a35c7c1c-5237-429d-88ef-3d718fd2e704 |
54396 | 413 ;;; vc-arch.el ends here |