« back to all changes in this revision
Viewing changes to bzrlib/diff.py
- browse files at revision 787
- compare with another revision
- download diff
- download tarball
- view history from revision 787
- Committer: Martin Pool
- Date: 2005-06-27 01:25:24 UTC
- Revision ID: mbp@sourcefrog.net-20050627012523-50f6769ce9e125f9
- tweak rsync upload script
- files added:
- bzr-man.py
- bzrlib/selftest
- plugins
- plugins/changeset
- files renamed:
- contrib/bash/bzr => contrib/bash/bzr.simple
- files modified:
- .bzrignore
added
removed
bzrlib/diff.py
19
19
from errors import BzrError
20
20
21
21
22
# TODO: Rather than building a changeset object, we should probably
23
# invoke callbacks on an object. That object can either accumulate a
24
# list, write them out directly, etc etc.
22
25
23
def _diff_one(oldlines, newlines, to_file, **kw):
26
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
24
27
import difflib
25
28
26
29
# FIXME: difflib is wrong if there is no trailing newline.
48
51
newlines[-1] += '\n'
49
52
nonl = True
50
53
51
ud = difflib.unified_diff(oldlines, newlines, **kw)
54
ud = difflib.unified_diff(oldlines, newlines,
55
fromfile=old_label, tofile=new_label)
52
56
53
57
# work-around for difflib being too smart for its own good
54
58
# if /dev/null is "1,0", patch won't recognize it as /dev/null
66
70
67
71
68
72
69
def show_diff(b, revision, specific_files):
73
74
def external_diff(old_label, oldlines, new_label, newlines, to_file,
75
diff_opts):
76
"""Display a diff by calling out to the external diff program."""
77
import sys
78
79
if to_file != sys.stdout:
80
raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
81
to_file)
82
83
# make sure our own output is properly ordered before the diff
84
to_file.flush()
85
86
from tempfile import NamedTemporaryFile
87
import os
88
89
oldtmpf = NamedTemporaryFile()
90
newtmpf = NamedTemporaryFile()
91
92
try:
93
# TODO: perhaps a special case for comparing to or from the empty
94
# sequence; can just use /dev/null on Unix
95
96
# TODO: if either of the files being compared already exists as a
97
# regular named file (e.g. in the working directory) then we can
98
# compare directly to that, rather than copying it.
99
100
oldtmpf.writelines(oldlines)
101
newtmpf.writelines(newlines)
102
103
oldtmpf.flush()
104
newtmpf.flush()
105
106
if not diff_opts:
107
diff_opts = []
108
diffcmd = ['diff',
109
'--label', old_label,
110
oldtmpf.name,
111
'--label', new_label,
112
newtmpf.name]
113
114
# diff only allows one style to be specified; they don't override.
115
# note that some of these take optargs, and the optargs can be
116
# directly appended to the options.
117
# this is only an approximate parser; it doesn't properly understand
118
# the grammar.
119
for s in ['-c', '-u', '-C', '-U',
120
'-e', '--ed',
121
'-q', '--brief',
122
'--normal',
123
'-n', '--rcs',
124
'-y', '--side-by-side',
125
'-D', '--ifdef']:
126
for j in diff_opts:
127
if j.startswith(s):
128
break
129
else:
130
continue
131
break
132
else:
133
diffcmd.append('-u')
134
135
if diff_opts:
136
diffcmd.extend(diff_opts)
137
138
rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
139
140
if rc != 0 and rc != 1:
141
# returns 1 if files differ; that's OK
142
if rc < 0:
143
msg = 'signal %d' % (-rc)
144
else:
145
msg = 'exit code %d' % rc
146
147
raise BzrError('external diff failed with %s; command: %r' % (rc, diffcmd))
148
finally:
149
oldtmpf.close() # and delete
150
newtmpf.close()
151
152
153
154
def show_diff(b, revision, specific_files, external_diff_options=None):
155
"""Shortcut for showing the diff to the working tree.
156
157
b
158
Branch.
159
160
revision
161
None for each, or otherwise the old revision to compare against.
162
163
The more general form is show_diff_trees(), where the caller
164
supplies any two trees.
165
"""
70
166
import sys
71
167
72
168
if revision == None:
76
172
77
173
new_tree = b.working_tree()
78
174
79
show_diff_trees(old_tree, new_tree, sys.stdout, specific_files)
80
81
82
83
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None):
175
show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
176
external_diff_options)
177
178
179
180
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
181
external_diff_options=None):
84
182
"""Show in text form the changes from one tree to another.
85
183
86
184
to_files
87
185
If set, include only changes to these files.
186
187
external_diff_options
188
If set, use an external GNU diff and pass these options.
88
189
"""
89
190
90
191
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
99
200
# TODO: Generation of pseudo-diffs for added/deleted files could
100
201
# be usefully made into a much faster special case.
101
202
203
if external_diff_options:
204
assert isinstance(external_diff_options, basestring)
205
opts = external_diff_options.split()
206
def diff_file(olab, olines, nlab, nlines, to_file):
207
external_diff(olab, olines, nlab, nlines, to_file, opts)
208
else:
209
diff_file = internal_diff
210
211
102
212
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
103
213
specific_files=specific_files)
104
214
105
215
for path, file_id, kind in delta.removed:
106
print '*** removed %s %r' % (kind, path)
216
print >>to_file, '*** removed %s %r' % (kind, path)
107
217
if kind == 'file':
108
_diff_one(old_tree.get_file(file_id).readlines(),
109
[],
110
to_file,
111
fromfile=old_label + path,
112
tofile=DEVNULL)
218
diff_file(old_label + path,
219
old_tree.get_file(file_id).readlines(),
220
DEVNULL,
221
[],
222
to_file)
113
223
114
224
for path, file_id, kind in delta.added:
115
print '*** added %s %r' % (kind, path)
225
print >>to_file, '*** added %s %r' % (kind, path)
116
226
if kind == 'file':
117
_diff_one([],
118
new_tree.get_file(file_id).readlines(),
119
to_file,
120
fromfile=DEVNULL,
121
tofile=new_label + path)
227
diff_file(DEVNULL,
228
[],
229
new_label + path,
230
new_tree.get_file(file_id).readlines(),
231
to_file)
122
232
123
233
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
124
print '*** renamed %s %r => %r' % (kind, old_path, new_path)
234
print >>to_file, '*** renamed %s %r => %r' % (kind, old_path, new_path)
125
235
if text_modified:
126
_diff_one(old_tree.get_file(file_id).readlines(),
127
new_tree.get_file(file_id).readlines(),
128
to_file,
129
fromfile=old_label + old_path,
130
tofile=new_label + new_path)
236
diff_file(old_label + old_path,
237
old_tree.get_file(file_id).readlines(),
238
new_label + new_path,
239
new_tree.get_file(file_id).readlines(),
240
to_file)
131
241
132
242
for path, file_id, kind in delta.modified:
133
print '*** modified %s %r' % (kind, path)
243
print >>to_file, '*** modified %s %r' % (kind, path)
134
244
if kind == 'file':
135
_diff_one(old_tree.get_file(file_id).readlines(),
136
new_tree.get_file(file_id).readlines(),
137
to_file,
138
fromfile=old_label + path,
139
tofile=new_label + path)
245
diff_file(old_label + path,
246
old_tree.get_file(file_id).readlines(),
247
new_label + path,
248
new_tree.get_file(file_id).readlines(),
249
to_file)
140
250
141
251
142
252
161
271
Files that are both modified and renamed are listed only in
162
272
renamed, with the text_modified flag true.
163
273
274
Files are only considered renamed if their name has changed or
275
their parent directory has changed. Renaming a directory
276
does not count as renaming all its contents.
277
164
278
The lists are normally sorted when the delta is created.
165
279
"""
166
280
def __init__(self):
170
284
self.modified = []
171
285
self.unchanged = []
172
286
287
def __eq__(self, other):
288
if not isinstance(other, TreeDelta):
289
return False
290
return self.added == other.added \
291
and self.removed == other.removed \
292
and self.renamed == other.renamed \
293
and self.modified == other.modified \
294
and self.unchanged == other.unchanged
295
296
def __ne__(self, other):
297
return not (self == other)
298
299
def __repr__(self):
300
return "TreeDelta(added=%r, removed=%r, renamed=%r, modified=%r," \
301
" unchanged=%r)" % (self.added, self.removed, self.renamed,
302
self.modified, self.unchanged)
303
304
def has_changed(self):
305
changes = len(self.added) + len(self.removed) + len(self.renamed)
306
changes += len(self.modified)
307
return (changes != 0)
173
308
174
309
def touches_file_id(self, file_id):
175
310
"""Return True if file_id is modified by this delta."""
222
357
223
358
224
359
225
def compare_trees(old_tree, new_tree, want_unchanged, specific_files=None):
360
def compare_trees(old_tree, new_tree, want_unchanged=False, specific_files=None):
226
361
"""Describe changes from one tree to another.
227
362
228
363
Returns a TreeDelta with details of added, modified, renamed, and
265
400
old_path = old_inv.id2path(file_id)
266
401
new_path = new_inv.id2path(file_id)
267
402
403
old_ie = old_inv[file_id]
404
new_ie = new_inv[file_id]
405
268
406
if specific_files:
269
407
if (not is_inside_any(specific_files, old_path)
270
408
and not is_inside_any(specific_files, new_path)):
283
421
# the same and the parents are unchanged all the way up.
284
422
# May not be worthwhile.
285
423
286
if old_path != new_path:
424
if (old_ie.name != new_ie.name
425
or old_ie.parent_id != new_ie.parent_id):
287
426
delta.renamed.append((old_path, new_path, file_id, kind,
288
427
text_modified))
289
428
elif text_modified:
291
430
elif want_unchanged:
292
431
delta.unchanged.append((new_path, file_id, kind))
293
432
else:
433
kind = old_inv.get_file_kind(file_id)
294
434
old_path = old_inv.id2path(file_id)
295
435
if specific_files:
296
436
if not is_inside_any(specific_files, old_path):
Loggerhead is a web-based interface for Breezy
Version: 2.0.1