Merge lp:~naesten/dvc/devel into lp:dvc

[Samuel Bronson]

[Samuel Bronson (naesten)]

I fixed xdarcs-diff so that you get a file list and can jump between it and the diffs for the files.

[Stefan Reichör (stefan-xsteve)]

Hi Samuel!

> You have been requested to review the proposed merge of lp:~naesten/dvc/devel into lp:dvc.
>
> I fixed xdarcs-diff so that you get a file list and can jump between it and the diffs for the files.

Thanks for providing this fix.
I have merged from your branch now.

I hope I did the correct thing since I have not used the launchpad features yet.

Stefan.

=== modified file 'lisp/dvc-diff.el'
--- lisp/dvc-diff.el	2009-08-11 23:53:21 +0000
+++ lisp/dvc-diff.el	2009-09-11 18:40:25 +0000
@@ -46,7 +46,7 @@
 
 (defun dvc-dvc-search-file-in-diff (file)
   "Default for \"dvc-search-file-in-diff\". Place point on diff hunk for FILE."
-  (re-search-forward (concat "^\\+\\+\\+ \\(b\\|mod\\)/" file "\\(.+[0-9][0-9][0-9][0-9]\\)?$")))
+  (re-search-forward (concat "^\\+\\+\\+ \\(b\\|mod\\|new-[^/\n]+\\)/" file "\\(.+[0-9][0-9][0-9][0-9]\\)?$")))
 
 (defun dvc-prepare-changes-buffer (base modified type path dvc)
   "Create and return a buffer to run command showing diffs.
@@ -551,7 +551,7 @@
 
 (defun dvc-diff-find-file-name ()
   "Same as `diff-find-file-name', but works in more cases."
-  (cond ((re-search-backward "^\\+\\+\\+ \\(mod/\\|b/\\)?\\([^\n]*?\\)\\([ \t].*\\)?$" nil t)
+  (cond ((re-search-backward "^\\+\\+\\+ \\(mod/\\|b/\\|new-[^/\n]+/\\)?\\([^\n]*?\\)\\([ \t].*\\)?$" nil t)
          (match-string-no-properties 2))
         ((not (ewoc-locate dvc-fileinfo-ewoc (point))) ;; the buffer contains no diff
          "")

=== modified file 'lisp/xdarcs.el'
--- lisp/xdarcs.el	2008-07-11 18:09:58 +0000
+++ lisp/xdarcs.el	2009-09-11 18:06:32 +0000
@@ -31,6 +31,7 @@
 
 (require 'dvc-core)
 (require 'dvc-utils)
+(require 'dvc-diff)
 (require 'xdarcs-core)
 
 (defun xdarcs-initialize (&optional dir)
@@ -255,7 +256,40 @@
 ;; diff
 ;; --------------------------------------------------------------------------------
 (defun xdarcs-parse-diff (changes-buffer)
-  nil)
+  (save-excursion
+    (while (re-search-forward
+            "^diff\\( -[^ ]*\\)* old-[^ ]* new-[^/]*/\\(.*\\)$" nil t)
+
+      (let* ((name (match-string-no-properties 2))
+             ; Darcs does not appear to provide any of this information via
+             ; "darcs diff". But maybe that won't always be the case?
+             ; Also, going forwards might help all the diffs to appear...
+             (added (progn (forward-line 1)
+                           (looking-at "^--- /dev/null")))
+             (removed (progn (forward-line 1)
+                             (looking-at "^\\+\\+\\+ /dev/null"))))
+
+      ; Darcs 2.30, at least, is not putting any blank lines between diffs...
+      (save-excursion
+        (forward-line -2)
+        (if (not (or (looking-back "^$")
+                     (= (point) (point-min))))
+            (insert "\n")))
+
+        (with-current-buffer changes-buffer
+          (ewoc-enter-last
+           dvc-fileinfo-ewoc
+           (make-dvc-fileinfo-legacy
+            :data (list 'file
+                        name
+                        (cond (added   "A")
+                              (removed "D")
+                              (t " "))
+                        (cond ((or added removed) " ")
+                              (t "M"))
+                        " "             ; dir. directories are not
+                                        ; tracked in git
+                        nil))))))))
 
 ;;;###autoload
 (defun xdarcs-dvc-diff (&optional against path dont-switch)