annotate lisp/vc/vc-mtn.el @ 111449:132f2dfd549f

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 09 Nov 2010 15:07:10 -0500
parents d3584b6b6247
children 417b1e4d63cd
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
1 ;;; vc-mtn.el --- VC backend for Monotone
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
2
106815
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106489
diff changeset
3 ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
4
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
5 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
108971
d928a6a7c3f2 * lisp/finder.el (finder-known-keywords): Add keyword "vc"
Juri Linkov <juri@jurta.org>
parents: 108970
diff changeset
6 ;; Keywords: vc
110015
280c8ae2476d Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents: 108971
diff changeset
7 ;; Package: vc
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
8
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
9 ;; This file is part of GNU Emacs.
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
10
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
11 ;; GNU Emacs is free software: you can redistribute it and/or modify
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
12 ;; 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
13 ;; 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
14 ;; (at your option) any later version.
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
15
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
16 ;; GNU Emacs is distributed in the hope that it will be useful,
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
19 ;; GNU General Public License for more details.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
20
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
21 ;; 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
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
23
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
24 ;;; Commentary:
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
25
108922
05ef9c0de767 * vc-mtn.el (log-edit-extract-headers): Declare function.
Juanma Barranquero <lekktu@gmail.com>
parents: 108913
diff changeset
26 ;;
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
27
96125
673e286487b1 (vc-mtn-log-view-mode): Set log-view-per-file-logs and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
28 ;;; TODO:
673e286487b1 (vc-mtn-log-view-mode): Set log-view-per-file-logs and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
29
673e286487b1 (vc-mtn-log-view-mode): Set log-view-per-file-logs and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
30 ;; - The `previous-version' VC method needs to be supported, 'D' in
673e286487b1 (vc-mtn-log-view-mode): Set log-view-per-file-logs and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
31 ;; log-view-mode uses it.
673e286487b1 (vc-mtn-log-view-mode): Set log-view-per-file-logs and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
32
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
33 ;;; Code:
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
34
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
35 (eval-when-compile (require 'cl) (require 'vc))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
36
99785
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
37 (defcustom vc-mtn-diff-switches t
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
38 "String or list of strings specifying switches for monotone diff under VC.
100182
880b72ca5f06 (vc-mtn-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100058
diff changeset
39 If nil, use the value of `vc-diff-switches'. If t, use no switches."
99785
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
40 :type '(choice (const :tag "Unspecified" nil)
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
41 (const :tag "None" t)
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
42 (string :tag "Argument String")
100182
880b72ca5f06 (vc-mtn-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents: 100058
diff changeset
43 (repeat :tag "Argument List" :value ("") string))
99785
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
44 :version "23.1"
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
45 :group 'vc)
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
46
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
47 (define-obsolete-variable-alias 'vc-mtn-command 'vc-mtn-program "23.1")
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
48 (defcustom vc-mtn-program "mtn"
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
49 "Name of the monotone executable."
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
50 :type 'string
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
51 :group 'vc)
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
52
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
53 ;; Clear up the cache to force vc-call to check again and discover
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
54 ;; new functions when we reload this file.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
55 (put 'Mtn 'vc-functions nil)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
56
99785
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
57 (unless (executable-find vc-mtn-program)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
58 ;; vc-mtn.el is 100% non-functional without the `mtn' executable.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
59 (setq vc-handled-backends (delq 'Mtn vc-handled-backends)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
60
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
61 ;;;###autoload
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
62 (defconst vc-mtn-admin-dir "_MTN")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
63 ;;;###autoload
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
64 (defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format"))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
65
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
66 ;;;###autoload (defun vc-mtn-registered (file)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
67 ;;;###autoload (if (vc-find-root file vc-mtn-admin-format)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
68 ;;;###autoload (progn
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
69 ;;;###autoload (load "vc-mtn")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
70 ;;;###autoload (vc-mtn-registered file))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
71
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
72 (defun vc-mtn-revision-granularity () 'repository)
94563
a0bb8ca25a33 Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 94521
diff changeset
73 (defun vc-mtn-checkout-model (files) 'implicit)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
74
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
75 (defun vc-mtn-root (file)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
76 (setq file (if (file-directory-p file)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
77 (file-name-as-directory file)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
78 (file-name-directory file)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
79 (or (vc-file-getprop file 'vc-mtn-root)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
80 (vc-file-setprop file 'vc-mtn-root
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
81 (vc-find-root file vc-mtn-admin-format))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
82
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
83
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
84 (defun vc-mtn-registered (file)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
85 (let ((root (vc-mtn-root file)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
86 (when root
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
87 (vc-mtn-state file))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
88
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
89 (defun vc-mtn-command (buffer okstatus files &rest flags)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
90 "A wrapper around `vc-do-command' for use in vc-mtn.el."
93564
eeb1bb8489e4 (vc-mtn-command): Avoid localization of messages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93144
diff changeset
91 (let ((process-environment
eeb1bb8489e4 (vc-mtn-command): Avoid localization of messages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93144
diff changeset
92 ;; Avoid localization of messages so we can parse the output.
eeb1bb8489e4 (vc-mtn-command): Avoid localization of messages.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 93144
diff changeset
93 (cons "LC_MESSAGES=C" process-environment)))
99785
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
94 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-mtn-program
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
95 files flags)))
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
96
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
97 (defun vc-mtn-state (file)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
98 ;; If `mtn' fails or returns status>0, or if the search files, just
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
99 ;; return nil.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
100 (ignore-errors
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
101 (with-temp-buffer
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
102 (vc-mtn-command t 0 file "status")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
103 (goto-char (point-min))
93144
33c08cf9fb3a (vc-mtn-state): Support the added state.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92692
diff changeset
104 (re-search-forward
33c08cf9fb3a (vc-mtn-state): Support the added state.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92692
diff changeset
105 "^ \\(?:\\(patched\\)\\|\\(added\\) \\(?:.*\\)\\)\\|no changes$")
33c08cf9fb3a (vc-mtn-state): Support the added state.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92692
diff changeset
106 (cond ((match-end 1) 'edited)
33c08cf9fb3a (vc-mtn-state): Support the added state.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92692
diff changeset
107 ((match-end 2) 'added)
33c08cf9fb3a (vc-mtn-state): Support the added state.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 92692
diff changeset
108 (t 'up-to-date)))))
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
109
103542
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
110 (defun vc-mtn-after-dir-status (update-function)
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
111 (let (result)
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
112 (goto-char (point-min))
111449
132f2dfd549f Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111291
diff changeset
113 (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)" nil t)
103542
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
114 (while (re-search-forward
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
115 "^ \\(?:\\(patched \\)\\|\\(added \\)\\)\\(.*\\)$" nil t)
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
116 (cond ((match-end 1) (push (list (match-string 3) 'edited) result))
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
117 ((match-end 2) (push (list (match-string 3) 'added) result))))
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
118 (funcall update-function result)))
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
119
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
120 (defun vc-mtn-dir-status (dir update-function)
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
121 (vc-mtn-command (current-buffer) 'async dir "status")
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
122 (vc-exec-after
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
123 `(vc-mtn-after-dir-status (quote ,update-function))))
01b5e53f519a (vc-mtn-after-dir-status, vc-mtn-dir-status): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 102812
diff changeset
124
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 78791
diff changeset
125 (defun vc-mtn-working-revision (file)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
126 ;; If `mtn' fails or returns status>0, or if the search fails, just
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
127 ;; return nil.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
128 (ignore-errors
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
129 (with-temp-buffer
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
130 (vc-mtn-command t 0 file "status")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
131 (goto-char (point-min))
111449
132f2dfd549f Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111291
diff changeset
132 (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)")
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
133 (match-string 2))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
134
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
135 (defun vc-mtn-workfile-branch (file)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
136 ;; If `mtn' fails or returns status>0, or if the search files, just
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
137 ;; return nil.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
138 (ignore-errors
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
139 (with-temp-buffer
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
140 (vc-mtn-command t 0 file "status")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
141 (goto-char (point-min))
111449
132f2dfd549f Merge from emacs-23
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 111291
diff changeset
142 (re-search-forward "\\(?:Current b\\|B\\)ranch: *\\(.*\\)\n?\nChanges against parent \\(.*\\)")
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
143 (match-string 1))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
144
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
145 (defun vc-mtn-workfile-unchanged-p (file)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
146 (not (eq (vc-mtn-state file) 'edited)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
147
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
148 ;; Mode-line rewrite code copied from vc-arch.el.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
149
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
150 (defcustom vc-mtn-mode-line-rewrite
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
151 '(("\\`[^:/#]*[:/#]" . "")) ;Drop the host part.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
152 "Rewrite rules to shorten Mtn's revision names on the mode-line."
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
153 :type '(repeat (cons regexp string))
80261
4af0bb174714 * textmodes/css-mode.el (css-indent-offset, css-electric-keys):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 79721
diff changeset
154 :version "22.2"
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
155 :group 'vc)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
156
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
157 (defun vc-mtn-mode-line-string (file)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
158 "Return string for placement in modeline by `vc-mode-line' for FILE."
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
159 (let ((branch (vc-mtn-workfile-branch file)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
160 (dolist (rule vc-mtn-mode-line-rewrite)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
161 (if (string-match (car rule) branch)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
162 (setq branch (replace-match (cdr rule) t nil branch))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
163 (format "Mtn%c%s"
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
164 (case (vc-state file)
94521
2a61c5f918a5 Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 93564
diff changeset
165 ((up-to-date needs-update) ?-)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
166 (added ?@)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
167 (t ?:))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
168 branch)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
169
102812
62b984273010 (vc-mtn-register): Fix optional arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 100908
diff changeset
170 (defun vc-mtn-register (files &optional rev comment)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
171 (vc-mtn-command nil 0 files "add"))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
172
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
173 (defun vc-mtn-responsible-p (file) (vc-mtn-root file))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
174 (defun vc-mtn-could-register (file) (vc-mtn-root file))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
175
108922
05ef9c0de767 * vc-mtn.el (log-edit-extract-headers): Declare function.
Juanma Barranquero <lekktu@gmail.com>
parents: 108913
diff changeset
176 (declare-function log-edit-extract-headers "log-edit" (headers string))
05ef9c0de767 * vc-mtn.el (log-edit-extract-headers): Declare function.
Juanma Barranquero <lekktu@gmail.com>
parents: 108913
diff changeset
177
111291
d3584b6b6247 Remove extra leftover args to vc-*-checkin.
Chong Yidong <cyd@stupidchicken.com>
parents: 110015
diff changeset
178 (defun vc-mtn-checkin (files rev comment)
108913
c05344a913c8 Improve support for special markup in the VC commit message.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107430
diff changeset
179 (apply 'vc-mtn-command nil 0 files
c05344a913c8 Improve support for special markup in the VC commit message.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107430
diff changeset
180 (nconc (list "commit" "-m")
c05344a913c8 Improve support for special markup in the VC commit message.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107430
diff changeset
181 (log-edit-extract-headers '(("Author" . "--author")
c05344a913c8 Improve support for special markup in the VC commit message.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107430
diff changeset
182 ("Date" . "--date"))
c05344a913c8 Improve support for special markup in the VC commit message.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 107430
diff changeset
183 comment))))
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
184
85139
8ba0e30716a5 Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 78791
diff changeset
185 (defun vc-mtn-find-revision (file rev buffer)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
186 (vc-mtn-command buffer 0 file "cat" "-r" rev))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
187
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
188 ;; (defun vc-mtn-checkout (file &optional editable rev)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
189 ;; )
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
190
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
191 (defun vc-mtn-revert (file &optional contents-done)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
192 (unless contents-done
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
193 (vc-mtn-command nil 0 file "revert")))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
194
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
195 ;; (defun vc-mtn-roolback (files)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
196 ;; )
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
197
106472
6e0f1038bc44 Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 106033
diff changeset
198 (defun vc-mtn-print-log (files buffer &optional shortlog start-revision limit)
106033
2bed02fa3041 * vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105011
diff changeset
199 (apply 'vc-mtn-command buffer 0 files "log"
106472
6e0f1038bc44 Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents: 106033
diff changeset
200 (append
106489
d7d82ba7ae74 (vc-mtn-print-log): Fix typo in previous.
Glenn Morris <rgm@gnu.org>
parents: 106472
diff changeset
201 (when start-revision (list "--from" (format "%s" start-revision)))
d7d82ba7ae74 (vc-mtn-print-log): Fix typo in previous.
Glenn Morris <rgm@gnu.org>
parents: 106472
diff changeset
202 (when limit (list "--last" (format "%s" limit))))))
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
203
85478
786d3a985758 * term/x-win.el (x-gtk-stock-map, icon-map-list)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85462
diff changeset
204 (defvar log-view-message-re)
786d3a985758 * term/x-win.el (x-gtk-stock-map, icon-map-list)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85462
diff changeset
205 (defvar log-view-file-re)
786d3a985758 * term/x-win.el (x-gtk-stock-map, icon-map-list)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85462
diff changeset
206 (defvar log-view-font-lock-keywords)
96125
673e286487b1 (vc-mtn-log-view-mode): Set log-view-per-file-logs and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
207 (defvar log-view-per-file-logs)
85478
786d3a985758 * term/x-win.el (x-gtk-stock-map, icon-map-list)
Dan Nicolaescu <dann@ics.uci.edu>
parents: 85462
diff changeset
208
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
209 (define-derived-mode vc-mtn-log-view-mode log-view-mode "Mtn-Log-View"
96125
673e286487b1 (vc-mtn-log-view-mode): Set log-view-per-file-logs and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
210 ;; Don't match anything.
673e286487b1 (vc-mtn-log-view-mode): Set log-view-per-file-logs and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
211 (set (make-local-variable 'log-view-file-re) "\\`a\\`")
673e286487b1 (vc-mtn-log-view-mode): Set log-view-per-file-logs and
Dan Nicolaescu <dann@ics.uci.edu>
parents: 94847
diff changeset
212 (set (make-local-variable 'log-view-per-file-logs) nil)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
213 ;; TODO: Use a more precise regexp than "[ |/]+" to avoid false positives
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
214 ;; in the ChangeLog text.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
215 (set (make-local-variable 'log-view-message-re)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
216 "^[ |/]+Revision: \\([0-9a-f]+\\)")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
217 (require 'add-log) ;For change-log faces.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
218 (set (make-local-variable 'log-view-font-lock-keywords)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
219 (append log-view-font-lock-keywords
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
220 '(("^[ |]+Author: \\(.*\\)" (1 'change-log-email))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
221 ("^[ |]+Date: \\(.*\\)" (1 'change-log-date-face))))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
222
85141
b16f7408cd3f Carry through today's big terminology change to a few places where I
Eric S. Raymond <esr@snark.thyrsus.com>
parents: 85139
diff changeset
223 ;; (defun vc-mtn-show-log-entry (revision)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
224 ;; )
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
225
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
226 (defun vc-mtn-diff (files &optional rev1 rev2 buffer)
99785
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
227 "Get a difference report using monotone between two revisions of FILES."
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
228 (apply 'vc-mtn-command (or buffer "*vc-diff*") 1 files "diff"
99785
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
229 (append
100058
fc3d57499127 (vc-mtn-diff): No need to duplicate vc-switches logic.
Glenn Morris <rgm@gnu.org>
parents: 99785
diff changeset
230 (vc-switches 'mtn 'diff)
99785
0a12c040f6e2 (vc-mtn-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents: 96213
diff changeset
231 (if rev1 (list "-r" rev1)) (if rev2 (list "-r" rev2)))))
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
232
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
233 (defun vc-mtn-annotate-command (file buf &optional rev)
105011
8acc6fb9ffc9 * vc-mtn.el (vc-mtn-annotate-command):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 105010
diff changeset
234 (apply 'vc-mtn-command buf 'async file "annotate"
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
235 (if rev (list "-r" rev))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
236
96213
09da7727f35f * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96125
diff changeset
237 (declare-function vc-annotate-convert-time "vc-annotate" (time))
09da7727f35f * vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents: 96125
diff changeset
238
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
239 (defconst vc-mtn-annotate-full-re
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
240 "^ *\\([0-9a-f]+\\)\\.* by [^ ]+ \\([0-9]+\\)-\\([0-9]+\\)-\\([0-9]+\\): ")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
241 (defconst vc-mtn-annotate-any-re
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
242 (concat "^\\(?: +: \\|" vc-mtn-annotate-full-re "\\)"))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
243
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
244 (defun vc-mtn-annotate-time ()
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
245 (when (looking-at vc-mtn-annotate-any-re)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
246 (goto-char (match-end 0))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
247 (let ((year (match-string 2)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
248 (if (not year)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
249 ;; Look for the date on a previous line.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
250 (save-excursion
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
251 (get-text-property (1- (previous-single-property-change
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
252 (point) 'vc-mtn-time nil (point-min)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
253 'vc-mtn-time))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
254 (let ((time (vc-annotate-convert-time
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
255 (encode-time 0 0 0
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
256 (string-to-number (match-string 4))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
257 (string-to-number (match-string 3))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
258 (string-to-number year)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
259 t))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
260 (let ((inhibit-read-only t)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
261 (inhibit-modification-hooks t))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
262 (put-text-property (match-beginning 0) (match-end 0)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
263 'vc-mtn-time time))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
264 time)))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
265
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
266 (defun vc-mtn-annotate-extract-revision-at-line ()
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
267 (save-excursion
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
268 (when (or (looking-at vc-mtn-annotate-full-re)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
269 (re-search-backward vc-mtn-annotate-full-re nil t))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
270 (match-string 1))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
271
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
272 ;;; Revision completion.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
273
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
274 (defun vc-mtn-list-tags ()
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
275 (with-temp-buffer
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
276 (vc-mtn-command t 0 nil "list" "tags")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
277 (goto-char (point-min))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
278 (let ((tags ()))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
279 (while (re-search-forward "^[^ ]+" nil t)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
280 (push (match-string 0) tags))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
281 tags)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
282
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
283 (defun vc-mtn-list-branches ()
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
284 (with-temp-buffer
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
285 (vc-mtn-command t 0 nil "list" "branches")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
286 (goto-char (point-min))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
287 (let ((branches ()))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
288 (while (re-search-forward "^.+" nil t)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
289 (push (match-string 0) branches))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
290 branches)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
291
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
292 (defun vc-mtn-list-revision-ids (prefix)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
293 (with-temp-buffer
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
294 (vc-mtn-command t 0 nil "complete" "revision" prefix)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
295 (goto-char (point-min))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
296 (let ((ids ()))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
297 (while (re-search-forward "^.+" nil t)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
298 (push (match-string 0) ids))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
299 ids)))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
300
85461
abd6fdb45765 (vc-mtn-revision-completion-table):Make it work when the arg is a list of files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
301 (defun vc-mtn-revision-completion-table (files)
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
302 ;; TODO: Implement completion for for selectors
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
303 ;; TODO: Implement completion for composite selectors.
85461
abd6fdb45765 (vc-mtn-revision-completion-table):Make it work when the arg is a list of files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
304 (lexical-let ((files files))
abd6fdb45765 (vc-mtn-revision-completion-table):Make it work when the arg is a list of files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents: 85141
diff changeset
305 ;; What about using `files'?!? --Stef
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
306 (lambda (string pred action)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
307 (cond
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
308 ;; "Tag" selectors.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
309 ((string-match "\\`t:" string)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
310 (complete-with-action action
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
311 (mapcar (lambda (tag) (concat "t:" tag))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
312 (vc-mtn-list-tags))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
313 string pred))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
314 ;; "Branch" selectors.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
315 ((string-match "\\`b:" string)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
316 (complete-with-action action
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
317 (mapcar (lambda (tag) (concat "b:" tag))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
318 (vc-mtn-list-branches))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
319 string pred))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
320 ;; "Head" selectors. Not sure how they differ from "branch" selectors.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
321 ((string-match "\\`h:" string)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
322 (complete-with-action action
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
323 (mapcar (lambda (tag) (concat "h:" tag))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
324 (vc-mtn-list-branches))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
325 string pred))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
326 ;; "ID" selectors.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
327 ((string-match "\\`i:" string)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
328 (complete-with-action action
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
329 (mapcar (lambda (tag) (concat "i:" tag))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
330 (vc-mtn-list-revision-ids
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
331 (substring string (match-end 0))))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
332 string pred))
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
333 (t
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
334 (complete-with-action action
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
335 '("t:" "b:" "h:" "i:"
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
336 ;; Completion not implemented for these.
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
337 "a:" "c:" "d:" "e:" "l:")
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
338 string pred))))))
94678
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
339
ee5932bf781d Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94563
diff changeset
340
78791
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
341
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
342 (provide 'vc-mtn)
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
343
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
344 ;; arch-tag: 2b89ffbc-cbb8-405a-9080-2eafd4becb70
60dfb3143910 Add vc-mtn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff changeset
345 ;;; vc-mtn.el ends here