1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
|
;; -*- mode: lisp-interaction; fill-column: 80 -*-
;;
;; xxdiff support for emacs.
;;
;; Author: Martin Blais <blais@furius.ca>
;;
;; This module provides various functions for invoking xxdiff from emacs. See
;; the source code for details.
(require 'ediff-util)
(defvar xxdiff-exec "xxdiff"
"The xxdiff executable to run.")
(defvar xxdiff-options '("-w" "-b")
"A list of options to pass to xxdiff when called from emacs with a prefix argument.")
(defun xxdiff-diff-buffer-and-file ()
"Runs xxdiff between the current buffer contents and the file on disk."
(interactive)
(let ((opts (if current-prefix-arg xxdiff-options nil)))
(apply 'call-process-region
(append (list (point-min) (point-max)
xxdiff-exec nil nil nil)
opts
(list "--title1" (format "%s (FILE)" (buffer-file-name))
"--title2" (format "%s (BUFFER)" (buffer-name))
(buffer-file-name) "-")))))
(defun xxdiff-svn-diff ()
"Diffs the current buffer and the latest Subversion file.
FIXME TODO: Instead of doing this, we should customize vc.el to
make the diff program selectable as a dynamic variable and
override it in this function."
;; FIXME: change vc.el :: vc-diff-internal instead, see below.
(interactive)
(let* ((name (buffer-name))
(fn (buffer-file-name))
(merged-fn (concat "/tmp/xxdiff.merged."
(prin1-to-string (emacs-pid)) "." name))
(latest (concat (file-name-directory fn)
".svn/text-base/"
(file-name-nondirectory fn)
".svn-base"))
(opts (if current-prefix-arg xxdiff-options nil)))
(apply 'call-process-region
(append (list (point-min) (point-max)
xxdiff-exec nil nil nil)
opts
(list "--title1" (format "%s (FILE)" latest)
"--title2" (format "%s (BUFFER)" name)
"--merged-filename" merged-fn
latest "-")))
(when (file-exists-p merged-fn)
(kill-region (point-min) (point-max))
(insert-file merged-fn)
(delete-file merged-fn)
(message "Restored buffer contents from xxdiff merged output."))
))
(defun xxdiff-log-view-diff-changeset (beg end)
"Get the diff between two revisions.
If the mark is not active or the mark is on the revision at point,
get the diff between the revision at point and its previous revision.
Otherwise, get the diff between the revisions where the region starts
and ends.
Contrary to `log-view-diff', it will show the whole changeset including
the changes that affected other files than the currently considered file(s)."
(interactive
(list (if mark-active (region-beginning) (point))
(if mark-active (region-end) (point))))
(when (eq (vc-call-backend log-view-vc-backend 'revision-granularity) 'file)
(error "The %s backend does not support changeset diffs" log-view-vc-backend))
(let ((fr (log-view-current-tag beg))
(to (log-view-current-tag end)))
(when (string-equal fr to)
;; TO and FR are the same, look at the previous revision.
(setq to (vc-call-backend log-view-vc-backend 'previous-revision nil fr)))
(let ((procname "xx-svn-review"))
(call-process procname nil nil nil to fr)
(message (format "Launched %s." procname))
)))
(defun xxdiff-compare-kill-ring ()
"Spawn an xxdiff to compare the last two entries on the
kill-ring. With prefix arg, compare the last three."
(interactive)
(let* ((idx (if mark-active -1 0))
(selections (list (current-kill (+ idx 1) t)
(if (= idx 0)
(current-kill idx t)
(buffer-substring (region-beginning) (region-end)))))
files)
(when current-prefix-arg
(setq selections (append (list (current-kill (+ idx 2) t)) selections))
;;(setcdr selections (cons (current-kill 2 t) (cdr selections)))
)
(setq files (mapcar
(lambda (sel) (let ((fn (make-temp-file "xxdiff-emacs.")))
(with-temp-file fn (insert sel))
fn))
selections))
(let ((args (append (list xxdiff-exec nil nil nil) files)))
(apply 'call-process args)
)
(dolist (fn files)
(when (file-exists-p fn) (delete-file fn)))
))
;; (call-process "/home/blais/p/xxdiff/bin/xxdiff" nil nil nil
;; "/tmp/xxdiff-emacs.2563rAR"
;; "/tmp/xxdiff-emacs.25634KX")
(defun xxdiff-compare-selections (beg end)
"If the secondary selection is active, compare that to the
primary selection. If not, compare the last entry in the
kill-ring to the primary selection (the active region). If the
region is not active (we have no primary selection), use the two
first entries on the kill-ring. This actually writes the regions
as temporary files and then invokes xxdiff."
(interactive "r")
(let (primary secondary)
(if mark-active
(setq primary
(buffer-substring (region-beginning) (region-end))
secondary
(condition-case nil
(prog1 (x-get-selection 'SECONDARY)
(message "xxdiff: Comparing against the secondary selection."))
(error (progn
(message "xxdiff: Comparing against the last value on the kill-ring.")
(current-kill 0 t)))))
(setq primary
(current-kill 0 t)
secondary
(current-kill 1 t)))
(let ((opts (if current-prefix-arg xxdiff-options nil))
(left (make-temp-file "xxdiff-emacs."))
(right (make-temp-file "xxdiff-emacs.")))
(with-temp-file left (insert secondary))
(with-temp-file right (insert primary))
(apply 'call-process-region
(append (list (point-min) (point-max)
xxdiff-exec nil nil nil)
opts
(list "--title1" "(SECONDARY REGION)"
"--title2" "(PRIMARY REGION)"
left right)))
(when (file-exists-p left) (delete-file left))
(when (file-exists-p right) (delete-file right))
)))
(provide 'xxdiff)
|
