* bookmark.el (bookmark-alist): Allow the 2 slightly different formats
[emacs.git] / lisp / vc-hg.el
blob7d4150fbb202ce6e1677bcc881cd7a124f356d77
1 ;;; vc-hg.el --- VC backend for the mercurial version control system
3 ;; Copyright (C) 2006, 2007, 2008 Free Software Foundation, Inc.
5 ;; Author: Ivan Kanis
6 ;; Keywords: tools
8 ;; This file is part of GNU Emacs.
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
12 ;; the Free Software Foundation, either version 3 of the License, or
13 ;; (at your option) any later version.
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.
20 ;; You should have received a copy of the GNU General Public License
21 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
23 ;;; Commentary:
25 ;; This is a mercurial version control backend
27 ;;; Thanks:
29 ;;; Bugs:
31 ;;; Installation:
33 ;;; Todo:
35 ;; 1) Implement the rest of the vc interface. See the comment at the
36 ;; beginning of vc.el. The current status is:
38 ;; FUNCTION NAME STATUS
39 ;; BACKEND PROPERTIES
40 ;; * revision-granularity OK
41 ;; STATE-QUERYING FUNCTIONS
42 ;; * registered (file) OK
43 ;; * state (file) OK
44 ;; - state-heuristic (file) NOT NEEDED
45 ;; * working-revision (file) OK
46 ;; - latest-on-branch-p (file) ??
47 ;; * checkout-model (files) OK
48 ;; - workfile-unchanged-p (file) OK
49 ;; - mode-line-string (file) NOT NEEDED
50 ;; - prettify-state-info (file) OK
51 ;; STATE-CHANGING FUNCTIONS
52 ;; * register (files &optional rev comment) OK
53 ;; * create-repo () OK
54 ;; - init-revision () NOT NEEDED
55 ;; - responsible-p (file) OK
56 ;; - could-register (file) OK
57 ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED
58 ;; - unregister (file) COMMENTED OUT, MAY BE INCORRECT
59 ;; * checkin (files rev comment) OK
60 ;; * find-revision (file rev buffer) OK
61 ;; * checkout (file &optional editable rev) OK
62 ;; * revert (file &optional contents-done) OK
63 ;; - rollback (files) ?? PROBABLY NOT NEEDED
64 ;; - merge (file rev1 rev2) NEEDED
65 ;; - merge-news (file) NEEDED
66 ;; - steal-lock (file &optional revision) NOT NEEDED
67 ;; HISTORY FUNCTIONS
68 ;; * print-log (files &optional buffer) OK
69 ;; - log-view-mode () OK
70 ;; - show-log-entry (revision) NOT NEEDED, DEFAULT IS GOOD
71 ;; - comment-history (file) NOT NEEDED
72 ;; - update-changelog (files) NOT NEEDED
73 ;; * diff (files &optional rev1 rev2 buffer) OK
74 ;; - revision-completion-table (files) OK?
75 ;; - annotate-command (file buf &optional rev) OK
76 ;; - annotate-time () OK
77 ;; - annotate-current-time () NOT NEEDED
78 ;; - annotate-extract-revision-at-line () OK
79 ;; TAG SYSTEM
80 ;; - create-tag (dir name branchp) NEEDED
81 ;; - retrieve-tag (dir name update) NEEDED
82 ;; MISCELLANEOUS
83 ;; - make-version-backups-p (file) ??
84 ;; - repository-hostname (dirname) ??
85 ;; - previous-revision (file rev) OK
86 ;; - next-revision (file rev) OK
87 ;; - check-headers () ??
88 ;; - clear-headers () ??
89 ;; - delete-file (file) TEST IT
90 ;; - rename-file (old new) OK
91 ;; - find-file-hook () PROBABLY NOT NEEDED
92 ;; - find-file-not-found-hook () PROBABLY NOT NEEDED
94 ;; 2) Implement Stefan Monnier's advice:
95 ;; vc-hg-registered and vc-hg-state
96 ;; Both of those functions should be super extra careful to fail gracefully in
97 ;; unexpected circumstances. The reason this is important is that any error
98 ;; there will prevent the user from even looking at the file :-(
99 ;; Ideally, just like in vc-arch and vc-cvs, checking that the file is under
100 ;; mercurial's control and extracting the current revision should be done
101 ;; without even using `hg' (this way even if you don't have `hg' installed,
102 ;; Emacs is able to tell you this file is under mercurial's control).
104 ;;; History:
107 ;;; Code:
109 (eval-when-compile
110 (require 'cl)
111 (require 'vc)
112 (require 'vc-dir))
114 ;;; Customization options
116 (defcustom vc-hg-global-switches nil
117 "*Global switches to pass to any Hg command."
118 :type '(choice (const :tag "None" nil)
119 (string :tag "Argument String")
120 (repeat :tag "Argument List"
121 :value ("")
122 string))
123 :version "22.2"
124 :group 'vc)
127 ;;; Properties of the backend
129 (defun vc-hg-revision-granularity () 'repository)
130 (defun vc-hg-checkout-model (files) 'implicit)
132 ;;; State querying functions
134 ;;;###autoload (defun vc-hg-registered (file)
135 ;;;###autoload "Return non-nil if FILE is registered with hg."
136 ;;;###autoload (if (vc-find-root file ".hg") ; short cut
137 ;;;###autoload (progn
138 ;;;###autoload (load "vc-hg")
139 ;;;###autoload (vc-hg-registered file))))
141 ;; Modelled after the similar function in vc-bzr.el
142 (defun vc-hg-registered (file)
143 "Return non-nil if FILE is registered with hg."
144 (when (vc-hg-root file) ; short cut
145 (let ((state (vc-hg-state file))) ; expensive
146 (vc-file-setprop file 'vc-state state)
147 (and state (not (memq state '(ignored unregistered)))))))
149 (defun vc-hg-state (file)
150 "Hg-specific version of `vc-state'."
151 (let*
152 ((status nil)
153 (out
154 (with-output-to-string
155 (with-current-buffer
156 standard-output
157 (setq status
158 (condition-case nil
159 ;; Ignore all errors.
160 (call-process
161 "hg" nil t nil "--cwd" (file-name-directory file)
162 "status" "-A" (file-name-nondirectory file))
163 ;; Some problem happened. E.g. We can't find an `hg'
164 ;; executable.
165 (error nil)))))))
166 (when (eq 0 status)
167 (when (null (string-match ".*: No such file or directory$" out))
168 (let ((state (aref out 0)))
169 (cond
170 ((eq state ?=) 'up-to-date)
171 ((eq state ?A) 'added)
172 ((eq state ?M) 'edited)
173 ((eq state ?I) 'ignored)
174 ((eq state ?R) 'removed)
175 ((eq state ?!) 'missing)
176 ((eq state ??) 'unregistered)
177 ((eq state ?C) 'up-to-date) ;; Older mercurials use this
178 (t 'up-to-date)))))))
180 (defun vc-hg-working-revision (file)
181 "Hg-specific version of `vc-working-revision'."
182 (let*
183 ((status nil)
184 (out
185 (with-output-to-string
186 (with-current-buffer
187 standard-output
188 (setq status
189 (condition-case nil
190 ;; Ignore all errors.
191 (call-process
192 "hg" nil t nil "--cwd" (file-name-directory file)
193 "log" "-l1" (file-name-nondirectory file))
194 ;; Some problem happened. E.g. We can't find an `hg'
195 ;; executable.
196 (error nil)))))))
197 (when (eq 0 status)
198 (if (string-match "changeset: *\\([0-9]*\\)" out)
199 (match-string 1 out)
200 "0"))))
202 ;;; History functions
204 (defun vc-hg-print-log (files &optional buffer)
205 "Get change log associated with FILES."
206 ;; `log-view-mode' needs to have the file names in order to function
207 ;; correctly. "hg log" does not print it, so we insert it here by
208 ;; hand.
210 ;; `vc-do-command' creates the buffer, but we need it before running
211 ;; the command.
212 (vc-setup-buffer buffer)
213 ;; If the buffer exists from a previous invocation it might be
214 ;; read-only.
215 (let ((inhibit-read-only t))
216 (with-current-buffer
217 buffer
218 (vc-hg-command buffer 0 files "log"))))
220 (defvar log-view-message-re)
221 (defvar log-view-file-re)
222 (defvar log-view-font-lock-keywords)
223 (defvar log-view-per-file-logs)
225 (define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View"
226 (require 'add-log) ;; we need the add-log faces
227 (set (make-local-variable 'log-view-file-re) "\\`a\\`")
228 (set (make-local-variable 'log-view-per-file-logs) nil)
229 (set (make-local-variable 'log-view-message-re)
230 "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)")
231 (set (make-local-variable 'log-view-font-lock-keywords)
232 (append
233 log-view-font-lock-keywords
235 ;; Handle the case:
236 ;; user: FirstName LastName <foo@bar>
237 ("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
238 (1 'change-log-name)
239 (2 'change-log-email))
240 ;; Handle the cases:
241 ;; user: foo@bar
242 ;; and
243 ;; user: foo
244 ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)"
245 (1 'change-log-email))
246 ("^date: \\(.+\\)" (1 'change-log-date))
247 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))
249 (defun vc-hg-diff (files &optional oldvers newvers buffer)
250 "Get a difference report using hg between two revisions of FILES."
251 (let* ((firstfile (car files))
252 (working (and firstfile (vc-working-revision firstfile))))
253 (when (and (equal oldvers working) (not newvers))
254 (setq oldvers nil))
255 (when (and (not oldvers) newvers)
256 (setq oldvers working))
257 (apply #'vc-hg-command (or buffer "*vc-diff*") nil
258 (mapcar (lambda (file) (file-name-nondirectory file)) files)
259 "--cwd" (or (when firstfile (file-name-directory firstfile))
260 (expand-file-name default-directory))
261 "diff"
262 (append
263 (when oldvers
264 (if newvers
265 (list "-r" oldvers "-r" newvers)
266 (list "-r" oldvers)))))))
268 (defun vc-hg-revision-table (files)
269 (let ((default-directory (file-name-directory (car files))))
270 (with-temp-buffer
271 (vc-hg-command t nil files "log" "--template" "{rev} ")
272 (split-string
273 (buffer-substring-no-properties (point-min) (point-max))))))
275 ;; Modelled after the similar function in vc-cvs.el
276 (defun vc-hg-revision-completion-table (files)
277 (lexical-let ((files files)
278 table)
279 (setq table (lazy-completion-table
280 table (lambda () (vc-hg-revision-table files))))
281 table))
283 (defun vc-hg-annotate-command (file buffer &optional revision)
284 "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.
285 Optional arg REVISION is a revision to annotate from."
286 (vc-hg-command buffer 0 file "annotate" "-d" "-n"
287 (when revision (concat "-r" revision)))
288 (with-current-buffer buffer
289 (goto-char (point-min))
290 (re-search-forward "^[ \t]*[0-9]")
291 (delete-region (point-min) (match-beginning 0))))
293 (declare-function vc-annotate-convert-time "vc-annotate" (time))
295 ;; The format for one line output by "hg annotate -d -n" looks like this:
296 ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
297 ;; i.e: VERSION_NUMBER DATE: CONTENTS
298 ;; If the user has set the "--follow" option, the output looks like:
299 ;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS
300 ;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS
301 (defconst vc-hg-annotate-re
302 "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)[^:\n]*\\(:[^ \n][^:\n]*\\)*: ")
304 (defun vc-hg-annotate-time ()
305 (when (looking-at vc-hg-annotate-re)
306 (goto-char (match-end 0))
307 (vc-annotate-convert-time
308 (date-to-time (match-string-no-properties 2)))))
310 (defun vc-hg-annotate-extract-revision-at-line ()
311 (save-excursion
312 (beginning-of-line)
313 (when (looking-at vc-hg-annotate-re) (match-string-no-properties 1))))
315 (defun vc-hg-previous-revision (file rev)
316 (let ((newrev (1- (string-to-number rev))))
317 (when (>= newrev 0)
318 (number-to-string newrev))))
320 (defun vc-hg-next-revision (file rev)
321 (let ((newrev (1+ (string-to-number rev)))
322 (tip-revision
323 (with-temp-buffer
324 (vc-hg-command t 0 nil "tip")
325 (goto-char (point-min))
326 (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
327 (string-to-number (match-string-no-properties 1)))))
328 ;; We don't want to exceed the maximum possible revision number, ie
329 ;; the tip revision.
330 (when (<= newrev tip-revision)
331 (number-to-string newrev))))
333 ;; Modelled after the similar function in vc-bzr.el
334 (defun vc-hg-delete-file (file)
335 "Delete FILE and delete it in the hg repository."
336 (condition-case ()
337 (delete-file file)
338 (file-error nil))
339 (vc-hg-command nil 0 file "remove" "--after" "--force"))
341 ;; Modelled after the similar function in vc-bzr.el
342 (defun vc-hg-rename-file (old new)
343 "Rename file from OLD to NEW using `hg mv'."
344 (vc-hg-command nil 0 new "mv" old))
346 (defun vc-hg-register (files &optional rev comment)
347 "Register FILES under hg.
348 REV is ignored.
349 COMMENT is ignored."
350 (vc-hg-command nil 0 files "add"))
352 (defun vc-hg-create-repo ()
353 "Create a new Mercurial repository."
354 (vc-hg-command nil 0 nil "init"))
356 (defalias 'vc-hg-responsible-p 'vc-hg-root)
358 ;; Modelled after the similar function in vc-bzr.el
359 (defun vc-hg-could-register (file)
360 "Return non-nil if FILE could be registered under hg."
361 (and (vc-hg-responsible-p file) ; shortcut
362 (condition-case ()
363 (with-temp-buffer
364 (vc-hg-command t nil file "add" "--dry-run"))
365 ;; The command succeeds with no output if file is
366 ;; registered.
367 (error))))
369 ;; XXX This would remove the file. Is that correct?
370 ;; (defun vc-hg-unregister (file)
371 ;; "Unregister FILE from hg."
372 ;; (vc-hg-command nil nil file "remove"))
374 (defun vc-hg-checkin (files rev comment)
375 "Hg-specific version of `vc-backend-checkin'.
376 REV is ignored."
377 (vc-hg-command nil 0 files "commit" "-m" comment))
379 (defun vc-hg-find-revision (file rev buffer)
380 (let ((coding-system-for-read 'binary)
381 (coding-system-for-write 'binary))
382 (if rev
383 (vc-hg-command buffer 0 file "cat" "-r" rev)
384 (vc-hg-command buffer 0 file "cat"))))
386 ;; Modelled after the similar function in vc-bzr.el
387 (defun vc-hg-checkout (file &optional editable rev)
388 "Retrieve a revision of FILE.
389 EDITABLE is ignored.
390 REV is the revision to check out into WORKFILE."
391 (let ((coding-system-for-read 'binary)
392 (coding-system-for-write 'binary))
393 (with-current-buffer (or (get-file-buffer file) (current-buffer))
394 (if rev
395 (vc-hg-command t 0 file "cat" "-r" rev)
396 (vc-hg-command t 0 file "cat")))))
398 ;; Modelled after the similar function in vc-bzr.el
399 (defun vc-hg-workfile-unchanged-p (file)
400 (eq 'up-to-date (vc-hg-state file)))
402 ;; Modelled after the similar function in vc-bzr.el
403 (defun vc-hg-revert (file &optional contents-done)
404 (unless contents-done
405 (with-temp-buffer (vc-hg-command t 0 file "revert"))))
407 ;;; Hg specific functionality.
409 (defvar vc-hg-extra-menu-map
410 (let ((map (make-sparse-keymap)))
411 (define-key map [incoming] '(menu-item "Show incoming" vc-hg-incoming))
412 (define-key map [outgoing] '(menu-item "Show outgoing" vc-hg-outgoing))
413 map))
415 (defun vc-hg-extra-menu () vc-hg-extra-menu-map)
417 (defun vc-hg-extra-status-menu () vc-hg-extra-menu-map)
419 (define-derived-mode vc-hg-outgoing-mode vc-hg-log-view-mode "Hg-Outgoing")
421 (define-derived-mode vc-hg-incoming-mode vc-hg-log-view-mode "Hg-Incoming")
423 (defstruct (vc-hg-extra-fileinfo
424 (:copier nil)
425 (:constructor vc-hg-create-extra-fileinfo (rename-state extra-name))
426 (:conc-name vc-hg-extra-fileinfo->))
427 rename-state ;; rename or copy state
428 extra-name) ;; original name for copies and rename targets, new name for
430 (declare-function vc-default-status-printer "vc-dir" (backend fileentry))
432 (defun vc-hg-status-printer (info)
433 "Pretty-printer for the vc-dir-fileinfo structure."
434 (let ((extra (vc-dir-fileinfo->extra info)))
435 (vc-default-status-printer 'Hg info)
436 (when extra
437 (insert (propertize
438 (format " (%s %s)"
439 (case (vc-hg-extra-fileinfo->rename-state extra)
440 ('copied "copied from")
441 ('renamed-from "renamed from")
442 ('renamed-to "renamed to"))
443 (vc-hg-extra-fileinfo->extra-name extra))
444 'face 'font-lock-comment-face)))))
446 (defun vc-hg-after-dir-status (update-function)
447 (let ((status-char nil)
448 (file nil)
449 (translation '((?= . up-to-date)
450 (?C . up-to-date)
451 (?A . added)
452 (?R . removed)
453 (?M . edited)
454 (?I . ignored)
455 (?! . missing)
456 (? . copy-rename-line)
457 (?? . unregistered)))
458 (translated nil)
459 (result nil)
460 (last-added nil)
461 (last-line-copy nil))
462 (goto-char (point-min))
463 (while (not (eobp))
464 (setq translated (cdr (assoc (char-after) translation)))
465 (setq file
466 (buffer-substring-no-properties (+ (point) 2)
467 (line-end-position)))
468 (cond ((not translated)
469 (setq last-line-copy nil))
470 ((eq translated 'up-to-date)
471 (setq last-line-copy nil))
472 ((eq translated 'copy-rename-line)
473 ;; For copied files the output looks like this:
474 ;; A COPIED_FILE_NAME
475 ;; ORIGINAL_FILE_NAME
476 (setf (nth 2 last-added)
477 (vc-hg-create-extra-fileinfo 'copied file))
478 (setq last-line-copy t))
479 ((and last-line-copy (eq translated 'removed))
480 ;; For renamed files the output looks like this:
481 ;; A NEW_FILE_NAME
482 ;; ORIGINAL_FILE_NAME
483 ;; R ORIGINAL_FILE_NAME
484 ;; We need to adjust the previous entry to not think it is a copy.
485 (setf (vc-hg-extra-fileinfo->rename-state (nth 2 last-added))
486 'renamed-from)
487 (push (list file translated
488 (vc-hg-create-extra-fileinfo
489 'renamed-to (nth 0 last-added))) result)
490 (setq last-line-copy nil))
492 (setq last-added (list file translated nil))
493 (push last-added result)
494 (setq last-line-copy nil)))
495 (forward-line))
496 (funcall update-function result)))
498 (defun vc-hg-dir-status (dir update-function)
499 (vc-hg-command (current-buffer) 'async dir "status" "-C")
500 (vc-exec-after
501 `(vc-hg-after-dir-status (quote ,update-function))))
503 (defun vc-hg-status-extra-header (name &rest commands)
504 (concat (propertize name 'face 'font-lock-type-face)
505 (propertize
506 (with-temp-buffer
507 (apply 'vc-hg-command (current-buffer) 0 nil commands)
508 (buffer-substring-no-properties (point-min) (1- (point-max))))
509 'face 'font-lock-variable-name-face)))
511 (defun vc-hg-status-extra-headers (dir)
512 "Generate extra status headers for a Mercurial tree."
513 (let ((default-directory dir))
514 (concat
515 (vc-hg-status-extra-header "Root : " "root") "\n"
516 (vc-hg-status-extra-header "Branch : " "id" "-b") "\n"
517 (vc-hg-status-extra-header "Tags : " "id" "-t") ; "\n"
518 ;; these change after each commit
519 ;; (vc-hg-status-extra-header "Local num : " "id" "-n") "\n"
520 ;; (vc-hg-status-extra-header "Global id : " "id" "-i")
523 ;; XXX this adds another top level menu, instead figure out how to
524 ;; replace the Log-View menu.
525 (easy-menu-define log-view-mode-menu vc-hg-outgoing-mode-map
526 "Hg-outgoing Display Menu"
527 `("Hg-outgoing"
528 ["Push selected" vc-hg-push]))
530 (easy-menu-define log-view-mode-menu vc-hg-incoming-mode-map
531 "Hg-incoming Display Menu"
532 `("Hg-incoming"
533 ["Pull selected" vc-hg-pull]))
535 (defun vc-hg-outgoing ()
536 (interactive)
537 (let ((bname "*Hg outgoing*"))
538 (vc-hg-command bname 0 nil "outgoing" "-n")
539 (pop-to-buffer bname)
540 (vc-hg-outgoing-mode)))
542 (defun vc-hg-incoming ()
543 (interactive)
544 (let ((bname "*Hg incoming*"))
545 (vc-hg-command bname 0 nil "incoming" "-n")
546 (pop-to-buffer bname)
547 (vc-hg-incoming-mode)))
549 (declare-function log-view-get-marked "log-view" ())
551 ;; XXX maybe also add key bindings for these functions.
552 (defun vc-hg-push ()
553 (interactive)
554 (let ((marked-list (log-view-get-marked)))
555 (if marked-list
556 (vc-hg-command
557 nil 0 nil
558 (cons "push"
559 (apply 'nconc
560 (mapcar (lambda (arg) (list "-r" arg)) marked-list))))
561 (error "No log entries selected for push"))))
563 (defun vc-hg-pull ()
564 (interactive)
565 (let ((marked-list (log-view-get-marked)))
566 (if marked-list
567 (vc-hg-command
568 nil 0 nil
569 (cons "pull"
570 (apply 'nconc
571 (mapcar (lambda (arg) (list "-r" arg)) marked-list))))
572 (error "No log entries selected for pull"))))
574 ;;; Internal functions
576 (defun vc-hg-command (buffer okstatus file-or-list &rest flags)
577 "A wrapper around `vc-do-command' for use in vc-hg.el.
578 The difference to vc-do-command is that this function always invokes `hg',
579 and that it passes `vc-hg-global-switches' to it before FLAGS."
580 (apply 'vc-do-command (or buffer "*vc*") okstatus "hg" file-or-list
581 (if (stringp vc-hg-global-switches)
582 (cons vc-hg-global-switches flags)
583 (append vc-hg-global-switches
584 flags))))
586 (defun vc-hg-root (file)
587 (vc-find-root file ".hg"))
589 (provide 'vc-hg)
591 ;; arch-tag: bd094dc5-715a-434f-a331-37b9fb7cd954
592 ;;; vc-hg.el ends here