bug#2964: vc-dir support for vc-mtn.el

bug#2964: vc-dir support for vc-mtn.el

[Dan Nicolaescu]

vc-mtn.el does not support vc-dir.

The patch below adds that support.  It reuses some regexps from elsewhere in the file.
Archiving here so that it can be applied whenever it's acceptable.

Index: vc-mtn.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-mtn.el,v
retrieving revision 1.23
diff -u -3 -p -c -r1.23 vc-mtn.el
cvs diff: conflicting specifications of output style
*** vc-mtn.el         1 Apr 2009 20:01:19 -0000 1.23
--- vc-mtn.el         11 Apr 2009 07:44:39 -0000
*************** If nil, use the value of `vc-diff-switch
*** 106,111 ****
--- 106,126 ----
         ((match-end 2) 'added)
              (t 'up-to-date)))))
  
+ (defun vc-mtn-after-dir-status (update-function)
+   (let (result)
+     (goto-char (point-min))
+     (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)" nil t)
+     (while (re-search-forward
+         "^  \\(?:\\(patched  \\)\\|\\(added    \\)\\)\\(.*\\)$" nil t)
+       (cond  ((match-end 1) (push (list (match-string 3) 'edited) result))
+            ((match-end 2) (push (list (match-string 3) 'added) result))))
+     (funcall update-function result)))
+ 
+ (defun vc-mtn-dir-status (dir update-function)
+   (vc-mtn-command (current-buffer) 'async dir "status")
+   (vc-exec-after
+    `(vc-mtn-after-dir-status (quote ,update-function))))
+ 
  (defun vc-mtn-working-revision (file)
    ;; If `mtn' fails or returns status>0, or if the search fails, just
    ;; return nil.

bug#2964: marked as done (vc-dir support for vc-mtn.el)

[Emacs bug Tracking System]

[-- Attachment #1: Type: text/plain, Size: 878 bytes --]

Your message dated Wed, 26 Aug 2009 11:35:22 -0700 (PDT)
with message-id <200908261835.n7QIZMTP023389@godzilla.ics.uci.edu>
and subject line Re: bug#2964: vc-dir support for vc-mtn.el
has caused the Emacs bug report #2964,
regarding vc-dir support for vc-mtn.el
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@emacsbugs.donarmstrong.com
immediately.)


-- 
2964: http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=2964
Emacs Bug Tracking System
Contact owner@emacsbugs.donarmstrong.com with problems

[-- Attachment #2: Type: message/rfc822, Size: 4002 bytes --]

From: Dan Nicolaescu <dann@ics.uci.edu>
To: bug-gnu-emacs <bug-gnu-emacs@gnu.org>
Subject: vc-dir support for vc-mtn.el
Date: Sat, 11 Apr 2009 08:31:48 -0700 (PDT)
Message-ID: <200904111531.n3BFVmsM012824@godzilla.ics.uci.edu>

vc-mtn.el does not support vc-dir.

The patch below adds that support.  It reuses some regexps from elsewhere in the file.
Archiving here so that it can be applied whenever it's acceptable.

Index: vc-mtn.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-mtn.el,v
retrieving revision 1.23
diff -u -3 -p -c -r1.23 vc-mtn.el
cvs diff: conflicting specifications of output style
*** vc-mtn.el         1 Apr 2009 20:01:19 -0000 1.23
--- vc-mtn.el         11 Apr 2009 07:44:39 -0000
*************** If nil, use the value of `vc-diff-switch
*** 106,111 ****
--- 106,126 ----
         ((match-end 2) 'added)
              (t 'up-to-date)))))
  
+ (defun vc-mtn-after-dir-status (update-function)
+   (let (result)
+     (goto-char (point-min))
+     (re-search-forward "Current branch: \\(.*\\)\nChanges against parent \\(.*\\)" nil t)
+     (while (re-search-forward
+         "^  \\(?:\\(patched  \\)\\|\\(added    \\)\\)\\(.*\\)$" nil t)
+       (cond  ((match-end 1) (push (list (match-string 3) 'edited) result))
+            ((match-end 2) (push (list (match-string 3) 'added) result))))
+     (funcall update-function result)))
+ 
+ (defun vc-mtn-dir-status (dir update-function)
+   (vc-mtn-command (current-buffer) 'async dir "status")
+   (vc-exec-after
+    `(vc-mtn-after-dir-status (quote ,update-function))))
+ 
  (defun vc-mtn-working-revision (file)
    ;; If `mtn' fails or returns status>0, or if the search fails, just
    ;; return nil.




[-- Attachment #3: Type: message/rfc822, Size: 1965 bytes --]

From: Dan Nicolaescu <dann@ics.uci.edu>
To: 2964-done@emacsbugs.donarmstrong.com
Subject: Re: bug#2964: vc-dir support for vc-mtn.el
Date: Wed, 26 Aug 2009 11:35:22 -0700 (PDT)
Message-ID: <200908261835.n7QIZMTP023389@godzilla.ics.uci.edu>

Closing, the patch has been checked in a while ago.