Mercurial > emacs
comparison lisp/vc-bzr.el @ 94539:fee32a11924d
Name change in preparation for ripping out vc-dired.
author | Eric S. Raymond <esr@snark.thyrsus.com> |
---|---|
date | Fri, 02 May 2008 06:56:59 +0000 |
parents | a69dcc2c42ae |
children | a0bb8ca25a33 |
comparison
equal
deleted
inserted
replaced
94538:dc1cd59ce955 | 94539:fee32a11924d |
---|---|
645 (t | 645 (t |
646 ;; skip this part of `bzr status' output | 646 ;; skip this part of `bzr status' output |
647 (setq current-vc-state nil) | 647 (setq current-vc-state nil) |
648 (setq current-bzr-state nil))))))) | 648 (setq current-bzr-state nil))))))) |
649 | 649 |
650 (defun vc-bzr-dired-state-info (file) | 650 (defun vc-bzr-prettify-state-info (file) |
651 "Bzr-specific version of `vc-dired-state-info'." | 651 "Bzr-specific version of `vc-prettify-state-info'." |
652 (if (eq 'edited (vc-state file)) | 652 (if (eq 'edited (vc-state file)) |
653 (concat "(" (symbol-name (or (vc-file-getprop file 'vc-bzr-state) | 653 (concat "(" (symbol-name (or (vc-file-getprop file 'vc-bzr-state) |
654 'edited)) ")") | 654 'edited)) ")") |
655 ;; else fall back to default vc.el representation | 655 ;; else fall back to default vc.el representation |
656 (vc-default-dired-state-info 'Bzr file))) | 656 (vc-default-prettify-state-info 'Bzr file))) |
657 | 657 |
658 ;; XXX: this needs testing, it's probably incomplete. | 658 ;; XXX: this needs testing, it's probably incomplete. |
659 (defun vc-bzr-after-dir-status (update-function) | 659 (defun vc-bzr-after-dir-status (update-function) |
660 (let ((status-str nil) | 660 (let ((status-str nil) |
661 (file nil) | 661 (file nil) |