[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v |
Date: |
Fri, 22 Jun 2007 18:37:17 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Stefan Monnier <monnier> 07/06/22 18:37:17
Index: vc-hg.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- vc-hg.el 22 Jun 2007 17:22:16 -0000 1.6
+++ vc-hg.el 22 Jun 2007 18:37:15 -0000 1.7
@@ -58,8 +58,8 @@
(eval-when-compile
(require 'vc))
-;; XXX This should be moved to vc-hooks when the full vc interface is
-;; implemented.
+;; XXX This should be moved to vc-hooks when we can be sure that vc-state
+;; and friends are always harmless.
(add-to-list 'vc-handled-backends 'HG)
;;; Customization options
@@ -76,7 +76,14 @@
;;; State querying functions
-;;; Modelled after the similar function in vc-bzr.el
+;;;###autoload (defun vc-hg-registered (file)
+;;;###autoload "Return non-nil if FILE is registered with hg."
+;;;###autoload (if (vc-find-root file ".hg") ; short cut
+;;;###autoload (progn
+;;;###autoload (load "vc-hg")
+;;;###autoload (vc-hg-registered file))))
+
+;; Modelled after the similar function in vc-bzr.el
(defun vc-hg-registered (file)
"Return non-nil if FILE is registered with hg."
(if (vc-find-root file ".hg") ; short cut
@@ -126,7 +133,6 @@
(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
@@ -136,9 +142,7 @@
"^changeset:[ \t]*\\([0-9]+\\):\\(.+\\)")
(set (make-local-variable 'log-view-font-lock-keywords)
(append
- ;; XXX maybe use a different face for the version number
- `((,log-view-message-re (1 'change-log-acknowledgement))
- (,log-view-file-re (1 'change-log-file-face)))
+ log-view-font-lock-keywords
;; Handle the case:
;; user: address@hidden
'(("^user:[ \t]+\\(address@hidden)"
@@ -178,9 +182,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
+;; 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 ()
@@ -210,7 +214,7 @@
REV is ignored."
(vc-hg-command nil nil file "commit" "-m" comment))
-;;; Modelled after the similar function in vc-bzr.el
+;; 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.
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2007/06/20
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Glenn Morris, 2007/06/20
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2007/06/21
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2007/06/21
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2007/06/22
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v,
Stefan Monnier <=
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2007/06/22
- [Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v, Dan Nicolaescu, 2007/06/23