diff options
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/vc-cvs.el | 5 | ||||
| -rw-r--r-- | lisp/vc-svn.el | 6 | ||||
| -rw-r--r-- | lisp/vc.el | 1 |
4 files changed, 10 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bfdba9ab2b8..eefada19f60 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -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 diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el index f5c86d4ead8..3728d725478 100644 --- a/lisp/vc-cvs.el +++ b/lisp/vc-cvs.el @@ -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 diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index 533a93c380f..7ce1634d45c 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -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)))) diff --git a/lisp/vc.el b/lisp/vc.el index e8a481be3d3..373d0f50124 100644 --- a/lisp/vc.el +++ b/lisp/vc.el @@ -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)) |