Mercurial > emacs
annotate lisp/vc-svn.el @ 106175:d4ca58110155
* PROBLEMS: Remove fixed rebasing problem.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Fri, 20 Nov 2009 21:46:28 +0000 |
parents | 2df31b09d293 |
children | 6e0f1038bc44 |
rev | line source |
---|---|
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
1 ;;; vc-svn.el --- non-resident support for Subversion version-control |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
2 |
100908 | 3 ;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 |
98519
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
4 ;; Free Software Foundation, Inc. |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
5 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
6 ;; Author: FSF (see vc.el for full credits) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
7 ;; Maintainer: Stefan Monnier <monnier@gnu.org> |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
8 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
9 ;; This file is part of GNU Emacs. |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
10 |
94678
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 |
50818
d3acfb11487e
First cut at vc-svn.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. |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
15 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
19 ;; GNU General Public License for more details. |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
20 |
d3acfb11487e
First cut at vc-svn.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/>. |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
23 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
24 ;;; Commentary: |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
25 |
85122
c2cc930bdd9e
This is the actual fix....
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
26 ;; Sync'd with Subversion's vc-svn.el as of revision 5801. but this version |
c2cc930bdd9e
This is the actual fix....
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85114
diff
changeset
|
27 ;; has been extensively modified since to handle filesets. |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
28 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
29 ;;; Code: |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
30 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
31 (eval-when-compile |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
32 (require 'vc)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
33 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
34 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
35 ;;; Customization options |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
36 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
37 |
99782
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
38 ;; FIXME there is also svnadmin. |
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
39 (defcustom vc-svn-program "svn" |
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
40 "Name of the SVN executable." |
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
41 :type 'string |
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
42 :group 'vc) |
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
43 |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
44 (defcustom vc-svn-global-switches nil |
99782
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
45 "Global switches to pass to any SVN command." |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
46 :type '(choice (const :tag "None" nil) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
47 (string :tag "Argument String") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
48 (repeat :tag "Argument List" |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
49 :value ("") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
50 string)) |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59446
diff
changeset
|
51 :version "22.1" |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
52 :group 'vc) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
53 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
54 (defcustom vc-svn-register-switches nil |
100206
0ae09d7be444
(vc-svn-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents:
100185
diff
changeset
|
55 "Switches for registering a file into SVN. |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
56 A string or list of strings passed to the checkin program by |
100206
0ae09d7be444
(vc-svn-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents:
100185
diff
changeset
|
57 \\[vc-register]. If nil, use the value of `vc-register-switches'. |
0ae09d7be444
(vc-svn-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents:
100185
diff
changeset
|
58 If t, use no switches." |
0ae09d7be444
(vc-svn-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents:
100185
diff
changeset
|
59 :type '(choice (const :tag "Unspecified" nil) |
0ae09d7be444
(vc-svn-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents:
100185
diff
changeset
|
60 (const :tag "None" t) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
61 (string :tag "Argument String") |
100206
0ae09d7be444
(vc-svn-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents:
100185
diff
changeset
|
62 (repeat :tag "Argument List" :value ("") string)) |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59446
diff
changeset
|
63 :version "22.1" |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
64 :group 'vc) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
65 |
52033
9b5f3940a1ef
(vc-svn-diff-switches): Don't default to vc-diff-switches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51732
diff
changeset
|
66 (defcustom vc-svn-diff-switches |
9b5f3940a1ef
(vc-svn-diff-switches): Don't default to vc-diff-switches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51732
diff
changeset
|
67 t ;`svn' doesn't support common args like -c or -b. |
9b5f3940a1ef
(vc-svn-diff-switches): Don't default to vc-diff-switches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51732
diff
changeset
|
68 "String or list of strings specifying extra switches for svn diff under VC. |
100059
18d556e2b8e1
(vc-svn-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
99782
diff
changeset
|
69 If nil, use the value of `vc-diff-switches' (or `diff-switches'), |
18d556e2b8e1
(vc-svn-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
99782
diff
changeset
|
70 together with \"-x --diff-cmd=diff\" (since svn diff does not |
18d556e2b8e1
(vc-svn-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
99782
diff
changeset
|
71 support the default \"-c\" value of `diff-switches'). If you |
18d556e2b8e1
(vc-svn-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
99782
diff
changeset
|
72 want to force an empty list of arguments, use t." |
52033
9b5f3940a1ef
(vc-svn-diff-switches): Don't default to vc-diff-switches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51732
diff
changeset
|
73 :type '(choice (const :tag "Unspecified" nil) |
9b5f3940a1ef
(vc-svn-diff-switches): Don't default to vc-diff-switches.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
51732
diff
changeset
|
74 (const :tag "None" t) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
75 (string :tag "Argument String") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
76 (repeat :tag "Argument List" |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
77 :value ("") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
78 string)) |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59446
diff
changeset
|
79 :version "22.1" |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
80 :group 'vc) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
81 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
82 (defcustom vc-svn-header (or (cdr (assoc 'SVN vc-header-alist)) '("\$Id\$")) |
99782
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
83 "Header keywords to be inserted by `vc-insert-headers'." |
59996
aac0a33f5772
Change release version from 21.4 to 22.1 throughout.
Kim F. Storm <storm@cua.dk>
parents:
59446
diff
changeset
|
84 :version "22.1" |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
85 :type '(repeat string) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
86 :group 'vc) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
87 |
76025
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
88 ;; We want to autoload it for use by the autoloaded version of |
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
89 ;; vc-svn-registered, but we want the value to be compiled at startup, not |
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
90 ;; at dump time. |
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
91 ;; ;;;###autoload |
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
92 (defconst vc-svn-admin-directory |
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
93 (cond ((and (memq system-type '(cygwin windows-nt ms-dos)) |
73848
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
94 (getenv "SVN_ASP_DOT_NET_HACK")) |
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
95 "_svn") |
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
96 (t ".svn")) |
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
97 "The name of the \".svn\" subdirectory or its equivalent.") |
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
98 |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
99 ;;; Properties of the backend |
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
100 |
94563
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94521
diff
changeset
|
101 (defun vc-svn-revision-granularity () 'repository) |
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94521
diff
changeset
|
102 (defun vc-svn-checkout-model (files) 'implicit) |
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94521
diff
changeset
|
103 |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
104 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
105 ;;; State-querying functions |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
106 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
107 |
73848
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
108 ;;; vc-svn-admin-directory is generally not defined when the |
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
109 ;;; autoloaded function is called. |
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
110 |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
111 ;;;###autoload (defun vc-svn-registered (f) |
73848
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
112 ;;;###autoload (let ((admin-dir (cond ((and (eq system-type 'windows-nt) |
76025
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
113 ;;;###autoload (getenv "SVN_ASP_DOT_NET_HACK")) |
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
114 ;;;###autoload "_svn") |
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
115 ;;;###autoload (t ".svn")))) |
73848
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
116 ;;;###autoload (when (file-readable-p (expand-file-name |
76025
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
117 ;;;###autoload (concat admin-dir "/entries") |
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
118 ;;;###autoload (file-name-directory f))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
119 ;;;###autoload (load "vc-svn") |
73848
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
120 ;;;###autoload (vc-svn-registered f)))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
121 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
122 (defun vc-svn-registered (file) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
123 "Check if FILE is SVN registered." |
73848
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
124 (when (file-readable-p (expand-file-name (concat vc-svn-admin-directory |
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
125 "/entries") |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
126 (file-name-directory file))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
127 (with-temp-buffer |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
128 (cd (file-name-directory file)) |
104600
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
129 (let* (process-file-side-effects |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
130 (status |
67553
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
131 (condition-case nil |
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
132 ;; Ignore all errors. |
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
133 (vc-svn-command t t file "status" "-v") |
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
134 ;; Some problem happened. E.g. We can't find an `svn' |
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
135 ;; executable. We used to only catch `file-error' but when |
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
136 ;; the process is run on a remote host via Tramp, the error |
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
137 ;; is only reported via the exit status which is turned into |
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
138 ;; an `error' by vc-do-command. |
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
139 (error nil)))) |
10707dfc70f3
(vc-svn-registered): Use it to avoid popping up a spurious
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
67547
diff
changeset
|
140 (when (eq 0 status) |
87864
54863df609a3
(vc-svn-registered): Make it work for non-existent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87853
diff
changeset
|
141 (let ((parsed (vc-svn-parse-status file))) |
54863df609a3
(vc-svn-registered): Make it work for non-existent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87853
diff
changeset
|
142 (and parsed (not (memq parsed '(ignored unregistered)))))))))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
143 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
144 (defun vc-svn-state (file &optional localp) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
145 "SVN-specific version of `vc-state'." |
104600
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
146 (let (process-file-side-effects) |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
147 (setq localp (or localp (vc-stay-local-p file 'SVN))) |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
148 (with-temp-buffer |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
149 (cd (file-name-directory file)) |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
150 (vc-svn-command t 0 file "status" (if localp "-v" "-u")) |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
151 (vc-svn-parse-status file)))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
152 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
153 (defun vc-svn-state-heuristic (file) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
154 "SVN-specific state heuristic." |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
155 (vc-svn-state file 'local)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
156 |
98519
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
157 ;; FIXME it would be better not to have the "remote" argument, |
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
158 ;; but to distinguish the two output formats based on content. |
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
159 (defun vc-svn-after-dir-status (callback &optional remote) |
87853
cec6a1fe32a4
* vc-svn.el (vc-svn-after-dir-status): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87845
diff
changeset
|
160 (let ((state-map '((?A . added) |
94006
a4655455212b
(vc-svn-after-dir-status): Complete last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
161 (?C . conflict) |
a4655455212b
(vc-svn-after-dir-status): Complete last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
162 (?I . ignored) |
a4655455212b
(vc-svn-after-dir-status): Complete last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
163 (?M . edited) |
103154
276b0724ed86
(vc-svn-parse-status): Accept ?D for removed files (bug#3213).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102974
diff
changeset
|
164 (?D . removed) |
94006
a4655455212b
(vc-svn-after-dir-status): Complete last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
165 (?R . removed) |
a4655455212b
(vc-svn-after-dir-status): Complete last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
166 (?? . unregistered) |
a4655455212b
(vc-svn-after-dir-status): Complete last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
167 ;; This is what vc-svn-parse-status does. |
a4655455212b
(vc-svn-after-dir-status): Complete last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
168 (?~ . edited))) |
102974
04e540897dd1
(vc-svn-after-dir-status): Fix regexp to allow for
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101925
diff
changeset
|
169 (re (if remote "^\\(.\\)..... \\([ *]\\) +\\(?:[-0-9]+\\)? \\(.*\\)$" |
98519
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
170 ;; Subexp 2 is a dummy in this case, so the numbers match. |
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
171 "^\\(.\\)....\\(.\\) \\(.*\\)$")) |
87853
cec6a1fe32a4
* vc-svn.el (vc-svn-after-dir-status): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87845
diff
changeset
|
172 result) |
cec6a1fe32a4
* vc-svn.el (vc-svn-after-dir-status): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87845
diff
changeset
|
173 (goto-char (point-min)) |
98519
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
174 (while (re-search-forward re nil t) |
87853
cec6a1fe32a4
* vc-svn.el (vc-svn-after-dir-status): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87845
diff
changeset
|
175 (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) |
98519
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
176 (filename (match-string 3))) |
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
177 (and remote (string-equal (match-string 2) "*") |
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
178 ;; FIXME are there other possible combinations? |
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
179 (cond ((eq state 'edited) (setq state 'needs-merge)) |
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
180 ((not state) (setq state 'needs-update)))) |
102974
04e540897dd1
(vc-svn-after-dir-status): Fix regexp to allow for
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101925
diff
changeset
|
181 (when (and state (not (string= "." filename))) |
93461
3afeea9a48a3
* vc.el (vc-status-add-entry): Assume ENTRY is a list not a cons.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93382
diff
changeset
|
182 (setq result (cons (list filename state) result))))) |
94006
a4655455212b
(vc-svn-after-dir-status): Complete last change.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94003
diff
changeset
|
183 (funcall callback result))) |
87853
cec6a1fe32a4
* vc-svn.el (vc-svn-after-dir-status): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87845
diff
changeset
|
184 |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93956
diff
changeset
|
185 (defun vc-svn-dir-status (dir callback) |
87853
cec6a1fe32a4
* vc-svn.el (vc-svn-after-dir-status): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87845
diff
changeset
|
186 "Run 'svn status' for DIR and update BUFFER via CALLBACK. |
cec6a1fe32a4
* vc-svn.el (vc-svn-after-dir-status): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87845
diff
changeset
|
187 CALLBACK is called as (CALLBACK RESULT BUFFER), where |
cec6a1fe32a4
* vc-svn.el (vc-svn-after-dir-status): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87845
diff
changeset
|
188 RESULT is a list of conses (FILE . STATE) for directory DIR." |
98519
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
189 ;; FIXME should this rather be all the files in dir? |
101713
6bc8fe0c390a
(vc-svn-dir-status): Disable the vc-stay-local-p
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101669
diff
changeset
|
190 ;; FIXME: the vc-stay-local-p logic below is disabled, it ends up |
6bc8fe0c390a
(vc-svn-dir-status): Disable the vc-stay-local-p
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101669
diff
changeset
|
191 ;; calling synchronously (vc-svn-registered DIR) => calling svn status -v DIR |
6bc8fe0c390a
(vc-svn-dir-status): Disable the vc-stay-local-p
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101669
diff
changeset
|
192 ;; which is VERY SLOW for big trees and it makes emacs |
6bc8fe0c390a
(vc-svn-dir-status): Disable the vc-stay-local-p
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101669
diff
changeset
|
193 ;; completely unresponsive during that time. |
103553
af4ee0cb7fb7
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103154
diff
changeset
|
194 (let* ((local (and nil (vc-stay-local-p dir 'SVN))) |
101713
6bc8fe0c390a
(vc-svn-dir-status): Disable the vc-stay-local-p
Dan Nicolaescu <dann@ics.uci.edu>
parents:
101669
diff
changeset
|
195 (remote (or t (not local) (eq local 'only-file)))) |
98519
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
196 (vc-svn-command (current-buffer) 'async nil "status" |
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
197 (if remote "-u")) |
93382
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93124
diff
changeset
|
198 (vc-exec-after |
98519
4031fe2e11ee
(vc-svn-after-dir-status): Handle `svn status -u' output.
Glenn Morris <rgm@gnu.org>
parents:
98495
diff
changeset
|
199 `(vc-svn-after-dir-status (quote ,callback) ,remote)))) |
87845
800f4ac6c848
* vc-svn.el (vc-svn-dir-status): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87785
diff
changeset
|
200 |
98495
e8a025cdac4a
* vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98086
diff
changeset
|
201 (defun vc-svn-dir-status-files (dir files default-state callback) |
e8a025cdac4a
* vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98086
diff
changeset
|
202 (apply 'vc-svn-command (current-buffer) 'async nil "status" files) |
e8a025cdac4a
* vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98086
diff
changeset
|
203 (vc-exec-after |
e8a025cdac4a
* vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98086
diff
changeset
|
204 `(vc-svn-after-dir-status (quote ,callback)))) |
e8a025cdac4a
* vc-svn.el (vc-svn-dir-status-files):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98086
diff
changeset
|
205 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98675
diff
changeset
|
206 (defun vc-svn-dir-extra-headers (dir) |
95048
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
207 "Generate extra status headers for a Subversion working copy." |
104600
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
208 (let (process-file-side-effects) |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
209 (vc-svn-command "*vc*" 0 nil "info")) |
95048
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
210 (let ((repo |
96003
243cf028ce86
(log-view-per-file-logs): Pacify byte compiler.
Juanma Barranquero <lekktu@gmail.com>
parents:
95966
diff
changeset
|
211 (save-excursion |
95048
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
212 (and (progn |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
213 (set-buffer "*vc*") |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
214 (goto-char (point-min)) |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
215 (re-search-forward "Repository Root: *\\(.*\\)" nil t)) |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
216 (match-string 1))))) |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
217 (concat |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
218 (cond (repo |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
219 (concat |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
220 (propertize "Repository : " 'face 'font-lock-type-face) |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
221 (propertize repo 'face 'font-lock-variable-name-face))) |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
222 (t ""))))) |
883c17cb4544
Add extra-headers method for SVN.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
95020
diff
changeset
|
223 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
224 (defun vc-svn-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
225 "SVN-specific version of `vc-working-revision'." |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
226 ;; There is no need to consult RCS headers under SVN, because we |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
227 ;; get the workfile version for free when we recognize that a file |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
228 ;; is registered in SVN. |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
229 (vc-svn-registered file) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
230 (vc-file-getprop file 'vc-working-revision)) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
231 |
51732
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
232 ;; vc-svn-mode-line-string doesn't exist because the default implementation |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
233 ;; works just fine. |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
234 |
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
|
235 (defun vc-svn-previous-revision (file rev) |
68653
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
236 (let ((newrev (1- (string-to-number rev)))) |
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
237 (when (< 0 newrev) |
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
238 (number-to-string newrev)))) |
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
239 |
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
|
240 (defun vc-svn-next-revision (file rev) |
68653
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
241 (let ((newrev (1+ (string-to-number rev)))) |
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
|
242 ;; The "working revision" is an uneasy conceptual fit under Subversion; |
68653
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
243 ;; we use it as the upper bound until a better idea comes along. If the |
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
244 ;; workfile version W coincides with the tree's latest revision R, then |
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
245 ;; this check prevents a "no such revision: R+1" error. Otherwise, it |
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
246 ;; inhibits showing of W+1 through R, which could be considered anywhere |
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
247 ;; from gracious to impolite. |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
248 (unless (< (string-to-number (vc-file-getprop file 'vc-working-revision)) |
68653
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
249 newrev) |
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
250 (number-to-string newrev)))) |
61cc95860e05
(vc-svn-previous-version, vc-svn-next-version): New funcs.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
68651
diff
changeset
|
251 |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
252 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
253 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
254 ;;; State-changing functions |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
255 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
256 |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
257 (defun vc-svn-create-repo () |
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
258 "Create a new SVN repository." |
94847
5e64dca662f0
Remove assumption about what nil means as a first arument to vc-do-command.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94806
diff
changeset
|
259 (vc-do-command "*vc*" 0 "svnadmin" '("create" "SVN")) |
99782
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
260 (vc-do-command "*vc*" 0 vc-svn-program '(".") |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
261 "checkout" (concat "file://" default-directory "SVN"))) |
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
262 |
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
263 (defun vc-svn-register (files &optional rev comment) |
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
264 "Register FILES into the SVN version-control system. |
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
265 The COMMENT argument is ignored This does an add but not a commit. |
100206
0ae09d7be444
(vc-svn-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents:
100185
diff
changeset
|
266 Passes either `vc-svn-register-switches' or `vc-register-switches' |
0ae09d7be444
(vc-svn-register-switches): Doc fix. Add t as option.
Glenn Morris <rgm@gnu.org>
parents:
100185
diff
changeset
|
267 to the SVN command." |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
268 (apply 'vc-svn-command nil 0 files "add" (vc-switches 'SVN 'register))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
269 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
270 (defun vc-svn-responsible-p (file) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
271 "Return non-nil if SVN thinks it is responsible for FILE." |
73848
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
272 (file-directory-p (expand-file-name vc-svn-admin-directory |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
273 (if (file-directory-p file) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
274 file |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
275 (file-name-directory file))))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
276 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
277 (defalias 'vc-svn-could-register 'vc-svn-responsible-p |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
278 "Return non-nil if FILE could be registered in SVN. |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
279 This is only possible if SVN is responsible for FILE's directory.") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
280 |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
281 (defun vc-svn-checkin (files rev comment) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
282 "SVN-specific version of `vc-backend-checkin'." |
91989
582312e95923
(vc-svn-program): Fix typo in docstring.
Juanma Barranquero <lekktu@gmail.com>
parents:
91979
diff
changeset
|
283 (if rev (error "Committing to a specific revision is unsupported in SVN")) |
55900
d8a2b8a11274
2004-06-03 Karl Fogel <kfogel@red-bean.com>
Karl Fogel <kfogel@red-bean.com>
parents:
55004
diff
changeset
|
284 (let ((status (apply |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
285 'vc-svn-command nil 1 files "ci" |
55900
d8a2b8a11274
2004-06-03 Karl Fogel <kfogel@red-bean.com>
Karl Fogel <kfogel@red-bean.com>
parents:
55004
diff
changeset
|
286 (nconc (list "-m" comment) (vc-switches 'SVN 'checkin))))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
287 (set-buffer "*vc*") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
288 (goto-char (point-min)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
289 (unless (equal status 0) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
290 ;; Check checkin problem. |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
291 (cond |
50900
d853a98e1678
(vc-svn-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50823
diff
changeset
|
292 ((search-forward "Transaction is out of date" nil t) |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
293 (mapc (lambda (file) (vc-file-setprop file 'vc-state 'needs-merge)) |
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
294 files) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
295 (error (substitute-command-keys |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
296 (concat "Up-to-date check failed: " |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
297 "type \\[vc-next-action] to merge in changes")))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
298 (t |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
299 (pop-to-buffer (current-buffer)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
300 (goto-char (point-min)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
301 (shrink-window-if-larger-than-buffer) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
302 (error "Check-in failed")))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
303 ;; Update file properties |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
304 ;; (vc-file-setprop |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
305 ;; file 'vc-working-revision |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
306 ;; (vc-parse-buffer "^\\(new\\|initial\\) revision: \\([0-9.]+\\)" 2)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
307 )) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
308 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
309 (defun vc-svn-find-revision (file rev buffer) |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
310 "SVN-specific retrieval of a specified version into a buffer." |
104600
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
311 (let (process-file-side-effects) |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
312 (apply 'vc-svn-command |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
313 buffer 0 file |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
314 "cat" |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
315 (and rev (not (string= rev "")) |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
316 (concat "-r" rev)) |
2209bd027daa
(vc-svn-dir-extra-headers, vc-svn-find-revision):
Michael Albinus <michael.albinus@gmx.de>
parents:
103553
diff
changeset
|
317 (vc-switches 'SVN 'checkout)))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
318 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
319 (defun vc-svn-checkout (file &optional editable rev) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
320 (message "Checking out %s..." file) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
321 (with-current-buffer (or (get-file-buffer file) (current-buffer)) |
94805
89d37b54b964
* vc.el (vc-mark-resolved): Add `backend' argument.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
94729
diff
changeset
|
322 (vc-svn-update file editable rev (vc-switches 'SVN 'checkout))) |
103553
af4ee0cb7fb7
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103154
diff
changeset
|
323 (vc-mode-line file 'SVN) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
324 (message "Checking out %s...done" file)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
325 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
326 (defun vc-svn-update (file editable rev switches) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
327 (if (and (file-exists-p file) (not rev)) |
76025
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
328 ;; If no revision was specified, there's nothing to do. |
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
329 nil |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
330 ;; Check out a particular version (or recreate the file). |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
331 (vc-file-setprop file 'vc-working-revision nil) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
332 (apply 'vc-svn-command nil 0 file |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
333 "update" |
51732
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
334 (cond |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
335 ((null rev) "-rBASE") |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
336 ((or (eq rev t) (equal rev "")) nil) |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
337 (t (concat "-r" rev))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
338 switches))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
339 |
50999
c09edac18f97
(completion-ignored-extensions): Add .svn.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50927
diff
changeset
|
340 (defun vc-svn-delete-file (file) |
c09edac18f97
(completion-ignored-extensions): Add .svn.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50927
diff
changeset
|
341 (vc-svn-command nil 0 file "remove")) |
c09edac18f97
(completion-ignored-extensions): Add .svn.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50927
diff
changeset
|
342 |
50922
bdc62a6694f7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50900
diff
changeset
|
343 (defun vc-svn-rename-file (old new) |
bdc62a6694f7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50900
diff
changeset
|
344 (vc-svn-command nil 0 new "move" (file-relative-name old))) |
bdc62a6694f7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50900
diff
changeset
|
345 |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
346 (defun vc-svn-revert (file &optional contents-done) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
347 "Revert FILE to the version it was based on." |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
348 (unless contents-done |
76025
a4103f62dec5
Remove the code inherited from CVSREAD and `cvs edit'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75719
diff
changeset
|
349 (vc-svn-command nil 0 file "revert"))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
350 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
351 (defun vc-svn-merge (file first-version &optional second-version) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
352 "Merge changes into current working copy of FILE. |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
353 The changes are between FIRST-VERSION and SECOND-VERSION." |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
354 (vc-svn-command nil 0 file |
50822
0be6233722ec
(vc-svn-merge): First attempt.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50821
diff
changeset
|
355 "merge" |
50823
83c8010f1eb2
(vc-svn-merge): Forgot quotes.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50822
diff
changeset
|
356 "-r" (if second-version |
50822
0be6233722ec
(vc-svn-merge): First attempt.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50821
diff
changeset
|
357 (concat first-version ":" second-version) |
0be6233722ec
(vc-svn-merge): First attempt.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50821
diff
changeset
|
358 first-version)) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
359 (vc-file-setprop file 'vc-state 'edited) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
360 (with-current-buffer (get-buffer "*vc*") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
361 (goto-char (point-min)) |
50822
0be6233722ec
(vc-svn-merge): First attempt.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50821
diff
changeset
|
362 (if (looking-at "C ") |
0be6233722ec
(vc-svn-merge): First attempt.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50821
diff
changeset
|
363 1 ; signal conflict |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
364 0))) ; signal success |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
365 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
366 (defun vc-svn-merge-news (file) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
367 "Merge in any new changes made to FILE." |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
368 (message "Merging changes into %s..." file) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
369 ;; (vc-file-setprop file 'vc-working-revision nil) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
370 (vc-file-setprop file 'vc-checkout-time 0) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
371 (vc-svn-command nil 0 file "update") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
372 ;; Analyze the merge result reported by SVN, and set |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
373 ;; file properties accordingly. |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
374 (with-current-buffer (get-buffer "*vc*") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
375 (goto-char (point-min)) |
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
|
376 ;; get new working revision |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
377 (if (re-search-forward |
50821
33e415a24bb5
(vc-svn-merge-news): Adjust for subversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50820
diff
changeset
|
378 "^\\(Updated to\\|At\\) revision \\([0-9]+\\)" nil t) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
379 (vc-file-setprop file 'vc-working-revision (match-string 2)) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
85122
diff
changeset
|
380 (vc-file-setprop file 'vc-working-revision nil)) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
381 ;; get file status |
50821
33e415a24bb5
(vc-svn-merge-news): Adjust for subversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50820
diff
changeset
|
382 (goto-char (point-min)) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
383 (prog1 |
50821
33e415a24bb5
(vc-svn-merge-news): Adjust for subversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50820
diff
changeset
|
384 (if (looking-at "At revision") |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
385 0 ;; there were no news; indicate success |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
386 (if (re-search-forward |
75719
a8fd93a515a2
(vc-svn-merge-news): Understand the new format with two
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75233
diff
changeset
|
387 ;; Newer SVN clients have 3 columns of chars (one for the |
a8fd93a515a2
(vc-svn-merge-news): Understand the new format with two
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75233
diff
changeset
|
388 ;; file's contents, then second for its properties, and the |
a8fd93a515a2
(vc-svn-merge-news): Understand the new format with two
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75233
diff
changeset
|
389 ;; third for lock-grabbing info), before the 2 spaces. |
a8fd93a515a2
(vc-svn-merge-news): Understand the new format with two
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75233
diff
changeset
|
390 ;; We also used to match the filename in column 0 without any |
a8fd93a515a2
(vc-svn-merge-news): Understand the new format with two
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75233
diff
changeset
|
391 ;; meta-info before it, but I believe this can never happen. |
a8fd93a515a2
(vc-svn-merge-news): Understand the new format with two
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75233
diff
changeset
|
392 (concat "^\\(\\([ACGDU]\\)\\(.[B ]\\)? \\)" |
50821
33e415a24bb5
(vc-svn-merge-news): Adjust for subversion.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50820
diff
changeset
|
393 (regexp-quote (file-name-nondirectory file))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
394 nil t) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
395 (cond |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
396 ;; Merge successful, we are in sync with repository now |
75719
a8fd93a515a2
(vc-svn-merge-news): Understand the new format with two
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75233
diff
changeset
|
397 ((string= (match-string 2) "U") |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
398 (vc-file-setprop file 'vc-state 'up-to-date) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
399 (vc-file-setprop file 'vc-checkout-time |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
400 (nth 5 (file-attributes file))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
401 0);; indicate success to the caller |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
402 ;; Merge successful, but our own changes are still in the file |
75719
a8fd93a515a2
(vc-svn-merge-news): Understand the new format with two
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
75233
diff
changeset
|
403 ((string= (match-string 2) "G") |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
404 (vc-file-setprop file 'vc-state 'edited) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
405 0);; indicate success to the caller |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
406 ;; Conflicts detected! |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
407 (t |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
408 (vc-file-setprop file 'vc-state 'edited) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
409 1);; signal the error to the caller |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
410 ) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
411 (pop-to-buffer "*vc*") |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
412 (error "Couldn't analyze svn update result"))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
413 (message "Merging changes into %s...done" file)))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
414 |
87518
78fc69cc7bef
* vc-svn.el (vc-svn-modify-change comment): New function.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87514
diff
changeset
|
415 (defun vc-svn-modify-change-comment (files rev comment) |
78fc69cc7bef
* vc-svn.el (vc-svn-modify-change comment): New function.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87514
diff
changeset
|
416 "Modify the change comments for a specified REV. |
78fc69cc7bef
* vc-svn.el (vc-svn-modify-change comment): New function.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87514
diff
changeset
|
417 You must have ssh access to the repository host, and the directory Emacs |
100144 | 418 uses locally for temp files must also be writable by you on that host. |
93886
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
419 This is only supported if the repository access method is either file:// |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
420 or svn+ssh://." |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
421 (let (tempfile host remotefile directory fileurl-p) |
87518
78fc69cc7bef
* vc-svn.el (vc-svn-modify-change comment): New function.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87514
diff
changeset
|
422 (with-temp-buffer |
99782
6be2d2932794
Remove leading `*' from defcustom doc-strings.
Glenn Morris <rgm@gnu.org>
parents:
99248
diff
changeset
|
423 (vc-do-command (current-buffer) 0 vc-svn-program nil "info") |
93886
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
424 (goto-char (point-min)) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
425 (unless (re-search-forward "Repository Root: \\(file://\\(/.*\\)\\)\\|\\(svn\\+ssh://\\([^/]+\\)\\(/.*\\)\\)" nil t) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
426 (error "Repository information is unavailable")) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
427 (if (match-string 1) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
428 (progn |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
429 (setq fileurl-p t) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
430 (setq directory (match-string 2))) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
431 (setq host (match-string 4)) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
432 (setq directory (match-string 5)) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
433 (setq remotefile (concat host ":" tempfile)))) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
434 (with-temp-file (setq tempfile (make-temp-file user-mail-address)) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
435 (insert comment)) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
436 (if fileurl-p |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
437 ;; Repository Root is a local file. |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
438 (progn |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
439 (unless (vc-do-command |
94847
5e64dca662f0
Remove assumption about what nil means as a first arument to vc-do-command.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94806
diff
changeset
|
440 "*vc*" 0 "svnadmin" nil |
96003
243cf028ce86
(log-view-per-file-logs): Pacify byte compiler.
Juanma Barranquero <lekktu@gmail.com>
parents:
95966
diff
changeset
|
441 "setlog" "--bypass-hooks" directory |
93886
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
442 "-r" rev (format "%s" tempfile)) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
443 (error "Log edit failed")) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
444 (delete-file tempfile)) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
445 |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
446 ;; Remote repository, using svn+ssh. |
94847
5e64dca662f0
Remove assumption about what nil means as a first arument to vc-do-command.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94806
diff
changeset
|
447 (unless (vc-do-command "*vc*" 0 "scp" nil "-q" tempfile remotefile) |
93886
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
448 (error "Copy of comment to %s failed" remotefile)) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
449 (unless (vc-do-command |
94847
5e64dca662f0
Remove assumption about what nil means as a first arument to vc-do-command.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94806
diff
changeset
|
450 "*vc*" 0 "ssh" nil "-q" host |
93886
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
451 (format "svnadmin setlog --bypass-hooks %s -r %s %s; rm %s" |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
452 directory rev tempfile tempfile)) |
ed131d081eab
(vc-svn-modify-change-comment): Add support for the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
453 (error "Log edit failed"))))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
454 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
455 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
456 ;;; History functions |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
457 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
458 |
96003
243cf028ce86
(log-view-per-file-logs): Pacify byte compiler.
Juanma Barranquero <lekktu@gmail.com>
parents:
95966
diff
changeset
|
459 (defvar log-view-per-file-logs) |
243cf028ce86
(log-view-per-file-logs): Pacify byte compiler.
Juanma Barranquero <lekktu@gmail.com>
parents:
95966
diff
changeset
|
460 |
95966
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95048
diff
changeset
|
461 (define-derived-mode vc-svn-log-view-mode log-view-mode "SVN-Log-View" |
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95048
diff
changeset
|
462 (require 'add-log) |
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95048
diff
changeset
|
463 (set (make-local-variable 'log-view-per-file-logs) nil)) |
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95048
diff
changeset
|
464 |
106033
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105011
diff
changeset
|
465 (defun vc-svn-print-log (files buffer &optional shortlog limit) |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
466 "Get change log(s) associated with FILES." |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
467 (save-current-buffer |
55004
ae9b6f1e3bdf
(vc-svn-print-log, vc-svn-diff): Add optional BUFFER arg.
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
468 (vc-setup-buffer buffer) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
469 (let ((inhibit-read-only t)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
470 (goto-char (point-min)) |
87426
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
471 (if files |
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
472 (dolist (file files) |
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
473 (insert "Working file: " file "\n") |
106033
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105011
diff
changeset
|
474 (apply |
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105011
diff
changeset
|
475 'vc-svn-command |
87426
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
476 buffer |
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
477 'async |
103553
af4ee0cb7fb7
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103154
diff
changeset
|
478 ;; (if (and (= (length files) 1) (vc-stay-local-p file 'SVN)) 'async 0) |
87426
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
479 (list file) |
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
480 "log" |
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
481 ;; By default Subversion only shows the log up to the |
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
482 ;; working revision, whereas we also want the log of the |
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
483 ;; subsequent commits. At least that's what the |
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
484 ;; vc-cvs.el code does. |
106033
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105011
diff
changeset
|
485 "-rHEAD:0" |
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105011
diff
changeset
|
486 (when limit (list "-l" (format "%s" limit))))) |
87426
47c02bd68801
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87424
diff
changeset
|
487 ;; Dump log for the entire directory. |
106082
2df31b09d293
(vc-svn-print-log): Fix typo in previous.
Glenn Morris <rgm@gnu.org>
parents:
106033
diff
changeset
|
488 (apply 'vc-svn-command buffer 0 nil "log" "-rHEAD:0" |
106033
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105011
diff
changeset
|
489 (when limit (list "-l" (format "%s" limit)))))))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
490 |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
491 (defun vc-svn-diff (files &optional oldvers newvers buffer) |
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
|
492 "Get a difference report using SVN between two revisions of fileset FILES." |
101796
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
493 (and oldvers |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
494 (not newvers) |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
495 files |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
496 (catch 'no |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
497 (dolist (f files) |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
498 (or (equal oldvers (vc-working-revision f)) |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
499 (throw 'no nil))) |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
500 t) |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
501 ;; Use nil rather than the current revision because svn handles |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
502 ;; it better (i.e. locally). Note that if _any_ of the files |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
503 ;; has a different revision, we fetch the lot, which is |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
504 ;; obviously sub-optimal. |
0dd7b7766a85
(vc-svn-diff): Revert previous change but add a test
Nick Roberts <nickrob@snap.net.nz>
parents:
101713
diff
changeset
|
505 (setq oldvers nil)) |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
506 (let* ((switches |
56777
332e641fe2b1
(vc-svn-diff): Treat options from vc-svn-diff-switches and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55900
diff
changeset
|
507 (if vc-svn-diff-switches |
332e641fe2b1
(vc-svn-diff): Treat options from vc-svn-diff-switches and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55900
diff
changeset
|
508 (vc-switches 'SVN 'diff) |
100059
18d556e2b8e1
(vc-svn-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
99782
diff
changeset
|
509 (list "--diff-cmd=diff" "-x" |
18d556e2b8e1
(vc-svn-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
99782
diff
changeset
|
510 (mapconcat 'identity (vc-switches nil 'diff) " ")))) |
59446
1ba18e657796
(vc-svn-diff): Don't diff asynchronously if vc-disable-async-diff is
André Spiegel <spiegel@gnu.org>
parents:
59317
diff
changeset
|
511 (async (and (not vc-disable-async-diff) |
103553
af4ee0cb7fb7
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103154
diff
changeset
|
512 (vc-stay-local-p files 'SVN) |
86002
613df1ba1584
* vc.el (vc-diff-internal): Make the *vc-diff* buffer read only.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85462
diff
changeset
|
513 (or oldvers newvers)))) ; Svn diffs those locally. |
55004
ae9b6f1e3bdf
(vc-svn-print-log, vc-svn-diff): Add optional BUFFER arg.
Juanma Barranquero <lekktu@gmail.com>
parents:
52401
diff
changeset
|
514 (apply 'vc-svn-command buffer |
50922
bdc62a6694f7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50900
diff
changeset
|
515 (if async 'async 0) |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
516 files "diff" |
50922
bdc62a6694f7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50900
diff
changeset
|
517 (append |
56777
332e641fe2b1
(vc-svn-diff): Treat options from vc-svn-diff-switches and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55900
diff
changeset
|
518 switches |
50922
bdc62a6694f7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50900
diff
changeset
|
519 (when oldvers |
bdc62a6694f7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50900
diff
changeset
|
520 (list "-r" (if newvers (concat oldvers ":" newvers) |
bdc62a6694f7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50900
diff
changeset
|
521 oldvers))))) |
50900
d853a98e1678
(vc-svn-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50823
diff
changeset
|
522 (if async 1 ; async diff => pessimistic assumption |
d853a98e1678
(vc-svn-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50823
diff
changeset
|
523 ;; For some reason `svn diff' does not return a useful |
d853a98e1678
(vc-svn-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50823
diff
changeset
|
524 ;; status w.r.t whether the diff was empty or not. |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
525 (buffer-size (get-buffer buffer))))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
526 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
527 ;;; |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
528 ;;; Tag system |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
529 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
530 |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
531 (defun vc-svn-create-tag (dir name branchp) |
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
|
532 "Assign to DIR's current revision a given NAME. |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
533 If BRANCHP is non-nil, the name is created as a branch (and the current |
51732
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
534 workspace is immediately moved to that new branch). |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
535 NAME is assumed to be a URL." |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
536 (vc-svn-command nil 0 dir "copy" name) |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
537 (when branchp (vc-svn-retrieve-tag dir name nil))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
538 |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
539 (defun vc-svn-retrieve-tag (dir name update) |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
540 "Retrieve a tag at and below DIR. |
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94847
diff
changeset
|
541 NAME is the name of the tag; if it is empty, do a `svn update'. |
51732
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
542 If UPDATE is non-nil, then update (resynch) any affected buffers. |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
543 NAME is assumed to be a URL." |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
544 (vc-svn-command nil 0 dir "switch" name) |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
545 ;; FIXME: parse the output and obey `update'. |
f43bd5204ab4
(vc-svn-use-edit): Make it into a const.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50999
diff
changeset
|
546 ) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
547 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
548 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
549 ;;; Miscellaneous |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
550 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
551 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
552 ;; Subversion makes backups for us, so don't bother. |
103553
af4ee0cb7fb7
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103154
diff
changeset
|
553 ;; (defun vc-svn-make-version-backups-p (file) |
af4ee0cb7fb7
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103154
diff
changeset
|
554 ;; "Return non-nil if version backups should be made for FILE." |
af4ee0cb7fb7
* vc-hooks.el (vc-stay-local-p, vc-state, vc-working-revision):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103154
diff
changeset
|
555 ;; (vc-stay-local-p file 'SVN)) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
556 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
557 (defun vc-svn-check-headers () |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
558 "Check if the current file has any headers in it." |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
559 (save-excursion |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
560 (goto-char (point-min)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
561 (re-search-forward "\\$[A-Za-z\300-\326\330-\366\370-\377]+\ |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
562 \\(: [\t -#%-\176\240-\377]*\\)?\\$" nil t))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
563 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
564 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
565 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
566 ;;; Internal functions |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
567 ;;; |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
568 |
81968
1b5dfd1b9ca0
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81617
diff
changeset
|
569 (defun vc-svn-command (buffer okstatus file-or-list &rest flags) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
570 "A wrapper around `vc-do-command' for use in vc-svn.el. |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
571 The difference to vc-do-command is that this function always invokes `svn', |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
572 and that it passes `vc-svn-global-switches' to it before FLAGS." |
94847
5e64dca662f0
Remove assumption about what nil means as a first arument to vc-do-command.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94806
diff
changeset
|
573 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-svn-program file-or-list |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
574 (if (stringp vc-svn-global-switches) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
575 (cons vc-svn-global-switches flags) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
576 (append vc-svn-global-switches |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
577 flags)))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
578 |
50927
6f478e2878c7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50922
diff
changeset
|
579 (defun vc-svn-repository-hostname (dirname) |
6f478e2878c7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50922
diff
changeset
|
580 (with-temp-buffer |
6f478e2878c7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50922
diff
changeset
|
581 (let ((coding-system-for-read |
6f478e2878c7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50922
diff
changeset
|
582 (or file-name-coding-system |
6f478e2878c7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50922
diff
changeset
|
583 default-file-name-coding-system))) |
73848
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
584 (vc-insert-file (expand-file-name (concat vc-svn-admin-directory |
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
585 "/entries") |
299d3322c8be
Fix typo in previous commit.
Chong Yidong <cyd@stupidchicken.com>
parents:
73847
diff
changeset
|
586 dirname))) |
50927
6f478e2878c7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50922
diff
changeset
|
587 (goto-char (point-min)) |
6f478e2878c7
(vc-svn-rename-file): New fun.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50922
diff
changeset
|
588 (when (re-search-forward |
75233
e52e99fc4ca5
(vc-svn-parse-status): Trust the filename argument more
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73848
diff
changeset
|
589 ;; Old `svn' used name="svn:this_dir", newer use just name="". |
58929
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
590 (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*" |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
591 "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?" |
81617
0a2fb180b0a5
(vc-svn-repository-hostname): Adjust to non-XML format of newer .svn/entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81306
diff
changeset
|
592 "url=\"\\(?1:[^\"]+\\)\"" |
0a2fb180b0a5
(vc-svn-repository-hostname): Adjust to non-XML format of newer .svn/entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81306
diff
changeset
|
593 ;; Yet newer ones don't use XML any more. |
0a2fb180b0a5
(vc-svn-repository-hostname): Adjust to non-XML format of newer .svn/entries.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
81306
diff
changeset
|
594 "\\|^\ndir\n[0-9]+\n\\(?1:.*\\)") nil t) |
58929
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
595 ;; This is not a hostname but a URL. This may actually be considered |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
596 ;; as a feature since it allows vc-svn-stay-local to specify different |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
597 ;; behavior for different modules on the same server. |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
598 (match-string 1)))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
599 |
78914
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
600 (defun vc-svn-resolve-when-done () |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
601 "Call \"svn resolved\" if the conflict markers have been removed." |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
602 (save-excursion |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
603 (goto-char (point-min)) |
79848
316ed7573095
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79721
diff
changeset
|
604 (unless (re-search-forward "^<<<<<<< " nil t) |
316ed7573095
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79721
diff
changeset
|
605 (vc-svn-command nil 0 buffer-file-name "resolved") |
316ed7573095
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79721
diff
changeset
|
606 ;; Remove the hook so that it is not called multiple times. |
316ed7573095
* vc-arch.el (vc-arch-delete-rej-if-obsolete): Remove the
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79721
diff
changeset
|
607 (remove-hook 'after-save-hook 'vc-svn-resolve-when-done t)))) |
78914
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
608 |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
609 ;; Inspired by vc-arch-find-file-hook. |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
610 (defun vc-svn-find-file-hook () |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
611 (when (eq ?C (vc-file-getprop buffer-file-name 'vc-svn-status)) |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
612 ;; If the file is marked as "conflicted", then we should try and call |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
613 ;; "svn resolved" when applicable. |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
614 (if (save-excursion |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
615 (goto-char (point-min)) |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
616 (re-search-forward "^<<<<<<< " nil t)) |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
617 ;; There are conflict markers. |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
618 (progn |
87785
8f1628da223f
* smerge-mode.el (smerge-start-session): Rename from smerge-auto.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87743
diff
changeset
|
619 (smerge-start-session) |
78914
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
620 (add-hook 'after-save-hook 'vc-svn-resolve-when-done nil t)) |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
621 ;; There are no conflict markers. This is problematic: maybe it means |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
622 ;; the conflict has been resolved and we should immediately call "svn |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
623 ;; resolved", or it means that the file's type does not allow Svn to |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
624 ;; use conflict markers in which case we don't really know what to do. |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
625 ;; So let's just punt for now. |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
626 nil) |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
627 (message "There are unresolved conflicts in this file"))) |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
628 |
73444
ee7eeb5732b2
(vc-svn-parse-status): Remove unused arg `localp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68740
diff
changeset
|
629 (defun vc-svn-parse-status (&optional filename) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
630 "Parse output of \"svn status\" command in the current buffer. |
73444
ee7eeb5732b2
(vc-svn-parse-status): Remove unused arg `localp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68740
diff
changeset
|
631 Set file properties accordingly. Unless FILENAME is non-nil, parse only |
ee7eeb5732b2
(vc-svn-parse-status): Remove unused arg `localp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68740
diff
changeset
|
632 information about FILENAME and return its status." |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
633 (let (file status) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
634 (goto-char (point-min)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
635 (while (re-search-forward |
87477
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87450
diff
changeset
|
636 ;; Ignore the files with status X. |
97336
701c14eb5b26
(vc-svn-parse-status): Use when instead of if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96257
diff
changeset
|
637 "^\\(?:\\?\\|[ ACDGIMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\)\\) +" nil t) |
75233
e52e99fc4ca5
(vc-svn-parse-status): Trust the filename argument more
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73848
diff
changeset
|
638 ;; If the username contains spaces, the output format is ambiguous, |
e52e99fc4ca5
(vc-svn-parse-status): Trust the filename argument more
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73848
diff
changeset
|
639 ;; so don't trust the output's filename unless we have to. |
e52e99fc4ca5
(vc-svn-parse-status): Trust the filename argument more
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73848
diff
changeset
|
640 (setq file (or filename |
e52e99fc4ca5
(vc-svn-parse-status): Trust the filename argument more
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73848
diff
changeset
|
641 (expand-file-name |
e52e99fc4ca5
(vc-svn-parse-status): Trust the filename argument more
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
73848
diff
changeset
|
642 (buffer-substring (point) (line-end-position))))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
643 (setq status (char-after (line-beginning-position))) |
87477
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87450
diff
changeset
|
644 (if (eq status ??) |
87514
5c7eec3035ec
Remove some debugging code.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87513
diff
changeset
|
645 (vc-file-setprop file 'vc-state 'unregistered) |
50900
d853a98e1678
(vc-svn-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50823
diff
changeset
|
646 ;; Use the last-modified revision, so that searching in vc-print-log |
d853a98e1678
(vc-svn-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50823
diff
changeset
|
647 ;; output works. |
87514
5c7eec3035ec
Remove some debugging code.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87513
diff
changeset
|
648 (vc-file-setprop file 'vc-working-revision (match-string 3)) |
78914
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
649 ;; Remember Svn's own status. |
9eca5b992f1f
(vc-svn-resolve-when-done, vc-svn-find-file-hook): New funs.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
78236
diff
changeset
|
650 (vc-file-setprop file 'vc-svn-status status) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
651 (vc-file-setprop |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
652 file 'vc-state |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
653 (cond |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
654 ((eq status ?\ ) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
655 (if (eq (char-after (match-beginning 1)) ?*) |
94521
2a61c5f918a5
Change 'needs-patch to 'needs-update.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94519
diff
changeset
|
656 'needs-update |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
657 (vc-file-setprop file 'vc-checkout-time |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
658 (nth 5 (file-attributes file))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
659 'up-to-date)) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
660 ((eq status ?A) |
50900
d853a98e1678
(vc-svn-dired-state-info): Use `added' for added files and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
50823
diff
changeset
|
661 ;; If the file was actually copied, (match-string 2) is "-". |
87514
5c7eec3035ec
Remove some debugging code.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87513
diff
changeset
|
662 (vc-file-setprop file 'vc-working-revision "0") |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
663 (vc-file-setprop file 'vc-checkout-time 0) |
87477
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87450
diff
changeset
|
664 'added) |
93956
bfc762f0b49c
* vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93886
diff
changeset
|
665 ((eq status ?C) |
bfc762f0b49c
* vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93886
diff
changeset
|
666 (vc-file-setprop file 'vc-state 'conflict)) |
bfc762f0b49c
* vc-hooks.el (vc-state): Add new state `conflict'.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93886
diff
changeset
|
667 ((eq status '?M) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
668 (if (eq (char-after (match-beginning 1)) ?*) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
669 'needs-merge |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
670 'edited)) |
87450
71fc7b1db920
* vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87449
diff
changeset
|
671 ((eq status ?I) |
87514
5c7eec3035ec
Remove some debugging code.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87513
diff
changeset
|
672 (vc-file-setprop file 'vc-state 'ignored)) |
103154
276b0724ed86
(vc-svn-parse-status): Accept ?D for removed files (bug#3213).
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
102974
diff
changeset
|
673 ((memq status '(?D ?R)) |
87514
5c7eec3035ec
Remove some debugging code.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87513
diff
changeset
|
674 (vc-file-setprop file 'vc-state 'removed)) |
73444
ee7eeb5732b2
(vc-svn-parse-status): Remove unused arg `localp'.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
68740
diff
changeset
|
675 (t 'edited))))) |
97336
701c14eb5b26
(vc-svn-parse-status): Use when instead of if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96257
diff
changeset
|
676 (when filename (vc-file-getprop filename 'vc-state)))) |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
677 |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
678 (defun vc-svn-valid-symbolic-tag-name-p (tag) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
679 "Return non-nil if TAG is a valid symbolic tag name." |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
680 ;; According to the SVN manual, a valid symbolic tag must start with |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
681 ;; an uppercase or lowercase letter and can contain uppercase and |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
682 ;; lowercase letters, digits, `-', and `_'. |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
683 (and (string-match "^[a-zA-Z]" tag) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
684 (not (string-match "[^a-z0-9A-Z-_]" tag)))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
685 |
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
|
686 (defun vc-svn-valid-revision-number-p (tag) |
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
|
687 "Return non-nil if TAG is a valid revision number." |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
688 (and (string-match "^[0-9]" tag) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
689 (not (string-match "[^0-9]" tag)))) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
690 |
58929
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
691 ;; Support for `svn annotate' |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
692 |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
693 (defun vc-svn-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
|
694 (vc-svn-command buf 'async file "annotate" (if rev (concat "-r" rev)))) |
58929
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
695 |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
696 (defun vc-svn-annotate-time-of-rev (rev) |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
697 ;; Arbitrarily assume 10 commmits per day. |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
698 (/ (string-to-number rev) 10.0)) |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
699 |
96252
8c22ce277d5d
(vc-annotate-parent-rev): Pacify byte compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96003
diff
changeset
|
700 (defvar vc-annotate-parent-rev) |
8c22ce277d5d
(vc-annotate-parent-rev): Pacify byte compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96003
diff
changeset
|
701 |
58929
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
702 (defun vc-svn-annotate-current-time () |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
703 (vc-svn-annotate-time-of-rev vc-annotate-parent-rev)) |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
704 |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
705 (defconst vc-svn-annotate-re "[ \t]*\\([0-9]+\\)[ \t]+[^\t ]+ ") |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
706 |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
707 (defun vc-svn-annotate-time () |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
708 (when (looking-at vc-svn-annotate-re) |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
709 (goto-char (match-end 0)) |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
710 (vc-svn-annotate-time-of-rev (match-string 1)))) |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
711 |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
712 (defun vc-svn-annotate-extract-revision-at-line () |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
713 (save-excursion |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
714 (beginning-of-line) |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
715 (if (looking-at vc-svn-annotate-re) (match-string 1)))) |
43248e1430b6
(vc-svn-repository-hostname): Adjust to new format.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
56777
diff
changeset
|
716 |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
717 (provide 'vc-svn) |
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
718 |
56777
332e641fe2b1
(vc-svn-diff): Treat options from vc-svn-diff-switches and
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
55900
diff
changeset
|
719 ;; arch-tag: 02f10c68-2b4d-453a-90fc-1eee6cfb268d |
50818
d3acfb11487e
First cut at vc-svn.el.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
diff
changeset
|
720 ;;; vc-svn.el ends here |