Mercurial > emacs
annotate lisp/vc-hg.el @ 106508:8c836ea59444
* net/tramp.el (tramp-handle-insert-directory): Suppress error messages.
author | Michael Albinus <michael.albinus@gmx.de> |
---|---|
date | Wed, 09 Dec 2009 10:23:00 +0000 |
parents | 6e0f1038bc44 |
children | 87010af04b9a |
rev | line source |
---|---|
78075 | 1 ;;; vc-hg.el --- VC backend for the mercurial version control system |
2 | |
100908 | 3 ;; Copyright (C) 2006, 2007, 2008, 2009 Free Software Foundation, Inc. |
78075 | 4 |
5 ;; Author: Ivan Kanis | |
6 ;; Keywords: tools | |
7 | |
8 ;; This file is part of GNU Emacs. | |
9 | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94572
diff
changeset
|
10 ;; GNU Emacs is free software: you can redistribute it and/or modify |
78075 | 11 ;; it under the terms of the GNU General Public License as published by |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94572
diff
changeset
|
12 ;; the Free Software Foundation, either version 3 of the License, or |
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94572
diff
changeset
|
13 ;; (at your option) any later version. |
78075 | 14 |
15 ;; GNU Emacs is distributed in the hope that it will be useful, | |
16 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
17 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
18 ;; GNU General Public License for more details. | |
19 | |
20 ;; You should have received a copy of the GNU General Public License | |
94678
ee5932bf781d
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94572
diff
changeset
|
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
78075 | 22 |
23 ;;; Commentary: | |
24 | |
25 ;; This is a mercurial version control backend | |
26 | |
27 ;;; Thanks: | |
28 | |
29 ;;; Bugs: | |
30 | |
31 ;;; Installation: | |
32 | |
33 ;;; Todo: | |
34 | |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
35 ;; 1) Implement the rest of the vc interface. See the comment at the |
78075 | 36 ;; beginning of vc.el. The current status is: |
37 | |
38 ;; 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
|
39 ;; 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
|
40 ;; * 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
|
41 ;; STATE-QUERYING FUNCTIONS |
78075 | 42 ;; * registered (file) OK |
43 ;; * state (file) OK | |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
44 ;; - state-heuristic (file) NOT NEEDED |
98492
b3eefcc54430
(vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96519
diff
changeset
|
45 ;; - dir-status (dir update-function) OK |
b3eefcc54430
(vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96519
diff
changeset
|
46 ;; - dir-status-files (dir files ds uf) OK |
101200
bbf505632d29
(vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
47 ;; - dir-extra-headers (dir) OK |
bbf505632d29
(vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
48 ;; - dir-printer (fileinfo) OK |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
49 ;; * working-revision (file) OK |
78075 | 50 ;; - latest-on-branch-p (file) ?? |
94563
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94542
diff
changeset
|
51 ;; * checkout-model (files) OK |
78167
252b7f091c04
(vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78166
diff
changeset
|
52 ;; - workfile-unchanged-p (file) OK |
78075 | 53 ;; - mode-line-string (file) NOT NEEDED |
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 |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
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 |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
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 | |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
69 ;; - steal-lock (file &optional revision) NOT NEEDED |
78075 | 70 ;; HISTORY FUNCTIONS |
106472
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106103
diff
changeset
|
71 ;; * print-log (files buffer &optional shortlog start-revision limit) OK |
78075 | 72 ;; - log-view-mode () OK |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
73 ;; - show-log-entry (revision) NOT NEEDED, DEFAULT IS GOOD |
78075 | 74 ;; - comment-history (file) NOT NEEDED |
75 ;; - 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
|
76 ;; * 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
|
77 ;; - revision-completion-table (files) OK? |
78075 | 78 ;; - annotate-command (file buf &optional rev) OK |
79 ;; - annotate-time () OK | |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
80 ;; - annotate-current-time () NOT NEEDED |
78075 | 81 ;; - annotate-extract-revision-at-line () OK |
95020
4da572dc4992
Snapshot primitives globally renamed to refer to tags, documentation updated.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94853
diff
changeset
|
82 ;; TAG SYSTEM |
101200
bbf505632d29
(vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
83 ;; - create-tag (dir name branchp) NEEDED |
bbf505632d29
(vc-hg-diff): Pass relative file names. (Bug#1903)
Dan Nicolaescu <dann@ics.uci.edu>
parents:
100908
diff
changeset
|
84 ;; - retrieve-tag (dir name update) NEEDED |
78075 | 85 ;; MISCELLANEOUS |
86 ;; - make-version-backups-p (file) ?? | |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
87 ;; - repository-hostname (dirname) ?? |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
88 ;; - previous-revision (file rev) OK |
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
89 ;; - next-revision (file rev) OK |
78075 | 90 ;; - check-headers () ?? |
91 ;; - clear-headers () ?? | |
92 ;; - delete-file (file) TEST IT | |
93 ;; - rename-file (old new) OK | |
94 ;; - find-file-hook () PROBABLY NOT NEEDED | |
95 | |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
96 ;; 2) Implement Stefan Monnier's advice: |
78075 | 97 ;; vc-hg-registered and vc-hg-state |
98 ;; Both of those functions should be super extra careful to fail gracefully in | |
99 ;; unexpected circumstances. The reason this is important is that any error | |
100 ;; there will prevent the user from even looking at the file :-( | |
101 ;; Ideally, just like in vc-arch and vc-cvs, checking that the file is under | |
102 ;; mercurial's control and extracting the current revision should be done | |
103 ;; without even using `hg' (this way even if you don't have `hg' installed, | |
104 ;; Emacs is able to tell you this file is under mercurial's control). | |
105 | |
106 ;;; History: | |
107 ;; | |
108 | |
109 ;;; Code: | |
110 | |
111 (eval-when-compile | |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
112 (require 'cl) |
96260 | 113 (require 'vc) |
114 (require 'vc-dir)) | |
78075 | 115 |
116 ;;; Customization options | |
117 | |
118 (defcustom vc-hg-global-switches nil | |
100171 | 119 "Global switches to pass to any Hg command." |
78075 | 120 :type '(choice (const :tag "None" nil) |
121 (string :tag "Argument String") | |
100180
a5dc2e77b960
(vc-hg-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100171
diff
changeset
|
122 (repeat :tag "Argument List" :value ("") string)) |
78075 | 123 :version "22.2" |
124 :group 'vc) | |
125 | |
100180
a5dc2e77b960
(vc-hg-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100171
diff
changeset
|
126 (defcustom vc-hg-diff-switches t ; Hg doesn't support common args like -u |
a5dc2e77b960
(vc-hg-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100171
diff
changeset
|
127 "String or list of strings specifying switches for Hg diff under VC. |
a5dc2e77b960
(vc-hg-diff-switches): Doc fix.
Glenn Morris <rgm@gnu.org>
parents:
100171
diff
changeset
|
128 If nil, use the value of `vc-diff-switches'. If t, use no switches." |
99736
015fd0131c0b
(vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
129 :type '(choice (const :tag "Unspecified" nil) |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
130 (const :tag "None" t) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
131 (string :tag "Argument String") |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
132 (repeat :tag "Argument List" :value ("") string)) |
99736
015fd0131c0b
(vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
133 :version "23.1" |
015fd0131c0b
(vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
134 :group 'vc) |
015fd0131c0b
(vc-hg-diff-switches): New option.
Glenn Morris <rgm@gnu.org>
parents:
99159
diff
changeset
|
135 |
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
|
136 |
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
|
137 ;;; 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
|
138 |
94563
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94542
diff
changeset
|
139 (defun vc-hg-revision-granularity () 'repository) |
a0bb8ca25a33
Clean up vc*-revision-granularity and vc*-checkout-model.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
94542
diff
changeset
|
140 (defun vc-hg-checkout-model (files) 'implicit) |
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
|
141 |
78075 | 142 ;;; State querying functions |
143 | |
144 ;;;###autoload (defun vc-hg-registered (file) | |
145 ;;;###autoload "Return non-nil if FILE is registered with hg." | |
146 ;;;###autoload (if (vc-find-root file ".hg") ; short cut | |
147 ;;;###autoload (progn | |
148 ;;;###autoload (load "vc-hg") | |
149 ;;;###autoload (vc-hg-registered file)))) | |
150 | |
96365
65532b2a1819
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96260
diff
changeset
|
151 ;; Modeled after the similar function in vc-bzr.el |
78075 | 152 (defun vc-hg-registered (file) |
153 "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
|
154 (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
|
155 (let ((state (vc-hg-state file))) ; expensive |
87865
1a3c90d4d8fa
* vc-hg.el (vc-hg-registered): Make it work for non-existent
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87844
diff
changeset
|
156 (and state (not (memq state '(ignored unregistered))))))) |
78075 | 157 |
158 (defun vc-hg-state (file) | |
159 "Hg-specific version of `vc-state'." | |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
160 (let* |
78075 | 161 ((status nil) |
105785
882add770597
(vc-hg-state, vc-hg-working-revision): Use process-file so
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105670
diff
changeset
|
162 (default-directory (file-name-directory file)) |
78075 | 163 (out |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
164 (with-output-to-string |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
165 (with-current-buffer |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
166 standard-output |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
167 (setq status |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
168 (condition-case nil |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
169 ;; Ignore all errors. |
106472
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106103
diff
changeset
|
170 (let ((process-environment |
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106103
diff
changeset
|
171 ;; Avoid localization of messages so we can parse the output. |
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106103
diff
changeset
|
172 (append (list "TERM=dumb" "LANGUAGE=C" "HGRC=") process-environment))) |
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106103
diff
changeset
|
173 |
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106103
diff
changeset
|
174 (process-file |
105785
882add770597
(vc-hg-state, vc-hg-working-revision): Use process-file so
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105670
diff
changeset
|
175 "hg" nil t nil |
106472
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106103
diff
changeset
|
176 "status" "-A" (file-relative-name file))) |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
177 ;; Some problem happened. E.g. We can't find an `hg' |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
178 ;; executable. |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
179 (error nil))))))) |
78075 | 180 (when (eq 0 status) |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
181 (when (null (string-match ".*: No such file or directory$" out)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
182 (let ((state (aref out 0))) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
183 (cond |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
184 ((eq state ?=) 'up-to-date) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
185 ((eq state ?A) 'added) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
186 ((eq state ?M) 'edited) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
187 ((eq state ?I) 'ignored) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
188 ((eq state ?R) 'removed) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
189 ((eq state ?!) 'missing) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
190 ((eq state ??) 'unregistered) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
191 ((eq state ?C) 'up-to-date) ;; Older mercurials use this |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
192 (t 'up-to-date))))))) |
78075 | 193 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
194 (defun vc-hg-working-revision (file) |
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
195 "Hg-specific version of `vc-working-revision'." |
91991
f40c311f15ac
Kill eol whitespace; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
91953
diff
changeset
|
196 (let* |
78075 | 197 ((status nil) |
105785
882add770597
(vc-hg-state, vc-hg-working-revision): Use process-file so
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105670
diff
changeset
|
198 (default-directory (file-name-directory file)) |
78075 | 199 (out |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
200 (with-output-to-string |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
201 (with-current-buffer |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
202 standard-output |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
203 (setq status |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
204 (condition-case nil |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
205 ;; Ignore all errors. |
105785
882add770597
(vc-hg-state, vc-hg-working-revision): Use process-file so
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105670
diff
changeset
|
206 (process-file |
882add770597
(vc-hg-state, vc-hg-working-revision): Use process-file so
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105670
diff
changeset
|
207 "hg" nil t nil |
882add770597
(vc-hg-state, vc-hg-working-revision): Use process-file so
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
105670
diff
changeset
|
208 "log" "-l1" (file-relative-name file)) |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
209 ;; Some problem happened. E.g. We can't find an `hg' |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
210 ;; executable. |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
211 (error nil))))))) |
78075 | 212 (when (eq 0 status) |
213 (if (string-match "changeset: *\\([0-9]*\\)" out) | |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
214 (match-string 1 out) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
215 "0")))) |
78075 | 216 |
217 ;;; History functions | |
218 | |
103403
cb4483f32179
(vc-hg-log-switches): Add defcustom.
Sam Steingold <sds@gnu.org>
parents:
101200
diff
changeset
|
219 (defcustom vc-hg-log-switches nil |
cb4483f32179
(vc-hg-log-switches): Add defcustom.
Sam Steingold <sds@gnu.org>
parents:
101200
diff
changeset
|
220 "String or list of strings specifying switches for hg log under VC." |
cb4483f32179
(vc-hg-log-switches): Add defcustom.
Sam Steingold <sds@gnu.org>
parents:
101200
diff
changeset
|
221 :type '(choice (const :tag "None" nil) |
cb4483f32179
(vc-hg-log-switches): Add defcustom.
Sam Steingold <sds@gnu.org>
parents:
101200
diff
changeset
|
222 (string :tag "Argument String") |
cb4483f32179
(vc-hg-log-switches): Add defcustom.
Sam Steingold <sds@gnu.org>
parents:
101200
diff
changeset
|
223 (repeat :tag "Argument List" :value ("") string)) |
cb4483f32179
(vc-hg-log-switches): Add defcustom.
Sam Steingold <sds@gnu.org>
parents:
101200
diff
changeset
|
224 :group 'vc-hg) |
cb4483f32179
(vc-hg-log-switches): Add defcustom.
Sam Steingold <sds@gnu.org>
parents:
101200
diff
changeset
|
225 |
106472
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106103
diff
changeset
|
226 (defun vc-hg-print-log (files buffer &optional shortlog limit start-revision) |
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
|
227 "Get change log associated with FILES." |
78075 | 228 ;; `vc-do-command' creates the buffer, but we need it before running |
229 ;; the command. | |
230 (vc-setup-buffer buffer) | |
231 ;; If the buffer exists from a previous invocation it might be | |
232 ;; read-only. | |
233 (let ((inhibit-read-only t)) | |
95966
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95542
diff
changeset
|
234 (with-current-buffer |
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95542
diff
changeset
|
235 buffer |
105010
b3c2589ed19e
* vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103596
diff
changeset
|
236 (apply 'vc-hg-command buffer 0 files "log" |
106033
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105785
diff
changeset
|
237 (append |
106472
6e0f1038bc44
Support showing a single log entry from vc-annotate.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
106103
diff
changeset
|
238 (when start-revision (list (format "-r%s:" start-revision))) |
106033
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105785
diff
changeset
|
239 (when limit (list "-l" (format "%s" limit))) |
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105785
diff
changeset
|
240 (when shortlog '("--style" "compact")) |
2bed02fa3041
* vc.el (vc-log-show-limit): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105785
diff
changeset
|
241 vc-hg-log-switches))))) |
78075 | 242 |
243 (defvar log-view-message-re) | |
244 (defvar log-view-file-re) | |
245 (defvar log-view-font-lock-keywords) | |
95966
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95542
diff
changeset
|
246 (defvar log-view-per-file-logs) |
105010
b3c2589ed19e
* vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103596
diff
changeset
|
247 (defvar vc-short-log) |
78075 | 248 |
78404
27f00e50116a
Change capitalization of VC backend names for new backends
Miles Bader <miles@gnu.org>
parents:
78363
diff
changeset
|
249 (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
|
250 (require 'add-log) ;; we need the add-log faces |
95966
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95542
diff
changeset
|
251 (set (make-local-variable 'log-view-file-re) "\\`a\\`") |
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95542
diff
changeset
|
252 (set (make-local-variable 'log-view-per-file-logs) nil) |
78075 | 253 (set (make-local-variable 'log-view-message-re) |
105010
b3c2589ed19e
* vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103596
diff
changeset
|
254 (if vc-short-log |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
255 "^\\([0-9]+\\)\\(?:\\[.*\\]\\)? +\\([0-9a-z]\\{12\\}\\) +\\(\\(?:[0-9]+\\)-\\(?:[0-9]+\\)-\\(?:[0-9]+\\) \\(?:[0-9]+\\):\\(?:[0-9]+\\) \\(?:[-+0-9]+\\)\\) +\\(.*\\)$" |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
256 "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)")) |
78075 | 257 (set (make-local-variable 'log-view-font-lock-keywords) |
105010
b3c2589ed19e
* vc.el (top): print-log method now takes an optional SHORTLOG
Dan Nicolaescu <dann@ics.uci.edu>
parents:
103596
diff
changeset
|
258 (if vc-short-log |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
259 (append `((,log-view-message-re |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
260 (1 'log-view-message-face) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
261 (2 'log-view-message-face) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
262 (3 'change-log-date) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
263 (4 'change-log-name)))) |
78075 | 264 (append |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
265 log-view-font-lock-keywords |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
266 '( |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
267 ;; Handle the case: |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
268 ;; user: FirstName LastName <foo@bar> |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
269 ("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
270 (1 'change-log-name) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
271 (2 'change-log-email)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
272 ;; Handle the cases: |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
273 ;; user: foo@bar |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
274 ;; and |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
275 ;; user: foo |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
276 ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)" |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
277 (1 'change-log-email)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
278 ("^date: \\(.+\\)" (1 'change-log-date)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
279 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) |
78075 | 280 |
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
|
281 (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
|
282 "Get a difference report using hg between two revisions of FILES." |
95966
054335cbee3d
* log-view.el (log-view-diff-changeset): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95542
diff
changeset
|
283 (let* ((firstfile (car files)) |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
284 (working (and firstfile (vc-working-revision firstfile)))) |
94853
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
285 (when (and (equal oldvers working) (not newvers)) |
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
286 (setq oldvers nil)) |
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
287 (when (and (not oldvers) newvers) |
1c9a3c7fa4f1
(vc-hg-diff, vc-hg-annotate-command): Use when not if.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94847
diff
changeset
|
288 (setq oldvers working)) |
106103
a3a5df7c686c
(vc-hg-diff): Fix last patch: do not change directory.
Sam Steingold <sds@gnu.org>
parents:
106033
diff
changeset
|
289 (apply #'vc-hg-command (or buffer "*vc-diff*") nil files "diff" |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
290 (append |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
291 (vc-switches 'hg 'diff) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
292 (when oldvers |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
293 (if newvers |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
294 (list "-r" oldvers "-r" newvers) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
295 (list "-r" oldvers))))))) |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
296 |
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
|
297 (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
|
298 (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
|
299 (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
|
300 (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
|
301 (split-string |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
302 (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
|
303 |
96365
65532b2a1819
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96260
diff
changeset
|
304 ;; Modeled 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
|
305 (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
|
306 (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
|
307 table) |
2dd5d799a16d
* vc-git.el: (vc-directory-exclusion-list, vc-handled-backends):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78236
diff
changeset
|
308 (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
|
309 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
|
310 table)) |
78075 | 311 |
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
|
312 (defun vc-hg-annotate-command (file buffer &optional revision) |
78075 | 313 "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
|
314 Optional arg REVISION is a revision to annotate from." |
105670
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105473
diff
changeset
|
315 (vc-hg-command buffer 0 file "annotate" "-d" "-n" "--follow" |
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105473
diff
changeset
|
316 (when revision (concat "-r" revision)))) |
78075 | 317 |
96213
09da7727f35f
* vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95966
diff
changeset
|
318 (declare-function vc-annotate-convert-time "vc-annotate" (time)) |
78075 | 319 |
320 ;; The format for one line output by "hg annotate -d -n" looks like this: | |
321 ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS | |
322 ;; i.e: VERSION_NUMBER DATE: CONTENTS | |
80585
8c0cc53e8234
(vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
80582
diff
changeset
|
323 ;; If the user has set the "--follow" option, the output looks like: |
8c0cc53e8234
(vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
80582
diff
changeset
|
324 ;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS |
8c0cc53e8234
(vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
80582
diff
changeset
|
325 ;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS |
8c0cc53e8234
(vc-hg-annotate-re): Recognize the output of --follow.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
80582
diff
changeset
|
326 (defconst vc-hg-annotate-re |
105670
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105473
diff
changeset
|
327 "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\(.+\\): \\)\\)") |
78075 | 328 |
329 (defun vc-hg-annotate-time () | |
330 (when (looking-at vc-hg-annotate-re) | |
331 (goto-char (match-end 0)) | |
332 (vc-annotate-convert-time | |
333 (date-to-time (match-string-no-properties 2))))) | |
334 | |
335 (defun vc-hg-annotate-extract-revision-at-line () | |
336 (save-excursion | |
337 (beginning-of-line) | |
105670
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105473
diff
changeset
|
338 (when (looking-at vc-hg-annotate-re) |
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105473
diff
changeset
|
339 (if (match-beginning 3) |
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105473
diff
changeset
|
340 (match-string-no-properties 1) |
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105473
diff
changeset
|
341 (cons (match-string-no-properties 1) |
6f463ea7a91a
Make vc-annotate work through copies and renames.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105473
diff
changeset
|
342 (expand-file-name (match-string-no-properties 4))))))) |
78075 | 343 |
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
|
344 (defun vc-hg-previous-revision (file rev) |
78075 | 345 (let ((newrev (1- (string-to-number rev)))) |
346 (when (>= newrev 0) | |
347 (number-to-string newrev)))) | |
348 | |
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
|
349 (defun vc-hg-next-revision (file rev) |
78075 | 350 (let ((newrev (1+ (string-to-number rev))) |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
351 (tip-revision |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
352 (with-temp-buffer |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
353 (vc-hg-command t 0 nil "tip") |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
354 (goto-char (point-min)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
355 (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):") |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
356 (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
|
357 ;; 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
|
358 ;; 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
|
359 (when (<= newrev tip-revision) |
78075 | 360 (number-to-string newrev)))) |
361 | |
96365
65532b2a1819
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96260
diff
changeset
|
362 ;; Modeled after the similar function in vc-bzr.el |
78075 | 363 (defun vc-hg-delete-file (file) |
364 "Delete FILE and delete it in the hg repository." | |
365 (condition-case () | |
366 (delete-file file) | |
367 (file-error nil)) | |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
368 (vc-hg-command nil 0 file "remove" "--after" "--force")) |
78075 | 369 |
96365
65532b2a1819
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96260
diff
changeset
|
370 ;; Modeled after the similar function in vc-bzr.el |
78075 | 371 (defun vc-hg-rename-file (old new) |
372 "Rename file from OLD to NEW using `hg mv'." | |
94439
d6a121c992e3
(vc-hg-rename-file): Fix argument order.
Sam Steingold <sds@gnu.org>
parents:
94003
diff
changeset
|
373 (vc-hg-command nil 0 new "mv" old)) |
78075 | 374 |
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
|
375 (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
|
376 "Register FILES under hg. |
78075 | 377 REV is ignored. |
378 COMMENT is ignored." | |
82012
878cfe0c0c5a
(vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81998
diff
changeset
|
379 (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
|
380 |
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
|
381 (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
|
382 "Create a new Mercurial repository." |
82012
878cfe0c0c5a
(vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81998
diff
changeset
|
383 (vc-hg-command nil 0 nil "init")) |
78075 | 384 |
385 (defalias 'vc-hg-responsible-p 'vc-hg-root) | |
386 | |
96365
65532b2a1819
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96260
diff
changeset
|
387 ;; Modeled after the similar function in vc-bzr.el |
78075 | 388 (defun vc-hg-could-register (file) |
389 "Return non-nil if FILE could be registered under hg." | |
390 (and (vc-hg-responsible-p file) ; shortcut | |
391 (condition-case () | |
392 (with-temp-buffer | |
393 (vc-hg-command t nil file "add" "--dry-run")) | |
394 ;; The command succeeds with no output if file is | |
395 ;; registered. | |
396 (error)))) | |
397 | |
96519
0197baf37347
*** empty log message ***
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96518
diff
changeset
|
398 ;; FIXME: This would remove the file. Is that correct? |
78075 | 399 ;; (defun vc-hg-unregister (file) |
400 ;; "Unregister FILE from hg." | |
401 ;; (vc-hg-command nil nil file "remove")) | |
402 | |
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
|
403 (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
|
404 "Hg-specific version of `vc-backend-checkin'. |
78075 | 405 REV is ignored." |
82012
878cfe0c0c5a
(vc-hg-dir-state): Fix loop.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
81998
diff
changeset
|
406 (vc-hg-command nil 0 files "commit" "-m" comment)) |
78075 | 407 |
85139
8ba0e30716a5
Terminology cleanup.
Eric S. Raymond <esr@snark.thyrsus.com>
parents:
83759
diff
changeset
|
408 (defun vc-hg-find-revision (file rev buffer) |
78075 | 409 (let ((coding-system-for-read 'binary) |
410 (coding-system-for-write 'binary)) | |
411 (if rev | |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
412 (vc-hg-command buffer 0 file "cat" "-r" rev) |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
413 (vc-hg-command buffer 0 file "cat")))) |
78075 | 414 |
96365
65532b2a1819
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96260
diff
changeset
|
415 ;; Modeled 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
|
416 (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
|
417 "Retrieve a revision of FILE. |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
418 EDITABLE is ignored. |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
419 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
|
420 (let ((coding-system-for-read 'binary) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
421 (coding-system-for-write 'binary)) |
9cbb2ce8ec8c
(vc-hg-state): Handle removed files.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78086
diff
changeset
|
422 (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
|
423 (if rev |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
424 (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
|
425 (vc-hg-command t 0 file "cat"))))) |
78075 | 426 |
96365
65532b2a1819
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96260
diff
changeset
|
427 ;; Modeled after the similar function in vc-bzr.el |
78167
252b7f091c04
(vc-hg-workfile-unchanged-p): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78166
diff
changeset
|
428 (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
|
429 (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
|
430 |
96365
65532b2a1819
American English spelling fix.
Glenn Morris <rgm@gnu.org>
parents:
96260
diff
changeset
|
431 ;; Modeled after the similar function in vc-bzr.el |
78075 | 432 (defun vc-hg-revert (file &optional contents-done) |
433 (unless contents-done | |
78182
86c8d81f944f
(vc-hg-diff): Use vc-hg-command.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
78167
diff
changeset
|
434 (with-temp-buffer (vc-hg-command t 0 file "revert")))) |
78075 | 435 |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
436 ;;; Hg specific functionality. |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
437 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
438 (defvar vc-hg-extra-menu-map |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
439 (let ((map (make-sparse-keymap))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
440 (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
|
441 (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
|
442 map)) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
443 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
444 (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
|
445 |
92122
74bf6df13b6c
* vc.el (vc-find-revision): Make vc-parent-buffer local before
Dan Nicolaescu <dann@ics.uci.edu>
parents:
92093
diff
changeset
|
446 (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
|
447 |
105473
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
448 (defvar log-view-vc-backend) |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
449 |
105473
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
450 (define-derived-mode vc-hg-outgoing-mode vc-hg-log-view-mode "Hg-Outgoing" |
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
451 "Mode for browsing Hg outgoing changes." |
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
452 (set (make-local-variable 'log-view-vc-backend) 'Hg)) |
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
453 |
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
454 (define-derived-mode vc-hg-incoming-mode vc-hg-log-view-mode "Hg-Incoming" |
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
455 "Mode for browsing Hg incoming changes." |
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
456 (set (make-local-variable 'log-view-vc-backend) 'Hg)) |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
457 |
94511
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
458 (defstruct (vc-hg-extra-fileinfo |
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
459 (:copier nil) |
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
460 (:constructor vc-hg-create-extra-fileinfo (rename-state extra-name)) |
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
461 (:conc-name vc-hg-extra-fileinfo->)) |
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
462 rename-state ;; rename or copy state |
95542
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
463 extra-name) ;; original name for copies and rename targets, new name for |
94511
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
464 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
465 (declare-function vc-default-dir-printer "vc-dir" (backend fileentry)) |
96213
09da7727f35f
* vc-hg.el (vc-annotate-convert-time, vc-default-status-printer):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
95966
diff
changeset
|
466 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
467 (defun vc-hg-dir-printer (info) |
94511
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
468 "Pretty-printer for the vc-dir-fileinfo structure." |
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
469 (let ((extra (vc-dir-fileinfo->extra info))) |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
470 (vc-default-dir-printer 'Hg info) |
94511
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
471 (when extra |
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
472 (insert (propertize |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
473 (format " (%s %s)" |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
474 (case (vc-hg-extra-fileinfo->rename-state extra) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
475 ('copied "copied from") |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
476 ('renamed-from "renamed from") |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
477 ('renamed-to "renamed to")) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
478 (vc-hg-extra-fileinfo->extra-name extra)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
479 'face 'font-lock-comment-face))))) |
94511
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
480 |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93957
diff
changeset
|
481 (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
|
482 (let ((status-char nil) |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
483 (file nil) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
484 (translation '((?= . up-to-date) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
485 (?C . up-to-date) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
486 (?A . added) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
487 (?R . removed) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
488 (?M . edited) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
489 (?I . ignored) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
490 (?! . missing) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
491 (? . copy-rename-line) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
492 (?? . unregistered))) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
493 (translated nil) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
494 (result nil) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
495 (last-added nil) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
496 (last-line-copy nil)) |
87844
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
497 (goto-char (point-min)) |
87599
efe45ef69877
* vc.el (vc-status-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87574
diff
changeset
|
498 (while (not (eobp)) |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
499 (setq translated (cdr (assoc (char-after) translation))) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
500 (setq file |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
501 (buffer-substring-no-properties (+ (point) 2) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
502 (line-end-position))) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
503 (cond ((not translated) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
504 (setq last-line-copy nil)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
505 ((eq translated 'up-to-date) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
506 (setq last-line-copy nil)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
507 ((eq translated 'copy-rename-line) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
508 ;; For copied files the output looks like this: |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
509 ;; A COPIED_FILE_NAME |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
510 ;; ORIGINAL_FILE_NAME |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
511 (setf (nth 2 last-added) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
512 (vc-hg-create-extra-fileinfo 'copied file)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
513 (setq last-line-copy t)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
514 ((and last-line-copy (eq translated 'removed)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
515 ;; For renamed files the output looks like this: |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
516 ;; A NEW_FILE_NAME |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
517 ;; ORIGINAL_FILE_NAME |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
518 ;; R ORIGINAL_FILE_NAME |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
519 ;; We need to adjust the previous entry to not think it is a copy. |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
520 (setf (vc-hg-extra-fileinfo->rename-state (nth 2 last-added)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
521 'renamed-from) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
522 (push (list file translated |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
523 (vc-hg-create-extra-fileinfo |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
524 'renamed-to (nth 0 last-added))) result) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
525 (setq last-line-copy nil)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
526 (t |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
527 (setq last-added (list file translated nil)) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
528 (push last-added result) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
529 (setq last-line-copy nil))) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
530 (forward-line)) |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93957
diff
changeset
|
531 (funcall update-function result))) |
87844
3bd7c8c8bbe7
* vc.el: Make vc-status asynchronous.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
87674
diff
changeset
|
532 |
94003
2ecb2ea8d5b5
Change `dir-status' to not take (and pass) status-buffer.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
93957
diff
changeset
|
533 (defun vc-hg-dir-status (dir update-function) |
94511
40171abb3041
(vc-hg-extra-fileinfo): New defstruct.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
94481
diff
changeset
|
534 (vc-hg-command (current-buffer) 'async dir "status" "-C") |
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
|
535 (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
|
536 `(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
|
537 |
98492
b3eefcc54430
(vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96519
diff
changeset
|
538 (defun vc-hg-dir-status-files (dir files default-state update-function) |
b3eefcc54430
(vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96519
diff
changeset
|
539 (apply 'vc-hg-command (current-buffer) 'async dir "status" "-C" files) |
b3eefcc54430
(vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96519
diff
changeset
|
540 (vc-exec-after |
b3eefcc54430
(vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96519
diff
changeset
|
541 `(vc-hg-after-dir-status (quote ,update-function)))) |
b3eefcc54430
(vc-hg-dir-status-files): New function.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96519
diff
changeset
|
542 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
543 (defun vc-hg-dir-extra-header (name &rest commands) |
95542
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
544 (concat (propertize name 'face 'font-lock-type-face) |
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
545 (propertize |
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
546 (with-temp-buffer |
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
547 (apply 'vc-hg-command (current-buffer) 0 nil commands) |
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
548 (buffer-substring-no-properties (point-min) (1- (point-max)))) |
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
549 'face 'font-lock-variable-name-face))) |
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
550 |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
551 (defun vc-hg-dir-extra-headers (dir) |
95542
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
552 "Generate extra status headers for a Mercurial tree." |
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
553 (let ((default-directory dir)) |
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
554 (concat |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
555 (vc-hg-dir-extra-header "Root : " "root") "\n" |
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
556 (vc-hg-dir-extra-header "Branch : " "id" "-b") "\n" |
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
557 (vc-hg-dir-extra-header "Tags : " "id" "-t") ; "\n" |
95542
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
558 ;; these change after each commit |
99159
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
559 ;; (vc-hg-dir-extra-header "Local num : " "id" "-n") "\n" |
b0dce7f34dda
* vc.el: Rename VC methods that were missed when vc-status was
Dan Nicolaescu <dann@ics.uci.edu>
parents:
98492
diff
changeset
|
560 ;; (vc-hg-dir-extra-header "Global id : " "id" "-i") |
95542
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
561 ))) |
dfffc14d8182
(vc-hg-status-extra-header, vc-hg-status-extra-headers):
Sam Steingold <sds@gnu.org>
parents:
95087
diff
changeset
|
562 |
96519
0197baf37347
*** empty log message ***
Dan Nicolaescu <dann@ics.uci.edu>
parents:
96518
diff
changeset
|
563 ;; FIXME: this adds another top level menu, instead figure out how to |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
564 ;; replace the Log-View menu. |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
565 (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
|
566 "Hg-outgoing Display Menu" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
567 `("Hg-outgoing" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
568 ["Push selected" vc-hg-push])) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
569 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
570 (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
|
571 "Hg-incoming Display Menu" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
572 `("Hg-incoming" |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
573 ["Pull selected" vc-hg-pull])) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
574 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
575 (defun vc-hg-outgoing () |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
576 (interactive) |
105473
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
577 (let ((bname "*Hg outgoing*") |
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
578 (vc-short-log nil)) |
105150
204d93911c98
(vc-hg-outgoing, vc-hg-incoming): use okstatus instead of ignore-errors
Sam Steingold <sds@gnu.org>
parents:
105146
diff
changeset
|
579 (vc-hg-command bname 1 nil "outgoing" "-n") |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
580 (pop-to-buffer bname) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
581 (vc-hg-outgoing-mode))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
582 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
583 (defun vc-hg-incoming () |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
584 (interactive) |
105473
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
585 (let ((bname "*Hg incoming*") |
07f6674a0832
(log-view-vc-backend): Declare for compiler.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
105151
diff
changeset
|
586 (vc-short-log nil)) |
105150
204d93911c98
(vc-hg-outgoing, vc-hg-incoming): use okstatus instead of ignore-errors
Sam Steingold <sds@gnu.org>
parents:
105146
diff
changeset
|
587 (vc-hg-command bname 0 nil "incoming" "-n") |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
588 (pop-to-buffer bname) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
589 (vc-hg-incoming-mode))) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
590 |
86234
860a7a8e779e
* progmodes/octave-mod.el (inferior-octave-send-list-and-digest):
Dan Nicolaescu <dann@ics.uci.edu>
parents:
85510
diff
changeset
|
591 (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
|
592 |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
593 ;; 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
|
594 (defun vc-hg-push () |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
595 (interactive) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
596 (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
|
597 (if marked-list |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
598 (vc-hg-command |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
599 nil 0 nil |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
600 (cons "push" |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
601 (apply 'nconc |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
602 (mapcar (lambda (arg) (list "-r" arg)) marked-list)))) |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
603 (error "No log entries selected for push")))) |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
604 |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
605 (defun vc-hg-pull () |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
606 (interactive) |
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
607 (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
|
608 (if marked-list |
105145
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
609 (vc-hg-command |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
610 nil 0 nil |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
611 (cons "pull" |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
612 (apply 'nconc |
767b63857edd
(vc-hg-print-log): Fix shortlog arg passing.
Sam Steingold <sds@gnu.org>
parents:
105010
diff
changeset
|
613 (mapcar (lambda (arg) (list "-r" arg)) marked-list)))) |
83759
493b2df20f41
(vc-hg-extra-menu-map): New variable.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
82245
diff
changeset
|
614 (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
|
615 |
78075 | 616 ;;; Internal functions |
617 | |
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
|
618 (defun vc-hg-command (buffer okstatus file-or-list &rest flags) |
78075 | 619 "A wrapper around `vc-do-command' for use in vc-hg.el. |
99862
83ae2ae7a4c4
(vc-hg-global-switches): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99783
diff
changeset
|
620 The difference to vc-do-command is that this function always invokes `hg', |
83ae2ae7a4c4
(vc-hg-global-switches): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99783
diff
changeset
|
621 and that it passes `vc-hg-global-switches' to it before FLAGS." |
83ae2ae7a4c4
(vc-hg-global-switches): Remove.
Dan Nicolaescu <dann@ics.uci.edu>
parents:
99783
diff
changeset
|
622 (apply 'vc-do-command (or buffer "*vc*") okstatus "hg" file-or-list |
78075 | 623 (if (stringp vc-hg-global-switches) |
624 (cons vc-hg-global-switches flags) | |
625 (append vc-hg-global-switches | |
626 flags)))) | |
627 | |
628 (defun vc-hg-root (file) | |
629 (vc-find-root file ".hg")) | |
630 | |
631 (provide 'vc-hg) | |
632 | |
78086 | 633 ;; arch-tag: bd094dc5-715a-434f-a331-37b9fb7cd954 |
78075 | 634 ;;; vc-hg.el ends here |