Commit 0f67cc71 authored by Eric S. Raymond's avatar Eric S. Raymond
Browse files

* 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
parent 5b7ec6a8
......@@ -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
......
......@@ -285,9 +285,8 @@ committed and support display of sticky tags."
(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
......
......@@ -179,8 +179,10 @@ If you want to force an empty list of arguments, use t."
(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))))
......
......@@ -3075,6 +3075,7 @@ to provide the `find-revision' operation instead."
((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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment