Mercurial > emacs
changeset 87449:7477a697d7e1
* vc-cvs.el, vc-svn.el: Simplify backend dired-state-info
functions so they don't do work that the default one can do instead
| author | Eric S. Raymond <esr@snark.thyrsus.com> |
|---|---|
| date | Fri, 28 Dec 2007 16:24:31 +0000 |
| parents | a721577a4af2 |
| children | 71fc7b1db920 |
| files | lisp/ChangeLog lisp/vc-cvs.el lisp/vc-svn.el lisp/vc.el |
| diffstat | 4 files changed, 10 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Dec 28 15:00:21 2007 +0000 +++ b/lisp/ChangeLog Fri Dec 28 16:24:31 2007 +0000 @@ -16,6 +16,9 @@ keeping undo lists on the buffers holding status output, which can get extremely large. + * vc-cvs.el, vc-svn.el: Simplify backend dired-state-info + functions so they don't do work that the default one can do instead + 2007-12-28 Nick Roberts <nickrob@snap.net.nz> * thumbs.el (thumbs-call-convert): Use call-process directly
--- a/lisp/vc-cvs.el Fri Dec 28 15:00:21 2007 +0000 +++ b/lisp/vc-cvs.el Fri Dec 28 16:24:31 2007 +0000 @@ -285,9 +285,8 @@ (cond ((eq cvs-state 'edited) (if (equal (vc-working-revision file) "0") "(added)" "(modified)")) - ((eq cvs-state 'needs-patch) "(patch)") - ((eq cvs-state 'needs-merge) "(merge)")))) - + (t + (vc-default-dired-state-info 'CVS file))))) ;;; ;;; State-changing functions
--- a/lisp/vc-svn.el Fri Dec 28 15:00:21 2007 +0000 +++ b/lisp/vc-svn.el Fri Dec 28 16:24:31 2007 +0000 @@ -179,8 +179,10 @@ (cond ((eq svn-state 'edited) (if (equal (vc-working-revision file) "0") "(added)" "(modified)")) - ((eq svn-state 'needs-patch) "(patch)") - ((eq svn-state 'needs-merge) "(merge)")))) + (t + ;; fall back to the default VC representation + (vc-default-dired-state-info 'SVN file))))) + (defun vc-svn-previous-revision (file rev) (let ((newrev (1- (string-to-number rev))))
--- a/lisp/vc.el Fri Dec 28 15:00:21 2007 +0000 +++ b/lisp/vc.el Fri Dec 28 16:24:31 2007 +0000 @@ -3075,6 +3075,7 @@ ((eq state 'edited) (concat "(" (vc-user-login-name file) ")")) ((eq state 'needs-merge) "(merge)") ((eq state 'needs-patch) "(patch)") + ((eq state 'added) "(added)") ((eq state 'unlocked-changes) "(stale)"))) (buffer (get-file-buffer file))