Mercurial > emacs

comparison lisp/vc-git.el @ 99159:b0dce7f34dda

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* vc.el: Rename VC methods that were missed when vc-status was renamed to vc-dir. * vc-svn.el (vc-svn-dir-extra-headers): Rename from vc-svn-status-extra-headers. * vc-hg.el (vc-hg-dir-printer): Rename from vc-hg-status-printer. (vc-hg-dir-extra-header): Rename from vc-hg-status-extra-headers. * vc-git.el (vc-git-dir-printer): Rename from vc-dir-status-printer. (vc-git-dir-extra-headers): Rename from vc-git-status-extra-headers. * vc-dir.el (vc-dir-mode): Use vc-dir-printer instead of vc-dir-status-printer. (vc-dir-headers): Use `dir-extra-headers' instead of `status-extra-headers' (vc-dir-printer): Rename from vc-dir-status-printer. (vc-default-dir-extra-headers): Rename from vc-default-status-extra-headers. * vc-cvs.el (vc-cvs-dir-extra-headers): Rename from vc-cvs-status-extra-headers.
author Dan Nicolaescu <dann@ics.uci.edu>
date Mon, 27 Oct 2008 07:21:43 +0000
parents 5970e7c70c96
children 36e205658d72
comparison
equal deleted inserted replaced
99158:d1d986962044 99159:b0dce7f34dda
264 (eq 0 (logand ?\111 (logxor old-perm new-perm)))) 264 (eq 0 (logand ?\111 (logxor old-perm new-perm))))
265 " " 265 " "
266 (if (eq 0 (logand ?\111 old-perm)) "+x" "-x")) 266 (if (eq 0 (logand ?\111 old-perm)) "+x" "-x"))
267 'face 'font-lock-type-face)) 267 'face 'font-lock-type-face))
268 268
269 (defun vc-git-status-printer (info) 269 (defun vc-git-dir-printer (info)
270 "Pretty-printer for the vc-dir-fileinfo structure." 270 "Pretty-printer for the vc-dir-fileinfo structure."
271 (let* ((isdir (vc-dir-fileinfo->directory info)) 271 (let* ((isdir (vc-dir-fileinfo->directory info))
272 (state (if isdir "" (vc-dir-fileinfo->state info))) 272 (state (if isdir "" (vc-dir-fileinfo->state info)))
273 (extra (vc-dir-fileinfo->extra info)) 273 (extra (vc-dir-fileinfo->extra info))
274 (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra))) 274 (old-perm (when extra (vc-git-extra-fileinfo->old-perm extra)))
378 378
379 (defun vc-git-dir-status-files (dir files default-state update-function) 379 (defun vc-git-dir-status-files (dir files default-state update-function)
380 "Return a list of (FILE STATE EXTRA) entries for FILES in DIR." 380 "Return a list of (FILE STATE EXTRA) entries for FILES in DIR."
381 (vc-git-dir-status-goto-stage 'update-index files update-function)) 381 (vc-git-dir-status-goto-stage 'update-index files update-function))
382 382
383 (defun vc-git-status-extra-headers (dir) 383 (defun vc-git-dir-extra-headers (dir)
384 (let ((str (with-output-to-string 384 (let ((str (with-output-to-string
385 (with-current-buffer standard-output 385 (with-current-buffer standard-output
386 (vc-git--out-ok "symbolic-ref" "HEAD"))))) 386 (vc-git--out-ok "symbolic-ref" "HEAD")))))
387 (concat 387 (concat
388 (propertize "Branch : " 'face 'font-lock-type-face) 388 (propertize "Branch : " 'face 'font-lock-type-face)