1 ;;; vc-hg.el --- VC backend for the mercurial version control system -*- lexical-binding: t -*-
3 ;; Copyright (C) 2006-2015 Free Software Foundation, Inc.
6 ;; Maintainer: emacs-devel@gnu.org
10 ;; This file is part of GNU Emacs.
12 ;; GNU Emacs is free software: you can redistribute it and/or modify
13 ;; it under the terms of the GNU General Public License as published by
14 ;; the Free Software Foundation, either version 3 of the License, or
15 ;; (at your option) any later version.
17 ;; GNU Emacs is distributed in the hope that it will be useful,
18 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
19 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 ;; GNU General Public License for more details.
22 ;; You should have received a copy of the GNU General Public License
23 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
27 ;; This is a mercurial version control backend
37 ;; 1) Implement the rest of the vc interface. See the comment at the
38 ;; beginning of vc.el. The current status is:
40 ;; FUNCTION NAME STATUS
42 ;; * revision-granularity OK
43 ;; STATE-QUERYING FUNCTIONS
44 ;; * registered (file) OK
46 ;; - dir-status-files (dir files uf) OK
47 ;; - dir-extra-headers (dir) OK
48 ;; - dir-printer (fileinfo) OK
49 ;; * working-revision (file) OK
50 ;; * checkout-model (files) OK
51 ;; - mode-line-string (file) NOT NEEDED
52 ;; STATE-CHANGING FUNCTIONS
53 ;; * register (files &optional rev comment) OK
54 ;; * create-repo () OK
55 ;; - responsible-p (file) OK
56 ;; - receive-file (file rev) ?? PROBABLY NOT NEEDED
57 ;; - unregister (file) OK
58 ;; * checkin (files rev comment) OK
59 ;; * find-revision (file rev buffer) OK
60 ;; * checkout (file &optional rev) OK
61 ;; * revert (file &optional contents-done) OK
62 ;; - merge (file rev1 rev2) NEEDED
63 ;; - merge-news (file) NEEDED
64 ;; - steal-lock (file &optional revision) NOT NEEDED
66 ;; * print-log (files buffer &optional shortlog start-revision limit) OK
67 ;; - log-view-mode () OK
68 ;; - show-log-entry (revision) NOT NEEDED, DEFAULT IS GOOD
69 ;; - comment-history (file) NOT NEEDED
70 ;; - update-changelog (files) NOT NEEDED
71 ;; * diff (files &optional rev1 rev2 buffer) OK
72 ;; - revision-completion-table (files) OK?
73 ;; - annotate-command (file buf &optional rev) OK
74 ;; - annotate-time () OK
75 ;; - annotate-current-time () NOT NEEDED
76 ;; - annotate-extract-revision-at-line () OK
78 ;; - create-tag (dir name branchp) OK
79 ;; - retrieve-tag (dir name update) OK FIXME UPDATE BUFFERS
81 ;; - make-version-backups-p (file) ??
82 ;; - previous-revision (file rev) OK
83 ;; - next-revision (file rev) OK
84 ;; - check-headers () ??
85 ;; - delete-file (file) TEST IT
86 ;; - rename-file (old new) OK
87 ;; - find-file-hook () added for bug#10709
89 ;; 2) Implement Stefan Monnier's advice:
90 ;; vc-hg-registered and vc-hg-state
91 ;; Both of those functions should be super extra careful to fail gracefully in
92 ;; unexpected circumstances. The reason this is important is that any error
93 ;; there will prevent the user from even looking at the file :-(
94 ;; Ideally, just like in vc-arch and vc-cvs, checking that the file is under
95 ;; mercurial's control and extracting the current revision should be done
96 ;; without even using `hg' (this way even if you don't have `hg' installed,
97 ;; Emacs is able to tell you this file is under mercurial's control).
109 ;;; Customization options
112 "VC Mercurial (hg) backend."
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" :value ("") string))
124 (defcustom vc-hg-diff-switches t ; Hg doesn't support common args like -u
125 "String or list of strings specifying switches for Hg diff under VC.
126 If nil, use the value of `vc-diff-switches'. If t, use no switches."
127 :type '(choice (const :tag "Unspecified" nil)
128 (const :tag "None" t)
129 (string :tag "Argument String")
130 (repeat :tag "Argument List" :value ("") string))
134 (defcustom vc-hg-annotate-switches nil
135 "String or list of strings specifying switches for hg annotate under VC.
136 If nil, use the value of `vc-annotate-switches'. If t, use no
138 :type '(choice (const :tag "Unspecified" nil)
139 (const :tag "None" t)
140 (string :tag "Argument String")
141 (repeat :tag "Argument List" :value ("") string))
145 (defcustom vc-hg-program "hg"
146 "Name of the Mercurial executable (excluding any arguments)."
150 (defcustom vc-hg-root-log-format
151 `(,(concat "{rev}:{ifeq(branch, 'default','', '{branch}')}"
152 ":{bookmarks}:{tags}:{author|person}"
153 " {date|shortdate} {desc|firstline}\\n")
154 ,(concat "^\\(?:[+@o x|-]*\\)" ;Graph data.
155 "\\([0-9]+\\):\\([^:]*\\)"
156 ":\\([^:]*\\):\\([^:]*\\):\\(.*?\\)"
157 "[ \t]+\\([0-9]\\{4\\}-[0-9]\\{2\\}-[0-9]\\{2\\}\\)")
158 ((1 'log-view-message-face)
161 (4 'change-log-conditionals)
163 (6 'change-log-date)))
164 "Mercurial log template for `vc-hg-print-log' short format.
165 This should be a list (TEMPLATE REGEXP KEYWORDS), where TEMPLATE
166 is the \"--template\" argument string to pass to Mercurial,
167 REGEXP is a regular expression matching the resulting Mercurial
168 output, and KEYWORDS is a list of `font-lock-keywords' for
169 highlighting the Log View buffer."
170 :type '(list string string (repeat sexp))
175 ;;; Properties of the backend
177 (defvar vc-hg-history nil)
179 (defun vc-hg-revision-granularity () 'repository)
180 (defun vc-hg-checkout-model (_files) 'implicit)
182 ;;; State querying functions
184 ;;;###autoload (defun vc-hg-registered (file)
185 ;;;###autoload "Return non-nil if FILE is registered with hg."
186 ;;;###autoload (if (vc-find-root file ".hg") ; short cut
187 ;;;###autoload (progn
188 ;;;###autoload (load "vc-hg" nil t)
189 ;;;###autoload (vc-hg-registered file))))
191 ;; Modeled after the similar function in vc-bzr.el
192 (defun vc-hg-registered (file)
193 "Return non-nil if FILE is registered with hg."
194 (when (vc-hg-root file) ; short cut
195 (let ((state (vc-hg-state file))) ; expensive
196 (and state (not (memq state '(ignored unregistered)))))))
198 (defun vc-hg-state (file)
199 "Hg-specific version of `vc-state'."
200 (setq file (expand-file-name file))
203 (default-directory (file-name-directory file))
205 (with-output-to-string
210 ;; Ignore all errors.
211 (let ((process-environment
212 ;; Avoid localization of messages so we
213 ;; can parse the output. Disable pager.
215 (list "TERM=dumb" "LANGUAGE=C" "HGPLAIN=1")
216 process-environment)))
218 vc-hg-program nil t nil
219 "--config" "alias.status=status"
220 "--config" "defaults.status="
221 "status" "-A" (file-relative-name file)))
222 ;; Some problem happened. E.g. We can't find an `hg'
225 (when (and (eq 0 status)
227 (null (string-match ".*: No such file or directory$" out)))
228 (let ((state (aref out 0)))
230 ((eq state ?=) 'up-to-date)
231 ((eq state ?A) 'added)
232 ((eq state ?M) 'edited)
233 ((eq state ?I) 'ignored)
234 ((eq state ?R) 'removed)
235 ((eq state ?!) 'missing)
236 ((eq state ??) 'unregistered)
237 ((eq state ?C) 'up-to-date) ;; Older mercurial versions use this.
240 (defun vc-hg-working-revision (file)
241 "Hg-specific version of `vc-working-revision'."
243 (with-output-to-string
244 (vc-hg-command standard-output 0 file
245 "parent" "--template" "{rev}")))
248 ;;; History functions
250 (defcustom vc-hg-log-switches nil
251 "String or list of strings specifying switches for hg log under VC."
252 :type '(choice (const :tag "None" nil)
253 (string :tag "Argument String")
254 (repeat :tag "Argument List" :value ("") string))
257 (autoload 'vc-setup-buffer "vc-dispatcher")
259 (defvar vc-hg-log-graph nil
260 "If non-nil, use `--graph' in the short log output.")
262 (defvar vc-hg-log-format (concat "changeset: {rev}:{node|short}\n"
263 "{tags % 'tag: {tag}\n'}"
264 "{if(parents, 'parents: {parents}\n')}"
266 "Date: {date|date}\n"
267 "summary: {desc|tabindent}\n\n")
268 "Mercurial log template for `vc-hg-print-log' long format.")
270 (defun vc-hg-print-log (files buffer &optional shortlog start-revision limit)
271 "Print commit log associated with FILES into specified BUFFER.
272 If SHORTLOG is non-nil, use a short format based on `vc-hg-root-log-format'.
273 If START-REVISION is non-nil, it is the newest revision to show.
274 If LIMIT is non-nil, show no more than this many entries."
275 ;; `vc-do-command' creates the buffer, but we need it before running
277 (vc-setup-buffer buffer)
278 ;; If the buffer exists from a previous invocation it might be
280 (let ((inhibit-read-only t))
283 (apply 'vc-hg-command buffer 'async files "log"
285 (when start-revision (list (format "-r%s:0" start-revision)))
286 (when limit (list "-l" (format "%s" limit)))
288 `(,@(if vc-hg-log-graph '("--graph"))
290 ,(car vc-hg-root-log-format))
291 `("--template" ,vc-hg-log-format))
292 vc-hg-log-switches)))))
294 (defvar log-view-message-re)
295 (defvar log-view-file-re)
296 (defvar log-view-font-lock-keywords)
297 (defvar log-view-per-file-logs)
298 (defvar log-view-expanded-log-entry-function)
300 (define-derived-mode vc-hg-log-view-mode log-view-mode "Hg-Log-View"
301 (require 'add-log) ;; we need the add-log faces
302 (set (make-local-variable 'log-view-file-re) "\\`a\\`")
303 (set (make-local-variable 'log-view-per-file-logs) nil)
304 (set (make-local-variable 'log-view-message-re)
305 (if (eq vc-log-view-type 'short)
306 (cadr vc-hg-root-log-format)
307 "^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)"))
308 (set (make-local-variable 'tab-width) 2)
309 ;; Allow expanding short log entries
310 (when (eq vc-log-view-type 'short)
311 (setq truncate-lines t)
312 (set (make-local-variable 'log-view-expanded-log-entry-function)
313 'vc-hg-expanded-log-entry))
314 (set (make-local-variable 'log-view-font-lock-keywords)
315 (if (eq vc-log-view-type 'short)
316 (list (cons (nth 1 vc-hg-root-log-format)
317 (nth 2 vc-hg-root-log-format)))
319 log-view-font-lock-keywords
322 ;; user: FirstName LastName <foo@bar>
323 ("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
325 (2 'change-log-email))
330 ("^user:[ \t]+\\([A-Za-z0-9_.+-]+\\(?:@[A-Za-z0-9_.-]+\\)?\\)"
331 (1 'change-log-email))
332 ("^date: \\(.+\\)" (1 'change-log-date))
333 ("^tag: +\\([^ ]+\\)$" (1 'highlight))
334 ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message)))))))
336 (autoload 'vc-switches "vc")
338 (defun vc-hg-diff (files &optional oldvers newvers buffer _async)
339 "Get a difference report using hg between two revisions of FILES."
340 (let* ((firstfile (car files))
341 (working (and firstfile (vc-working-revision firstfile))))
342 (when (and (equal oldvers working) (not newvers))
344 (when (and (not oldvers) newvers)
345 (setq oldvers working))
346 (apply #'vc-hg-command
347 (or buffer "*vc-diff*")
351 (vc-switches 'hg 'diff)
354 (list "-r" oldvers "-r" newvers)
355 (list "-r" oldvers)))))))
357 (defun vc-hg-expanded-log-entry (revision)
359 (vc-hg-command t nil nil "log" "-r" revision "--template" vc-hg-log-format)
360 (goto-char (point-min))
362 ;; Indent the expanded log entry.
363 (indent-region (point-min) (point-max) 2)
364 (goto-char (point-max))
367 (defun vc-hg-revision-table (files)
368 (let ((default-directory (file-name-directory (car files))))
370 (vc-hg-command t nil files "log" "--template" "{rev} ")
372 (buffer-substring-no-properties (point-min) (point-max))))))
374 ;; Modeled after the similar function in vc-cvs.el
375 (defun vc-hg-revision-completion-table (files)
376 (letrec ((table (lazy-completion-table
377 table (lambda () (vc-hg-revision-table files)))))
380 (defun vc-hg-annotate-command (file buffer &optional revision)
381 "Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.
382 Optional arg REVISION is a revision to annotate from."
383 (apply #'vc-hg-command buffer 0 file "annotate" "-d" "-n" "--follow"
384 (append (vc-switches 'hg 'annotate)
385 (if revision (list (concat "-r" revision))))))
387 (declare-function vc-annotate-convert-time "vc-annotate" (&optional time))
389 ;; The format for one line output by "hg annotate -d -n" looks like this:
390 ;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
391 ;; i.e: VERSION_NUMBER DATE: CONTENTS
392 ;; If the user has set the "--follow" option, the output looks like:
393 ;;215 Wed Jun 20 21:22:58 2007 -0700 foo.c: CONTENTS
394 ;; i.e. VERSION_NUMBER DATE FILENAME: CONTENTS
395 (defconst vc-hg-annotate-re
396 "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\)\\(?:\\(: \\)\\|\\(?: +\\([^:\n]+\\(?::\\(?:[^: \n][^:\n]*\\)?\\)*\\): \\)\\)")
398 (defun vc-hg-annotate-time ()
399 (when (looking-at vc-hg-annotate-re)
400 (goto-char (match-end 0))
401 (vc-annotate-convert-time
402 (date-to-time (match-string-no-properties 2)))))
404 (defun vc-hg-annotate-extract-revision-at-line ()
407 (when (looking-at vc-hg-annotate-re)
408 (if (match-beginning 3)
409 (match-string-no-properties 1)
410 (cons (match-string-no-properties 1)
411 (expand-file-name (match-string-no-properties 4)
412 (vc-hg-root default-directory)))))))
416 (defun vc-hg-create-tag (dir name branchp)
417 "Attach the tag NAME to the state of the working copy."
418 (let ((default-directory dir))
419 (and (vc-hg-command nil 0 nil "status")
420 (vc-hg-command nil 0 nil (if branchp "bookmark" "tag") name))))
422 (defun vc-hg-retrieve-tag (dir name _update)
423 "Retrieve the version tagged by NAME of all registered files at or below DIR."
424 (let ((default-directory dir))
425 (vc-hg-command nil 0 nil "update" name)
426 ;; FIXME: update buffers if `update' is true
427 ;; TODO: update *vc-change-log* buffer so can see @ if --graph
432 (defun vc-hg-previous-revision (_file rev)
433 ;; We can't simply decrement by 1, because that revision might be
434 ;; e.g. on a different branch (bug#22032).
437 (vc-hg-command t nil nil "id" "-n" "-r" (concat rev "^")))
438 ;; Trim the trailing newline.
439 (buffer-substring (point-min) (1- (point-max))))))
441 (defun vc-hg-next-revision (_file rev)
442 (let ((newrev (1+ (string-to-number rev)))
445 (vc-hg-command t 0 nil "tip" "--style=default")
446 (goto-char (point-min))
447 (re-search-forward "^changeset:[ \t]*\\([0-9]+\\):")
448 (string-to-number (match-string-no-properties 1)))))
449 ;; We don't want to exceed the maximum possible revision number, ie
451 (when (<= newrev tip-revision)
452 (number-to-string newrev))))
454 ;; Modeled after the similar function in vc-bzr.el
455 (defun vc-hg-delete-file (file)
456 "Delete FILE and delete it in the hg repository."
460 (vc-hg-command nil 0 file "remove" "--after" "--force"))
462 ;; Modeled after the similar function in vc-bzr.el
463 (defun vc-hg-rename-file (old new)
464 "Rename file from OLD to NEW using `hg mv'."
465 (vc-hg-command nil 0 new "mv" old))
467 (defun vc-hg-register (files &optional _comment)
468 "Register FILES under hg. COMMENT is ignored."
469 (vc-hg-command nil 0 files "add"))
471 (defun vc-hg-create-repo ()
472 "Create a new Mercurial repository."
473 (vc-hg-command nil 0 nil "init"))
475 (defalias 'vc-hg-responsible-p 'vc-hg-root)
477 (defun vc-hg-unregister (file)
478 "Unregister FILE from hg."
479 (vc-hg-command nil 0 file "forget"))
481 (declare-function log-edit-extract-headers "log-edit" (headers string))
483 (defun vc-hg-checkin (files comment &optional _rev)
484 "Hg-specific version of `vc-backend-checkin'.
486 (apply 'vc-hg-command nil 0 files
487 (nconc (list "commit" "-m")
488 (log-edit-extract-headers '(("Author" . "--user")
492 (defun vc-hg-find-revision (file rev buffer)
493 (let ((coding-system-for-read 'binary)
494 (coding-system-for-write 'binary))
496 (vc-hg-command buffer 0 file "cat" "-r" rev)
497 (vc-hg-command buffer 0 file "cat"))))
499 (defun vc-hg-find-ignore-file (file)
500 "Return the root directory of the repository of FILE."
501 (expand-file-name ".hgignore"
504 ;; Modeled after the similar function in vc-bzr.el
505 (defun vc-hg-checkout (file &optional rev)
506 "Retrieve a revision of FILE.
508 REV is the revision to check out into WORKFILE."
509 (let ((coding-system-for-read 'binary)
510 (coding-system-for-write 'binary))
511 (with-current-buffer (or (get-file-buffer file) (current-buffer))
513 (vc-hg-command t 0 file "cat" "-r" rev)
514 (vc-hg-command t 0 file "cat")))))
516 (defun vc-hg-resolve-when-done ()
517 "Call \"hg resolve -m\" if the conflict markers have been removed."
519 (goto-char (point-min))
520 (unless (re-search-forward "^<<<<<<< " nil t)
521 (vc-hg-command nil 0 buffer-file-name "resolve" "-m")
522 ;; Remove the hook so that it is not called multiple times.
523 (remove-hook 'after-save-hook 'vc-hg-resolve-when-done t))))
525 (defun vc-hg-find-file-hook ()
526 (when (and buffer-file-name
527 (file-exists-p (concat buffer-file-name ".orig"))
528 ;; Hg does not seem to have a "conflict" status, eg
529 ;; hg http://bz.selenic.com/show_bug.cgi?id=2724
530 (memq (vc-file-getprop buffer-file-name 'vc-state)
532 ;; Maybe go on to check that "hg resolve -l" says "U"?
533 ;; If "hg resolve -l" says there's a conflict but there are no
534 ;; conflict markers, it's not clear what we should do.
536 (goto-char (point-min))
537 (re-search-forward "^<<<<<<< " nil t)))
538 ;; Hg may not recognize "conflict" as a state, but we can do better.
539 (vc-file-setprop buffer-file-name 'vc-state 'conflict)
540 (smerge-start-session)
541 (add-hook 'after-save-hook 'vc-hg-resolve-when-done nil t)
542 (vc-message-unresolved-conflicts buffer-file-name)))
545 ;; Modeled after the similar function in vc-bzr.el
546 (defun vc-hg-revert (file &optional contents-done)
547 (unless contents-done
548 (with-temp-buffer (vc-hg-command t 0 file "revert"))))
550 ;;; Hg specific functionality.
552 (defvar vc-hg-extra-menu-map
553 (let ((map (make-sparse-keymap)))
556 (defun vc-hg-extra-menu () vc-hg-extra-menu-map)
558 (defun vc-hg-extra-status-menu () vc-hg-extra-menu-map)
560 (defvar log-view-vc-backend)
562 (cl-defstruct (vc-hg-extra-fileinfo
564 (:constructor vc-hg-create-extra-fileinfo (rename-state extra-name))
565 (:conc-name vc-hg-extra-fileinfo->))
566 rename-state ;; rename or copy state
567 extra-name) ;; original name for copies and rename targets, new name for
569 (declare-function vc-default-dir-printer "vc-dir" (backend fileentry))
571 (defun vc-hg-dir-printer (info)
572 "Pretty-printer for the vc-dir-fileinfo structure."
573 (let ((extra (vc-dir-fileinfo->extra info)))
574 (vc-default-dir-printer 'Hg info)
578 (pcase (vc-hg-extra-fileinfo->rename-state extra)
579 (`copied "copied from")
580 (`renamed-from "renamed from")
581 (`renamed-to "renamed to"))
582 (vc-hg-extra-fileinfo->extra-name extra))
583 'face 'font-lock-comment-face)))))
585 (defun vc-hg-after-dir-status (update-function)
587 (translation '((?= . up-to-date)
594 (? . copy-rename-line)
595 (?? . unregistered)))
599 (last-line-copy nil))
600 (goto-char (point-min))
602 (setq translated (cdr (assoc (char-after) translation)))
604 (buffer-substring-no-properties (+ (point) 2)
605 (line-end-position)))
606 (cond ((not translated)
607 (setq last-line-copy nil))
608 ((eq translated 'up-to-date)
609 (setq last-line-copy nil))
610 ((eq translated 'copy-rename-line)
611 ;; For copied files the output looks like this:
612 ;; A COPIED_FILE_NAME
613 ;; ORIGINAL_FILE_NAME
614 (setf (nth 2 last-added)
615 (vc-hg-create-extra-fileinfo 'copied file))
616 (setq last-line-copy t))
617 ((and last-line-copy (eq translated 'removed))
618 ;; For renamed files the output looks like this:
620 ;; ORIGINAL_FILE_NAME
621 ;; R ORIGINAL_FILE_NAME
622 ;; We need to adjust the previous entry to not think it is a copy.
623 (setf (vc-hg-extra-fileinfo->rename-state (nth 2 last-added))
625 (push (list file translated
626 (vc-hg-create-extra-fileinfo
627 'renamed-to (nth 0 last-added))) result)
628 (setq last-line-copy nil))
630 (setq last-added (list file translated nil))
631 (push last-added result)
632 (setq last-line-copy nil)))
634 (funcall update-function result)))
636 ;; Follows vc-hg-command (or vc-do-async-command), which uses vc-do-command
637 ;; from vc-dispatcher.
638 (declare-function vc-exec-after "vc-dispatcher" (code))
639 ;; Follows vc-exec-after.
640 (declare-function vc-set-async-update "vc-dispatcher" (process-buffer))
642 (defun vc-hg-dir-status-files (dir files update-function)
643 (apply 'vc-hg-command (current-buffer) 'async dir "status"
644 (concat "-mardu" (if files "i"))
647 (vc-hg-after-dir-status update-function)))
649 (defun vc-hg-dir-extra-header (name &rest commands)
650 (concat (propertize name 'face 'font-lock-type-face)
653 (apply 'vc-hg-command (current-buffer) 0 nil commands)
654 (buffer-substring-no-properties (point-min) (1- (point-max))))
655 'face 'font-lock-variable-name-face)))
657 (defun vc-hg-dir-extra-headers (dir)
658 "Generate extra status headers for a Mercurial tree."
659 (let ((default-directory dir))
661 (vc-hg-dir-extra-header "Root : " "root") "\n"
662 (vc-hg-dir-extra-header "Branch : " "id" "-b") "\n"
663 (vc-hg-dir-extra-header "Tags : " "id" "-t") ; "\n"
664 ;; these change after each commit
665 ;; (vc-hg-dir-extra-header "Local num : " "id" "-n") "\n"
666 ;; (vc-hg-dir-extra-header "Global id : " "id" "-i")
669 (defun vc-hg-log-incoming (buffer remote-location)
670 (vc-hg-command buffer 1 nil "incoming" "-n" (unless (string= remote-location "")
673 (defun vc-hg-log-outgoing (buffer remote-location)
674 (vc-hg-command buffer 1 nil "outgoing" "-n" (unless (string= remote-location "")
677 (defvar vc-hg-error-regexp-alist nil
678 ;; 'hg pull' does not list modified files, so, for now, the only
679 ;; benefit of `vc-compilation-mode' is that one can get rid of
680 ;; *vc-hg* buffer with 'q' or 'z'.
681 ;; TODO: call 'hg incoming' before pull/merge to get the list of
683 "Value of `compilation-error-regexp-alist' in *vc-hg* buffers.")
685 (autoload 'vc-do-async-command "vc-dispatcher")
686 (autoload 'log-view-get-marked "log-view")
688 (defun vc-hg--pushpull (command prompt &optional obsolete)
689 "Run COMMAND (a string; either push or pull) on the current Hg branch.
690 If PROMPT is non-nil, prompt for the Hg command to run.
691 If OBSOLETE is non-nil, behave like the old versions of the Hg push/pull
692 commands, which only operated on marked files."
694 ;; The `vc-hg-pull' and `vc-hg-push' commands existed before the
695 ;; `pull'/`push' VC actions were implemented.
696 ;; The following is for backwards compatibility.
697 (if (and obsolete (setq marked-list (log-view-get-marked)))
698 (apply #'vc-hg-command
702 (mapcar (lambda (arg) (list "-r" arg)) marked-list)))
703 (let* ((root (vc-hg-root default-directory))
704 (buffer (format "*vc-hg : %s*" (expand-file-name root)))
705 (hg-program vc-hg-program)
706 ;; Fixme: before updating the working copy to the latest
707 ;; state, should check if it's visiting an old revision.
708 (args (if (equal command "pull") '("-u"))))
709 ;; If necessary, prompt for the exact command.
710 ;; TODO if pushing, prompt if no default push location - cf bzr.
712 (setq args (split-string
714 (format "Hg %s command: " command)
715 (format "%s %s%s" hg-program command
717 (concat " " (mapconcat 'identity args " "))))
720 (setq hg-program (car args)
723 (apply 'vc-do-async-command buffer root hg-program command args)
724 (with-current-buffer buffer
725 (vc-run-delayed (vc-compilation-mode 'hg)))
726 (vc-set-async-update buffer)))))
728 (defun vc-hg-pull (prompt)
729 "Issue a Mercurial pull command.
730 If called interactively with a set of marked Log View buffers,
731 call \"hg pull -r REVS\" to pull in the specified revisions REVS.
733 With a prefix argument or if PROMPT is non-nil, prompt for a
734 specific Mercurial pull command. The default is \"hg pull -u\",
735 which fetches changesets from the default remote repository and
736 then attempts to update the working directory."
738 (vc-hg--pushpull "pull" prompt (called-interactively-p 'interactive)))
740 (defun vc-hg-push (prompt)
741 "Push changes from the current Mercurial branch.
742 Normally, this runs \"hg push\". If PROMPT is non-nil, prompt
743 for the Hg command to run.
745 If called interactively with a set of marked Log View buffers,
746 call \"hg push -r REVS\" to push the specified revisions REVS."
748 (vc-hg--pushpull "push" prompt (called-interactively-p 'interactive)))
750 (defun vc-hg-merge-branch ()
751 "Merge incoming changes into the current working directory.
752 This runs the command \"hg merge\"."
753 (let* ((root (vc-hg-root default-directory))
754 (buffer (format "*vc-hg : %s*" (expand-file-name root))))
755 (apply 'vc-do-async-command buffer root vc-hg-program '("merge"))
756 (with-current-buffer buffer (vc-run-delayed (vc-compilation-mode 'hg)))
757 (vc-set-async-update buffer)))
759 ;;; Internal functions
761 (defun vc-hg-command (buffer okstatus file-or-list &rest flags)
762 "A wrapper around `vc-do-command' for use in vc-hg.el.
763 This function differs from vc-do-command in that it invokes
764 `vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS."
765 (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list
766 (if (stringp vc-hg-global-switches)
767 (cons vc-hg-global-switches flags)
768 (append vc-hg-global-switches
771 (defun vc-hg-root (file)
772 (vc-find-root file ".hg"))
776 ;;; vc-hg.el ends here