[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: |
Dan Nicolaescu |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/vc-hg.el,v |
Date: |
Mon, 27 Oct 2008 07:22:00 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Dan Nicolaescu <dann> 08/10/27 07:21:50
Index: vc-hg.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-hg.el,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- vc-hg.el 3 Oct 2008 19:04:33 -0000 1.86
+++ vc-hg.el 27 Oct 2008 07:21:48 -0000 1.87
@@ -44,8 +44,8 @@
;; - state-heuristic (file) NOT NEEDED
;; - dir-status (dir update-function) OK
;; - dir-status-files (dir files ds uf) OK
-;; - status-extra-headers (dir) OK
-;; - status-printer (fileinfo) OK
+;; - dir-extra-headers (dir) OK
+;; - dir-printer (fileinfo) OK
;; * working-revision (file) OK
;; - latest-on-branch-p (file) ??
;; * checkout-model (files) OK
@@ -429,12 +429,12 @@
rename-state ;; rename or copy state
extra-name) ;; original name for copies and rename targets, new name
for
-(declare-function vc-default-status-printer "vc-dir" (backend fileentry))
+(declare-function vc-default-dir-printer "vc-dir" (backend fileentry))
-(defun vc-hg-status-printer (info)
+(defun vc-hg-dir-printer (info)
"Pretty-printer for the vc-dir-fileinfo structure."
(let ((extra (vc-dir-fileinfo->extra info)))
- (vc-default-status-printer 'Hg info)
+ (vc-default-dir-printer 'Hg info)
(when extra
(insert (propertize
(format " (%s %s)"
@@ -507,7 +507,7 @@
(vc-exec-after
`(vc-hg-after-dir-status (quote ,update-function))))
-(defun vc-hg-status-extra-header (name &rest commands)
+(defun vc-hg-dir-extra-header (name &rest commands)
(concat (propertize name 'face 'font-lock-type-face)
(propertize
(with-temp-buffer
@@ -515,16 +515,16 @@
(buffer-substring-no-properties (point-min) (1- (point-max))))
'face 'font-lock-variable-name-face)))
-(defun vc-hg-status-extra-headers (dir)
+(defun vc-hg-dir-extra-headers (dir)
"Generate extra status headers for a Mercurial tree."
(let ((default-directory dir))
(concat
- (vc-hg-status-extra-header "Root : " "root") "\n"
- (vc-hg-status-extra-header "Branch : " "id" "-b") "\n"
- (vc-hg-status-extra-header "Tags : " "id" "-t") ; "\n"
+ (vc-hg-dir-extra-header "Root : " "root") "\n"
+ (vc-hg-dir-extra-header "Branch : " "id" "-b") "\n"
+ (vc-hg-dir-extra-header "Tags : " "id" "-t") ; "\n"
;; these change after each commit
- ;; (vc-hg-status-extra-header "Local num : " "id" "-n") "\n"
- ;; (vc-hg-status-extra-header "Global id : " "id" "-i")
+ ;; (vc-hg-dir-extra-header "Local num : " "id" "-n") "\n"
+ ;; (vc-hg-dir-extra-header "Global id : " "id" "-i")
)))
;; FIXME: this adds another top level menu, instead figure out how to