Mercurial > emacs
annotate lisp/vc-hg.el @ 94265:9f3c22487cd5
*** empty log message ***
author | Juri Linkov <juri@jurta.org> |
---|---|
date | Tue, 22 Apr 2008 20:36:08 +0000 |
parents | 2ecb2ea8d5b5 |
children | d6a121c992e3 |
rev | line source |
---|---|
78075 | 1 ;;; vc-hg.el --- VC backend for the mercurial version control system |
2 | |
79721 | 3 ;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc. |
78075 | 4 |
5 ;; Author: Ivan Kanis | |
6 ;; Keywords: tools | |
7 | |
8 ;; This file is part of GNU Emacs. | |
9 | |
10 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
11 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
78211
diff
changeset
|
12 ;; the Free Software Foundation; either version 3, or (at your option) |
78075 | 13 ;; any later version. |
14 | |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
21 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
22 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | |
23 ;; Boston, MA 02110-1301, USA. | |
24 | |
25 ;;; Commentary: | |
26 | |
27 ;; This is a mercurial version control backend | |
28 | |
29 ;;; Thanks: | |
30 | |
31 ;;; Bugs: | |
32 | |
33 ;;; Installation: | |
34 | |
35 ;;; Todo: | |
36 | |
37 ;; Implement the rest of the vc interface. See the comment at the | |
38 ;; beginning of vc.el. The current status is: | |
39 | |
40 ;; FUNCTION NAME STATUS | |
81982
d4b8336cd8f5
* vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81964
diff
changeset
|
41 ;; BACKEND PROPERTIES |
d4b8336cd8f5
* vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81964
diff
changeset
|
42 ;; * revision-granularity OK |
d4b8336cd8f5
* vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81964
diff
changeset
|
43 ;; STATE-QUERYING FUNCTIONS |
78075 | 44 ;; * registered (file) OK |
45 ;; * state (file) OK | |
46 ;; - state-heuristic (file) ?? PROBABLY NOT NEEDED | |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
47 ;; - dir-state (dir) OK |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
48 ;; * working-revision (file) OK |
78075 | 49 ;; - latest-on-branch-p (file) ?? |
50 ;; * checkout-model (file) OK | |
78167
252b7f091c04
(vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78166
diff
changeset
|
51 ;; - workfile-unchanged-p (file) OK |
78075 | 52 ;; - mode-line-string (file) NOT NEEDED |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
53 ;; - dired-state-info (file) OK |
78075 | 54 ;; STATE-CHANGING FUNCTIONS |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
55 ;; * register (files &optional rev comment) OK |
81982
d4b8336cd8f5
* vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81964
diff
changeset
|
56 ;; * create-repo () OK |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
57 ;; - init-revision () NOT NEEDED |
78075 | 58 ;; - responsible-p (file) OK |
59 ;; - could-register (file) OK | |
60 ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED | |
61 ;; - unregister (file) COMMENTED OUT, MAY BE INCORRECT | |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
62 ;; * checkin (files rev comment) OK |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
63 ;; * find-revision (file rev buffer) OK |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
64 ;; * checkout (file &optional editable rev) OK |
78075 | 65 ;; * revert (file &optional contents-done) OK |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
66 ;; - rollback (files) ?? PROBABLY NOT NEEDED |
78075 | 67 ;; - merge (file rev1 rev2) NEEDED |
68 ;; - merge-news (file) NEEDED | |
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
|
69 ;; - steal-lock (file &optional revision) NOT NEEDED |
78075 | 70 ;; HISTORY FUNCTIONS |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
71 ;; * print-log (files &optional buffer) OK |
78075 | 72 ;; - log-view-mode () OK |
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
|
73 ;; - show-log-entry (revision) NOT NEEDED, DEFAULT IS GOOD |
78075 | 74 ;; - wash-log (file) ?? |
75 ;; - logentry-check () NOT NEEDED | |
76 ;; - comment-history (file) NOT NEEDED | |
77 ;; - update-changelog (files) NOT NEEDED | |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
78 ;; * diff (files &optional rev1 rev2 buffer) OK |
85462
43a9834cf1a6
* vc-bzr.el (vc-bzr-diff-tree):
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85460
diff
changeset
|
79 ;; - revision-completion-table (files) OK? |
78075 | 80 ;; - annotate-command (file buf &optional rev) OK |
81 ;; - annotate-time () OK | |
82 ;; - annotate-current-time () ?? NOT NEEDED | |
83 ;; - annotate-extract-revision-at-line () OK | |
84 ;; SNAPSHOT SYSTEM | |
85 ;; - create-snapshot (dir name branchp) NEEDED (probably branch?) | |
86 ;; - assign-name (file name) NOT NEEDED | |
87 ;; - retrieve-snapshot (dir name update) ?? NEEDED?? | |
88 ;; MISCELLANEOUS | |
89 ;; - make-version-backups-p (file) ?? | |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
90 ;; - repository-hostname (dirname) ?? |
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
|
91 ;; - previous-revision (file rev) OK |
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
|
92 ;; - next-revision (file rev) OK |
78075 | 93 ;; - check-headers () ?? |
94 ;; - clear-headers () ?? | |
95 ;; - delete-file (file) TEST IT | |
96 ;; - rename-file (old new) OK | |
97 ;; - find-file-hook () PROBABLY NOT NEEDED | |
98 ;; - find-file-not-found-hook () PROBABLY NOT NEEDED | |
99 | |
100 ;; Implement Stefan Monnier's advice: | |
101 ;; vc-hg-registered and vc-hg-state | |
102 ;; Both of those functions should be super extra careful to fail gracefully in | |
103 ;; unexpected circumstances. The reason this is important is that any error | |
104 ;; there will prevent the user from even looking at the file :-( | |
105 ;; Ideally, just like in vc-arch and vc-cvs, checking that the file is under | |
106 ;; mercurial's control and extracting the current revision should be done | |
107 ;; without even using `hg' (this way even if you don't have `hg' installed, | |
108 ;; Emacs is able to tell you this file is under mercurial's control). | |
109 | |
110 ;;; History: | |
111 ;; | |
112 | |
113 ;;; Code: | |
114 | |
115 (eval-when-compile | |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
116 (require 'cl) |
78075 | 117 (require 'vc)) |
118 | |
119 ;;; Customization options | |
120 | |
121 (defcustom vc-hg-global-switches nil | |
122 "*Global switches to pass to any Hg command." | |
123 :type '(choice (const :tag "None" nil) | |
124 (string :tag "Argument String") | |
125 (repeat :tag "Argument List" | |
126 :value ("") | |
127 string)) | |
128 :version "22.2" | |
129 :group 'vc) | |
130 | |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
131 |
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
132 ;;; Properties of the backend |
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
133 |
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
134 (defun vc-hg-revision-granularity () |
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
135 'repository) |
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
136 |
78075 | 137 ;;; State querying functions |
138 | |
139 ;;;###autoload (defun vc-hg-registered (file) | |
140 ;;;###autoload "Return non-nil if FILE is registered with hg." | |
141 ;;;###autoload (if (vc-find-root file ".hg") ; short cut | |
142 ;;;###autoload (progn | |
143 ;;;###autoload (load "vc-hg") | |
144 ;;;###autoload (vc-hg-registered file)))) | |
145 | |
146 ;; Modelled after the similar function in vc-bzr.el | |
147 (defun vc-hg-registered (file) | |
148 "Return non-nil if FILE is registered with hg." | |
78166
516805bc7988
(vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78148
diff
changeset
|
149 (when (vc-hg-root file) ; short cut |
87455
06f57a4af48c
(vc-hg-registered): Return the false when vc-hg-state
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87450
diff
changeset
|
150 (let ((state (vc-hg-state file))) ; expensive |
06f57a4af48c
(vc-hg-registered): Return the false when vc-hg-state
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87450
diff
changeset
|
151 (vc-file-setprop file 'vc-state state) |
87865
1a3c90d4d8fa
* vc-hg.el (vc-hg-registered): Make it work for non-existent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87844
diff
changeset
|
152 (and state (not (memq state '(ignored unregistered))))))) |
78075 | 153 |
154 (defun vc-hg-state (file) | |
155 "Hg-specific version of `vc-state'." | |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
156 (let* |
78075 | 157 ((status nil) |
158 (out | |
159 (with-output-to-string | |
160 (with-current-buffer | |
161 standard-output | |
162 (setq status | |
163 (condition-case nil | |
164 ;; Ignore all errors. | |
165 (call-process | |
166 "hg" nil t nil "--cwd" (file-name-directory file) | |
87455
06f57a4af48c
(vc-hg-registered): Return the false when vc-hg-state
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87450
diff
changeset
|
167 "status" "-A" (file-name-nondirectory file)) |
78075 | 168 ;; Some problem happened. E.g. We can't find an `hg' |
169 ;; executable. | |
170 (error nil))))))) | |
171 (when (eq 0 status) | |
78166
516805bc7988
(vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78148
diff
changeset
|
172 (when (null (string-match ".*: No such file or directory$" out)) |
516805bc7988
(vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78148
diff
changeset
|
173 (let ((state (aref out 0))) |
516805bc7988
(vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78148
diff
changeset
|
174 (cond |
87574
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87480
diff
changeset
|
175 ((eq state ?=) 'up-to-date) |
93118
01d3fd1a2cfe
* vc-hg.el (vc-hg-state):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92345
diff
changeset
|
176 ((eq state ?A) 'added) |
78166
516805bc7988
(vc-hg-registered): Replace if with when.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78148
diff
changeset
|
177 ((eq state ?M) 'edited) |
87450
71fc7b1db920
* vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87442
diff
changeset
|
178 ((eq state ?I) 'ignored) |
93163
521810ff0616
(vc-hg-state): Return 'removed for removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93162
diff
changeset
|
179 ((eq state ?R) 'removed) |
93327
f6aa1bf031f5
(vc-hg-state, vc-hg-dir-state): Deal with 'missing
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93176
diff
changeset
|
180 ((eq state ?!) 'missing) |
87450
71fc7b1db920
* vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87442
diff
changeset
|
181 ((eq state ??) 'unregistered) |
87574
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87480
diff
changeset
|
182 ((eq state ?C) 'up-to-date) ;; Older mercurials use this |
87455
06f57a4af48c
(vc-hg-registered): Return the false when vc-hg-state
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87450
diff
changeset
|
183 (t 'up-to-date))))))) |
78075 | 184 |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
185 (defun vc-hg-dir-state (dir) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
186 (with-temp-buffer |
87442
c5df210848ca
* vc-bzr.el, vc-cvs.el, vc-git.el, vc-hg.el, vc-mcvs.el, vc-svn.el:
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87428
diff
changeset
|
187 (buffer-disable-undo) ;; Because these buffers can get huge |
87604
26665fb0f604
(vc-hg-dir-state, vc-hg-dir-status): Pass the dir
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87599
diff
changeset
|
188 (vc-hg-command (current-buffer) nil dir "status" "-A") |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
189 (goto-char (point-min)) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
190 (let ((status-char nil) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
191 (file nil)) |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
192 (while (not (eobp)) |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
193 (setq status-char (char-after)) |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
194 (setq file |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
195 (expand-file-name |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
196 (buffer-substring-no-properties (+ (point) 2) |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
197 (line-end-position)))) |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
198 (cond |
87477
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87474
diff
changeset
|
199 ;; State flag for a clean file is now C, might change to =. |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
200 ;; The rest of the possible states in "hg status" output: |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
201 ;; ! = deleted, but still tracked |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
202 ;; should not show up in vc-dired, so don't deal with them |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
203 ;; here. |
87574
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87480
diff
changeset
|
204 |
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87480
diff
changeset
|
205 ;; Mercurial up to 0.9.5 used C, = is used now. |
21fcd219fd6e
* mouse.el (mouse-popup-menubar): Fix typo.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87480
diff
changeset
|
206 ((or (eq status-char ?=) (eq status-char ?C)) |
87480
be64fe15280d
(vc-hg-dir-state): Set the vc-backend property.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87477
diff
changeset
|
207 (vc-file-setprop file 'vc-backend 'Hg) |
87474
dc4354c7a6c7
(vc-hg-dir-state): Deal with the up-to-date state.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87455
diff
changeset
|
208 (vc-file-setprop file 'vc-state 'up-to-date)) |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
209 ((eq status-char ?A) |
79687
2fe98820fa48
* vc-git.el (vc-git-dir-state):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78404
diff
changeset
|
210 (vc-file-setprop file 'vc-backend 'Hg) |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
211 (vc-file-setprop file 'vc-working-revision "0") |
87477
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87474
diff
changeset
|
212 (vc-file-setprop file 'vc-state 'added)) |
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87474
diff
changeset
|
213 ((eq status-char ?R) |
87480
be64fe15280d
(vc-hg-dir-state): Set the vc-backend property.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87477
diff
changeset
|
214 (vc-file-setprop file 'vc-backend 'Hg) |
87477
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87474
diff
changeset
|
215 (vc-file-setprop file 'vc-state 'removed)) |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
216 ((eq status-char ?M) |
79687
2fe98820fa48
* vc-git.el (vc-git-dir-state):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78404
diff
changeset
|
217 (vc-file-setprop file 'vc-backend 'Hg) |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
218 (vc-file-setprop file 'vc-state 'edited)) |
87450
71fc7b1db920
* vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87442
diff
changeset
|
219 ((eq status-char ?I) |
87480
be64fe15280d
(vc-hg-dir-state): Set the vc-backend property.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87477
diff
changeset
|
220 (vc-file-setprop file 'vc-backend 'Hg) |
87450
71fc7b1db920
* vc-hooks.el (vc-state): Document new 'ignored and 'unregistered
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87442
diff
changeset
|
221 (vc-file-setprop file 'vc-state 'ignored)) |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
222 ((eq status-char ??) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
223 (vc-file-setprop file 'vc-backend 'none) |
87477
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87474
diff
changeset
|
224 (vc-file-setprop file 'vc-state 'unregistered)) |
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87474
diff
changeset
|
225 ((eq status-char ?!) |
93327
f6aa1bf031f5
(vc-hg-state, vc-hg-dir-state): Deal with 'missing
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93176
diff
changeset
|
226 (vc-file-setprop file 'vc-backend 'Hg) |
f6aa1bf031f5
(vc-hg-state, vc-hg-dir-state): Deal with 'missing
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93176
diff
changeset
|
227 (vc-file-setprop file 'vc-state 'missing)) |
87477
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87474
diff
changeset
|
228 (t ;; Presently C, might change to = in 0.9.6 |
87480
be64fe15280d
(vc-hg-dir-state): Set the vc-backend property.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87477
diff
changeset
|
229 (vc-file-setprop file 'vc-backend 'Hg) |
87477
b5060e79eb98
* vc-svn.el (vc-svn-parse-status): Recognize 'added, 'removed,
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87474
diff
changeset
|
230 (vc-file-setprop file 'vc-state 'up-to-date))) |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
231 (forward-line))))) |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
232 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
233 (defun vc-hg-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
234 "Hg-specific version of `vc-working-revision'." |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
235 (let* |
78075 | 236 ((status nil) |
237 (out | |
238 (with-output-to-string | |
239 (with-current-buffer | |
240 standard-output | |
241 (setq status | |
242 (condition-case nil | |
243 ;; Ignore all errors. | |
244 (call-process | |
245 "hg" nil t nil "--cwd" (file-name-directory file) | |
246 "log" "-l1" (file-name-nondirectory file)) | |
247 ;; Some problem happened. E.g. We can't find an `hg' | |
248 ;; executable. | |
249 (error nil))))))) | |
250 (when (eq 0 status) | |
251 (if (string-match "changeset: *\\([0-9]*\\)" out) | |
252 (match-string 1 out) | |
253 "0")))) | |
254 | |
255 ;;; History functions | |
256 | |
87427
1aea302af710
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
86234
diff
changeset
|
257 (defun vc-hg-print-log (files &optional buffer) |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
258 "Get change log associated with FILES." |
87427
1aea302af710
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
86234
diff
changeset
|
259 ;; `log-view-mode' needs to have the file names in order to function |
78075 | 260 ;; correctly. "hg log" does not print it, so we insert it here by |
261 ;; hand. | |
262 | |
263 ;; `vc-do-command' creates the buffer, but we need it before running | |
264 ;; the command. | |
265 (vc-setup-buffer buffer) | |
266 ;; If the buffer exists from a previous invocation it might be | |
267 ;; read-only. | |
268 (let ((inhibit-read-only t)) | |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
269 ;; We need to loop and call "hg log" on each file separately. |
81982
d4b8336cd8f5
* vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81964
diff
changeset
|
270 ;; "hg log" with multiple file arguments mashes all the logs |
87427
1aea302af710
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
86234
diff
changeset
|
271 ;; together. Ironically enough, this puts us back near CVS |
1aea302af710
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
86234
diff
changeset
|
272 ;; which can't generate proper fileset logs either. |
81982
d4b8336cd8f5
* vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81964
diff
changeset
|
273 (dolist (file files) |
d4b8336cd8f5
* vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81964
diff
changeset
|
274 (with-current-buffer |
d4b8336cd8f5
* vc-hg.el (vc-hg-print-log): Deal with multiple file arguments.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81964
diff
changeset
|
275 buffer |
87427
1aea302af710
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
86234
diff
changeset
|
276 (insert "Working file: " file "\n")) ;; Like RCS/CVS. |
82012
878cfe0c0c5a
(vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81998
diff
changeset
|
277 (vc-hg-command buffer 0 file "log")))) |
78075 | 278 |
279 (defvar log-view-message-re) | |
280 (defvar log-view-file-re) | |
281 (defvar log-view-font-lock-keywords) | |
282 | |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78363
diff
changeset
|
283 (define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View" |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
284 (require 'add-log) ;; we need the add-log faces |
87428
ca399a1984c7
*** empty log message ***
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
87427
diff
changeset
|
285 (set (make-local-variable 'log-view-file-re) "^Working file:[ \t]+\\(.+\\)") |
78075 | 286 (set (make-local-variable 'log-view-message-re) |
287 "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)") | |
288 (set (make-local-variable 'log-view-font-lock-keywords) | |
289 (append | |
290 log-view-font-lock-keywords | |
79725
4ceae4ec8fb2
(vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79722
diff
changeset
|
291 '( |
78075 | 292 ;; Handle the case: |
293 ;; user: FirstName LastName <foo@bar> | |
294 ("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" | |
295 (1 'change-log-name) | |
296 (2 'change-log-email)) | |
79725
4ceae4ec8fb2
(vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79722
diff
changeset
|
297 ;; Handle the cases: |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
298 ;; user: foo@bar |
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
299 ;; and |
79725
4ceae4ec8fb2
(vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79722
diff
changeset
|
300 ;; user: foo |
4ceae4ec8fb2
(vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79722
diff
changeset
|
301 ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)" |
4ceae4ec8fb2
(vc-hg-log-view-mode): Handle the user field better.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79722
diff
changeset
|
302 (1 'change-log-email)) |
78075 | 303 ("^date: \\(.+\\)" (1 'change-log-date)) |
304 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))) | |
305 | |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
306 (defun vc-hg-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
|
307 "Get a difference report using hg between two revisions of FILES." |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
308 (let ((working (vc-working-revision (car files)))) |
78075 | 309 (if (and (equal oldvers working) (not newvers)) |
310 (setq oldvers nil)) | |
311 (if (and (not oldvers) newvers) | |
312 (setq oldvers working)) | |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
313 (apply #'vc-hg-command (or buffer "*vc-diff*") nil |
81998
52950d8efd2b
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81986
diff
changeset
|
314 (mapcar (lambda (file) (file-name-nondirectory file)) files) |
52950d8efd2b
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81986
diff
changeset
|
315 "--cwd" (file-name-directory (car files)) |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
316 "diff" |
78075 | 317 (append |
318 (if oldvers | |
319 (if newvers | |
320 (list "-r" oldvers "-r" newvers) | |
79800
8cc70128affa
(vc-hg-diff): Don't pass an empty string.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
79725
diff
changeset
|
321 (list "-r" oldvers))))))) |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
322 |
85460
d36b2b98840f
(vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
323 (defun vc-hg-revision-table (files) |
d36b2b98840f
(vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
324 (let ((default-directory (file-name-directory (car files)))) |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
325 (with-temp-buffer |
86234
860a7a8e779e
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85510
diff
changeset
|
326 (vc-hg-command t nil files "log" "--template" "{rev} ") |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
327 (split-string |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
328 (buffer-substring-no-properties (point-min) (point-max)))))) |
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
329 |
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
330 ;; Modelled after the similar function in vc-cvs.el |
85460
d36b2b98840f
(vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
331 (defun vc-hg-revision-completion-table (files) |
d36b2b98840f
(vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
332 (lexical-let ((files files) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
333 table) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
334 (setq table (lazy-completion-table |
85460
d36b2b98840f
(vc-hg-revision-completion-table, vc-hg-revision-table): Make it work when the
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
85141
diff
changeset
|
335 table (lambda () (vc-hg-revision-table files)))) |
78359
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
336 table)) |
78075 | 337 |
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
|
338 (defun vc-hg-annotate-command (file buffer &optional revision) |
78075 | 339 "Execute \"hg annotate\" on FILE, inserting the contents in 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
|
340 Optional arg REVISION is a revision to annotate from." |
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
|
341 (vc-hg-command buffer 0 file "annotate" "-d" "-n" (if revision (concat "-r" revision))) |
78075 | 342 (with-current-buffer buffer |
343 (goto-char (point-min)) | |
344 (re-search-forward "^[0-9]") | |
345 (delete-region (point-min) (1- (point))))) | |
346 | |
347 | |
348 ;; The format for one line output by "hg annotate -d -n" looks like this: | |
349 ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS | |
350 ;; i.e: VERSION_NUMBER DATE: CONTENTS | |
351 (defconst vc-hg-annotate-re "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\): ") | |
352 | |
353 (defun vc-hg-annotate-time () | |
354 (when (looking-at vc-hg-annotate-re) | |
355 (goto-char (match-end 0)) | |
356 (vc-annotate-convert-time | |
357 (date-to-time (match-string-no-properties 2))))) | |
358 | |
359 (defun vc-hg-annotate-extract-revision-at-line () | |
360 (save-excursion | |
361 (beginning-of-line) | |
362 (if (looking-at vc-hg-annotate-re) (match-string-no-properties 1)))) | |
363 | |
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
|
364 (defun vc-hg-previous-revision (file rev) |
78075 | 365 (let ((newrev (1- (string-to-number rev)))) |
366 (when (>= newrev 0) | |
367 (number-to-string newrev)))) | |
368 | |
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
|
369 (defun vc-hg-next-revision (file rev) |
78075 | 370 (let ((newrev (1+ (string-to-number rev))) |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
371 (tip-revision |
78075 | 372 (with-temp-buffer |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
373 (vc-hg-command t 0 nil "tip") |
78075 | 374 (goto-char (point-min)) |
375 (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):") | |
376 (string-to-number (match-string-no-properties 1))))) | |
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
|
377 ;; We don't want to exceed the maximum possible revision number, ie |
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
|
378 ;; the tip revision. |
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
|
379 (when (<= newrev tip-revision) |
78075 | 380 (number-to-string newrev)))) |
381 | |
382 ;; Modelled after the similar function in vc-bzr.el | |
383 (defun vc-hg-delete-file (file) | |
384 "Delete FILE and delete it in the hg repository." | |
385 (condition-case () | |
386 (delete-file file) | |
387 (file-error nil)) | |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
388 (vc-hg-command nil 0 file "remove" "--after" "--force")) |
78075 | 389 |
390 ;; Modelled after the similar function in vc-bzr.el | |
391 (defun vc-hg-rename-file (old new) | |
392 "Rename file from OLD to NEW using `hg mv'." | |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
393 (vc-hg-command nil 0 new old "mv")) |
78075 | 394 |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
395 (defun vc-hg-register (files &optional rev comment) |
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
396 "Register FILES under hg. |
78075 | 397 REV is ignored. |
398 COMMENT is ignored." | |
82012
878cfe0c0c5a
(vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81998
diff
changeset
|
399 (vc-hg-command nil 0 files "add")) |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
400 |
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
401 (defun vc-hg-create-repo () |
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
402 "Create a new Mercurial repository." |
82012
878cfe0c0c5a
(vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81998
diff
changeset
|
403 (vc-hg-command nil 0 nil "init")) |
78075 | 404 |
405 (defalias 'vc-hg-responsible-p 'vc-hg-root) | |
406 | |
407 ;; Modelled after the similar function in vc-bzr.el | |
408 (defun vc-hg-could-register (file) | |
409 "Return non-nil if FILE could be registered under hg." | |
410 (and (vc-hg-responsible-p file) ; shortcut | |
411 (condition-case () | |
412 (with-temp-buffer | |
413 (vc-hg-command t nil file "add" "--dry-run")) | |
414 ;; The command succeeds with no output if file is | |
415 ;; registered. | |
416 (error)))) | |
417 | |
418 ;; XXX This would remove the file. Is that correct? | |
419 ;; (defun vc-hg-unregister (file) | |
420 ;; "Unregister FILE from hg." | |
421 ;; (vc-hg-command nil nil file "remove")) | |
422 | |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
423 (defun vc-hg-checkin (files rev comment) |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78363
diff
changeset
|
424 "Hg-specific version of `vc-backend-checkin'. |
78075 | 425 REV is ignored." |
82012
878cfe0c0c5a
(vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81998
diff
changeset
|
426 (vc-hg-command nil 0 files "commit" "-m" comment)) |
78075 | 427 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
428 (defun vc-hg-find-revision (file rev buffer) |
78075 | 429 (let ((coding-system-for-read 'binary) |
430 (coding-system-for-write 'binary)) | |
431 (if rev | |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
432 (vc-hg-command buffer 0 file "cat" "-r" rev) |
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
433 (vc-hg-command buffer 0 file "cat")))) |
78075 | 434 |
435 ;; Modelled after the similar function in vc-bzr.el | |
78148
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
436 (defun vc-hg-checkout (file &optional editable rev) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
437 "Retrieve a revision of FILE. |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
438 EDITABLE is ignored. |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
439 REV is the revision to check out into WORKFILE." |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
440 (let ((coding-system-for-read 'binary) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
441 (coding-system-for-write 'binary)) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
442 (with-current-buffer (or (get-file-buffer file) (current-buffer)) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
443 (if rev |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
444 (vc-hg-command t 0 file "cat" "-r" rev) |
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
445 (vc-hg-command t 0 file "cat"))))) |
78075 | 446 |
447 (defun vc-hg-checkout-model (file) | |
448 'implicit) | |
449 | |
78167
252b7f091c04
(vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78166
diff
changeset
|
450 ;; Modelled after the similar function in vc-bzr.el |
252b7f091c04
(vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78166
diff
changeset
|
451 (defun vc-hg-workfile-unchanged-p (file) |
252b7f091c04
(vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78166
diff
changeset
|
452 (eq 'up-to-date (vc-hg-state file))) |
252b7f091c04
(vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78166
diff
changeset
|
453 |
78075 | 454 ;; Modelled after the similar function in vc-bzr.el |
455 (defun vc-hg-revert (file &optional contents-done) | |
456 (unless contents-done | |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
457 (with-temp-buffer (vc-hg-command t 0 file "revert")))) |
78075 | 458 |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
459 ;;; Hg specific functionality. |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
460 |
93124
97c5b398eee4
* vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93118
diff
changeset
|
461 ;; XXX This functionality is experimental/work in progress. It might |
97c5b398eee4
* vc-hooks.el (vc-default-mode-line-string): Add case for added files.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93118
diff
changeset
|
462 ;; change without notice. |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
463 (defvar vc-hg-extra-menu-map |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
464 (let ((map (make-sparse-keymap))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
465 (define-key map [incoming] '(menu-item "Show incoming" vc-hg-incoming)) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
466 (define-key map [outgoing] '(menu-item "Show outgoing" vc-hg-outgoing)) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
467 map)) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
468 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
469 (defun vc-hg-extra-menu () vc-hg-extra-menu-map) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
470 |
92122
74bf6df13b6c
* vc.el (vc-find-revision): Make vc-parent-buffer local before
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92093
diff
changeset
|
471 (defun vc-hg-extra-status-menu () vc-hg-extra-menu-map) |
91951
d42fe75822fe
* vc.el (vc-status-menu, vc-status-menu-map-filter): New functions.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87903
diff
changeset
|
472 |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
473 (define-derived-mode vc-hg-outgoing-mode vc-hg-log-view-mode "Hg-Outgoing") |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
474 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
475 (define-derived-mode vc-hg-incoming-mode vc-hg-log-view-mode "Hg-Incoming") |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
476 |
87599
efe45ef69877
* vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87574
diff
changeset
|
477 ;; XXX Experimental function for the vc-dired replacement. |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93957
diff
changeset
|
478 (defun vc-hg-after-dir-status (update-function) |
87844
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
479 (let ((status-char nil) |
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
480 (file nil) |
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
481 (translation '((?= . up-to-date) |
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
482 (?C . up-to-date) |
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
483 (?A . added) |
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
484 (?R . removed) |
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
485 (?M . edited) |
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
486 (?I . ignored) |
93176
c985261aee9c
* vc-hg.el (vc-hg-after-dir-status):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93163
diff
changeset
|
487 (?! . missing) |
87844
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
488 (?? . unregistered))) |
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
489 (translated nil) |
93957
139a888c8649
(vc-hg-dir-status): Remove unneeded call.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93461
diff
changeset
|
490 (result nil)) |
87844
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
491 (goto-char (point-min)) |
87599
efe45ef69877
* vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87574
diff
changeset
|
492 (while (not (eobp)) |
efe45ef69877
* vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87574
diff
changeset
|
493 (setq status-char (char-after)) |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
494 (setq file |
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
495 (buffer-substring-no-properties (+ (point) 2) |
87844
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
496 (line-end-position))) |
87599
efe45ef69877
* vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87574
diff
changeset
|
497 (setq translated (assoc status-char translation)) |
efe45ef69877
* vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87574
diff
changeset
|
498 (when (and translated (not (eq (cdr translated) 'up-to-date))) |
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
|
499 (push (list file (cdr translated)) result)) |
87599
efe45ef69877
* vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87574
diff
changeset
|
500 (forward-line)) |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93957
diff
changeset
|
501 (funcall update-function result))) |
87844
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
502 |
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
503 ;; XXX Experimental function for the vc-dired replacement. |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93957
diff
changeset
|
504 (defun vc-hg-dir-status (dir update-function) |
93382
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93327
diff
changeset
|
505 (vc-hg-command (current-buffer) 'async dir "status") |
8e46096e0cb3
* vc.el (vc-status-menu-map, vc-status-mode-map): Bind vc-revert.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
93327
diff
changeset
|
506 (vc-exec-after |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93957
diff
changeset
|
507 `(vc-hg-after-dir-status (quote ,update-function)))) |
87599
efe45ef69877
* vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87574
diff
changeset
|
508 |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
509 ;; XXX this adds another top level menu, instead figure out how to |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
510 ;; replace the Log-View menu. |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
511 (easy-menu-define log-view-mode-menu vc-hg-outgoing-mode-map |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
512 "Hg-outgoing Display Menu" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
513 `("Hg-outgoing" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
514 ["Push selected" vc-hg-push])) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
515 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
516 (easy-menu-define log-view-mode-menu vc-hg-incoming-mode-map |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
517 "Hg-incoming Display Menu" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
518 `("Hg-incoming" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
519 ["Pull selected" vc-hg-pull])) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
520 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
521 (defun vc-hg-outgoing () |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
522 (interactive) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
523 (let ((bname "*Hg outgoing*")) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
524 (vc-hg-command bname 0 nil "outgoing" "-n") |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
525 (pop-to-buffer bname) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
526 (vc-hg-outgoing-mode))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
527 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
528 (defun vc-hg-incoming () |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
529 (interactive) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
530 (let ((bname "*Hg incoming*")) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
531 (vc-hg-command bname 0 nil "incoming" "-n") |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
532 (pop-to-buffer bname) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
533 (vc-hg-incoming-mode))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
534 |
86234
860a7a8e779e
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85510
diff
changeset
|
535 (declare-function log-view-get-marked "log-view" ()) |
860a7a8e779e
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85510
diff
changeset
|
536 |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
537 ;; XXX maybe also add key bindings for these functions. |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
538 (defun vc-hg-push () |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
539 (interactive) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
540 (let ((marked-list (log-view-get-marked))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
541 (if marked-list |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
542 (vc-hg-command |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
543 nil 0 nil |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
544 (cons "push" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
545 (apply 'nconc |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
546 (mapcar (lambda (arg) (list "-r" arg)) marked-list)))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
547 (error "No log entries selected for push")))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
548 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
549 (defun vc-hg-pull () |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
550 (interactive) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
551 (let ((marked-list (log-view-get-marked))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
552 (if marked-list |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
553 (vc-hg-command |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
554 nil 0 nil |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
555 (cons "pull" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
556 (apply 'nconc |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
557 (mapcar (lambda (arg) (list "-r" arg)) marked-list)))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
558 (error "No log entries selected for pull")))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
559 |
78075 | 560 ;;; Internal functions |
561 | |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
562 (defun vc-hg-command (buffer okstatus file-or-list &rest flags) |
78075 | 563 "A wrapper around `vc-do-command' for use in vc-hg.el. |
564 The difference to vc-do-command is that this function always invokes `hg', | |
565 and that it passes `vc-hg-global-switches' to it before FLAGS." | |
81964
ba5a7f46413b
Put the lower half (the back-end) of NewVC in place. This commit
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
81757
diff
changeset
|
566 (apply 'vc-do-command buffer okstatus "hg" file-or-list |
78075 | 567 (if (stringp vc-hg-global-switches) |
568 (cons vc-hg-global-switches flags) | |
569 (append vc-hg-global-switches | |
570 flags)))) | |
571 | |
572 (defun vc-hg-root (file) | |
573 (vc-find-root file ".hg")) | |
574 | |
575 (provide 'vc-hg) | |
576 | |
78086 | 577 ;; arch-tag: bd094dc5-715a-434f-a331-37b9fb7cd954 |
78075 | 578 ;;; vc-hg.el ends here |