2007-06-20 05:59:41 +00:00
|
|
|
;;; vc-hg.el --- VC backend for the mercurial version control system
|
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
;; Author: Ivan Kanis
|
2007-06-20 06:32:42 +00:00
|
|
|
;; Keywords: tools
|
|
|
|
;; Version: 1889
|
2007-06-20 07:33:45 +00:00
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
;; GNU Emacs is free software; you can redistribute it and/or modify
|
2007-06-20 05:59:41 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2007-06-20 07:33:45 +00:00
|
|
|
;; the Free Software Foundation; either version 2, or (at your option)
|
|
|
|
;; any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2007-06-20 07:33:45 +00:00
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;; This is a mercurial version control backend
|
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
;;; Thanks:
|
|
|
|
|
|
|
|
;;; Bugs:
|
|
|
|
|
|
|
|
;;; Installation:
|
|
|
|
|
|
|
|
;;; Todo:
|
|
|
|
|
2007-06-21 05:44:54 +00:00
|
|
|
;; Implement the rest of the vc interface:
|
|
|
|
;; - dired
|
|
|
|
;; - snapshot?
|
2007-06-20 05:59:41 +00:00
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
;; Implement Stefan Monnier's advice:
|
|
|
|
;; vc-hg-registered and vc-hg-state
|
|
|
|
;; Both of those functions should be super extra careful to fail gracefully in
|
|
|
|
;; unexpected circumstances. The most important such case is when the `hg'
|
|
|
|
;; executable is not available. The reason this is important is that any error
|
|
|
|
;; there will prevent the user from even looking at the file :-(
|
|
|
|
;; Ideally, just like in vc-arch and vc-cvs, checking that the file is under
|
|
|
|
;; mercurial's control and extracting the current revision should be done
|
|
|
|
;; without even using `hg' (this way even if you don't have `hg' installed,
|
|
|
|
;; Emacs is able to tell you this file is under mercurial's control).
|
2007-06-20 05:59:41 +00:00
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
;;; History:
|
|
|
|
;;
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
|
|
|
(eval-when-compile
|
|
|
|
(require 'vc))
|
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
;; XXX This should be moved to vc-hooks when the full vc interface is
|
|
|
|
;; implemented.
|
|
|
|
(add-to-list 'vc-handled-backends 'HG)
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
|
|
;;; Customization options
|
|
|
|
|
|
|
|
(defcustom vc-hg-global-switches nil
|
|
|
|
"*Global switches to pass to any Hg command."
|
|
|
|
:type '(choice (const :tag "None" nil)
|
|
|
|
(string :tag "Argument String")
|
|
|
|
(repeat :tag "Argument List"
|
|
|
|
:value ("")
|
|
|
|
string))
|
2007-06-20 06:32:42 +00:00
|
|
|
;; :version "22.2"
|
2007-06-20 05:59:41 +00:00
|
|
|
:group 'vc)
|
|
|
|
|
|
|
|
;;; State querying functions
|
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
;;; Modelled after the similar function in vc-bzr.el
|
2007-06-20 05:59:41 +00:00
|
|
|
(defun vc-hg-registered (file)
|
2007-06-20 06:32:42 +00:00
|
|
|
"Return non-nil if FILE is registered with hg."
|
|
|
|
(if (vc-find-root file ".hg") ; short cut
|
|
|
|
(vc-hg-state file))) ; expensive
|
2007-06-20 05:59:41 +00:00
|
|
|
|
|
|
|
(defun vc-hg-state (file)
|
2007-06-20 06:32:42 +00:00
|
|
|
"Hg-specific version of `vc-state'."
|
2007-06-20 05:59:41 +00:00
|
|
|
(let ((out (vc-hg-internal-status file)))
|
|
|
|
(if (eq 0 (length out)) 'up-to-date
|
|
|
|
(let ((state (aref out 0)))
|
|
|
|
(cond
|
|
|
|
((eq state ?M) 'edited)
|
2007-06-20 06:32:42 +00:00
|
|
|
((eq state ?A) 'edited)
|
2007-06-20 05:59:41 +00:00
|
|
|
((eq state ?P) 'needs-patch)
|
2007-06-20 06:32:42 +00:00
|
|
|
((eq state ??) nil)
|
2007-06-20 05:59:41 +00:00
|
|
|
(t 'up-to-date))))))
|
|
|
|
|
|
|
|
(defun vc-hg-workfile-version (file)
|
2007-06-20 06:32:42 +00:00
|
|
|
"Hg-specific version of `vc-workfile-version'."
|
2007-06-20 05:59:41 +00:00
|
|
|
(let ((out (vc-hg-internal-log file)))
|
|
|
|
(if (string-match "changeset: *\\([0-9]*\\)" out)
|
|
|
|
(match-string 1 out)
|
|
|
|
"0")))
|
|
|
|
|
|
|
|
;;; History functions
|
|
|
|
|
|
|
|
(defun vc-hg-print-log(file &optional buffer)
|
|
|
|
"Get change log associated with FILE."
|
2007-06-22 17:22:17 +00:00
|
|
|
;; `log-view-mode' needs to have the file name in order to function
|
|
|
|
;; correctly. "hg log" does not print it, so we insert it here by
|
|
|
|
;; hand.
|
|
|
|
|
|
|
|
;; `vc-do-command' creates the buffer, but we need it before running
|
|
|
|
;; the command.
|
|
|
|
(vc-setup-buffer buffer)
|
|
|
|
;; If the buffer exists from a previous invocation it might be
|
|
|
|
;; read-only.
|
|
|
|
(let ((inhibit-read-only t))
|
|
|
|
(with-current-buffer
|
|
|
|
buffer
|
|
|
|
(insert "File: " (file-name-nondirectory file) "\n")))
|
2007-06-20 05:59:41 +00:00
|
|
|
(vc-hg-command
|
|
|
|
buffer
|
|
|
|
(if (and (vc-stay-local-p file) (fboundp 'start-process)) 'async 0)
|
|
|
|
file "log"))
|
|
|
|
|
2007-06-22 02:11:59 +00:00
|
|
|
(defvar log-view-message-re)
|
|
|
|
(defvar log-view-file-re)
|
|
|
|
(defvar log-view-font-lock-keywords)
|
|
|
|
(defvar log-view-current-tag-function)
|
|
|
|
|
|
|
|
(define-derived-mode vc-hg-log-view-mode log-view-mode "HG-Log-View"
|
|
|
|
(require 'add-log) ;; we need the faces add-log
|
|
|
|
;; Don't have file markers, so use impossible regexp.
|
2007-06-22 17:22:17 +00:00
|
|
|
(set (make-local-variable 'log-view-file-re) "^File:[ \t]+\\(.+\\)")
|
2007-06-22 02:11:59 +00:00
|
|
|
(set (make-local-variable 'log-view-message-re)
|
|
|
|
"^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)")
|
|
|
|
(set (make-local-variable 'log-view-font-lock-keywords)
|
|
|
|
(append
|
|
|
|
;; XXX maybe use a different face for the version number
|
2007-06-22 17:22:17 +00:00
|
|
|
`((,log-view-message-re (1 'change-log-acknowledgement))
|
|
|
|
(,log-view-file-re (1 'change-log-file-face)))
|
2007-06-22 02:11:59 +00:00
|
|
|
;; Handle the case:
|
|
|
|
;; user: foo@bar
|
|
|
|
'(("^user:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)"
|
|
|
|
(1 'change-log-email))
|
|
|
|
;; Handle the case:
|
|
|
|
;; user: FirstName LastName <foo@bar>
|
|
|
|
("^user:[ \t]+\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]"
|
|
|
|
(1 'change-log-name)
|
|
|
|
(2 'change-log-email))
|
|
|
|
("^date: \\(.+\\)" (1 'change-log-date))
|
|
|
|
("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))
|
|
|
|
|
2007-06-21 05:44:54 +00:00
|
|
|
(defun vc-hg-diff (file &optional oldvers newvers buffer)
|
2007-06-20 05:59:41 +00:00
|
|
|
"Get a difference report using hg between two versions of FILE."
|
2007-06-21 05:44:54 +00:00
|
|
|
(let ((working (vc-workfile-version file)))
|
|
|
|
(if (and (equal oldvers working) (not newvers))
|
|
|
|
(setq oldvers nil))
|
|
|
|
(if (and (not oldvers) newvers)
|
|
|
|
(setq oldvers working))
|
|
|
|
(apply 'call-process "hg" nil (or buffer "*vc-diff*") nil
|
|
|
|
"--cwd" (file-name-directory file) "diff"
|
|
|
|
(append
|
|
|
|
(if oldvers
|
|
|
|
(if newvers
|
|
|
|
(list "-r" oldvers "-r" newvers)
|
|
|
|
(list "-r" oldvers))
|
|
|
|
(list ""))
|
|
|
|
(list (file-name-nondirectory file))))))
|
|
|
|
|
|
|
|
(defun vc-hg-annotate-command (file buffer &optional version)
|
|
|
|
"Execute \"hg annotate\" on FILE, inserting the contents in BUFFER.
|
|
|
|
Optional arg VERSION is a version to annotate from."
|
|
|
|
(vc-hg-command buffer 0 file "annotate" "-d" "-n" (if version (concat "-r" version)))
|
|
|
|
(with-current-buffer buffer
|
|
|
|
(goto-char (point-min))
|
|
|
|
(re-search-forward "^[0-9]")
|
|
|
|
(delete-region (point-min) (1- (point)))))
|
|
|
|
|
|
|
|
|
|
|
|
;;; The format for one line output by "hg annotate -d -n" looks like this:
|
|
|
|
;;;215 Wed Jun 20 21:22:58 2007 -0700: CONTENTS
|
|
|
|
;;; i.e: VERSION_NUMBER DATE: CONTENTS
|
|
|
|
(defconst vc-hg-annotate-re "^[ \t]*\\([0-9]+\\) \\(.\\{30\\}\\): ")
|
|
|
|
|
|
|
|
(defun vc-hg-annotate-time ()
|
|
|
|
(when (looking-at vc-hg-annotate-re)
|
|
|
|
(goto-char (match-end 0))
|
|
|
|
(vc-annotate-convert-time
|
|
|
|
(date-to-time (match-string-no-properties 2)))))
|
|
|
|
|
|
|
|
(defun vc-hg-annotate-extract-revision-at-line ()
|
|
|
|
(save-excursion
|
|
|
|
(beginning-of-line)
|
|
|
|
(if (looking-at vc-hg-annotate-re) (match-string-no-properties 1))))
|
|
|
|
|
|
|
|
(defun vc-hg-previous-version (file rev)
|
|
|
|
(let ((newrev (1- (string-to-number rev))))
|
|
|
|
(when (>= newrev 0)
|
|
|
|
(number-to-string newrev))))
|
2007-06-20 05:59:41 +00:00
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
(defun vc-hg-register (file &optional rev comment)
|
|
|
|
"Register FILE under hg.
|
|
|
|
REV is ignored.
|
|
|
|
COMMENT is ignored."
|
|
|
|
(vc-hg-command nil nil file "add"))
|
|
|
|
|
2007-06-21 05:44:54 +00:00
|
|
|
(defun vc-hg-checkin (file rev comment)
|
|
|
|
"HG-specific version of `vc-backend-checkin'.
|
|
|
|
REV is ignored."
|
|
|
|
(vc-hg-command nil nil file "commit" "-m" comment))
|
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
;;; Modelled after the similar function in vc-bzr.el
|
|
|
|
(defun vc-hg-checkout (file &optional editable rev workfile)
|
|
|
|
"Retrieve a revision of FILE into a WORKFILE.
|
|
|
|
EDITABLE is ignored.
|
|
|
|
REV is the revision to check out into WORKFILE."
|
|
|
|
(unless workfile
|
|
|
|
(setq workfile (vc-version-backup-file-name file rev)))
|
|
|
|
(let ((coding-system-for-read 'binary)
|
|
|
|
(coding-system-for-write 'binary))
|
|
|
|
(with-temp-file workfile
|
|
|
|
(if rev
|
|
|
|
(vc-hg-command t nil file "cat" "-r" rev)
|
|
|
|
(vc-hg-command t nil file "cat")))))
|
|
|
|
|
|
|
|
(defun vc-hg-checkout-model (file)
|
|
|
|
'implicit)
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
;;; Internal functions
|
|
|
|
|
|
|
|
(defun vc-hg-command (buffer okstatus file &rest flags)
|
|
|
|
"A wrapper around `vc-do-command' for use in vc-hg.el.
|
|
|
|
The difference to vc-do-command is that this function always invokes `hg',
|
|
|
|
and that it passes `vc-hg-global-switches' to it before FLAGS."
|
|
|
|
(apply 'vc-do-command buffer okstatus "hg" file
|
|
|
|
(if (stringp vc-hg-global-switches)
|
|
|
|
(cons vc-hg-global-switches flags)
|
|
|
|
(append vc-hg-global-switches
|
|
|
|
flags))))
|
|
|
|
|
2007-06-22 17:22:17 +00:00
|
|
|
(defun vc-hg-internal-log (file &optional buffer)
|
2007-06-20 06:32:42 +00:00
|
|
|
"Return log of FILE."
|
|
|
|
(with-output-to-string
|
|
|
|
(with-current-buffer
|
|
|
|
standard-output
|
|
|
|
(call-process
|
|
|
|
"hg" nil t nil "--cwd" (file-name-directory file)
|
|
|
|
"log" "-l1" (file-name-nondirectory file)))))
|
|
|
|
|
|
|
|
(defun vc-hg-internal-status(file)
|
|
|
|
"Return status of FILE."
|
|
|
|
(with-output-to-string
|
|
|
|
(with-current-buffer
|
|
|
|
standard-output
|
|
|
|
(call-process
|
|
|
|
"hg" nil t nil "--cwd" (file-name-directory file)
|
|
|
|
"status" (file-name-nondirectory file)))))
|
|
|
|
|
2007-06-20 05:59:41 +00:00
|
|
|
(provide 'vc-hg)
|
|
|
|
|
2007-06-20 06:32:42 +00:00
|
|
|
;;; vc-hg.el ends here
|