« back to all changes in this revision
Viewing changes to bzrlib/diff.py
- browse files at revision 542
- compare with another revision
- download diff
- download tarball
- view history from revision 542
- Committer: Martin Pool
- Date: 2005-05-19 08:31:06 UTC
- Revision ID: mbp@sourcefrog.net-20050519083106-ebe71562d3bda4a7
- fix typo
- files removed:
- bzrlib/lock.py
- files modified:
- NEWS
added
removed
bzrlib/diff.py
19
19
from errors import BzrError
20
20
21
21
22
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
22
23
def _diff_one(oldlines, newlines, to_file, **kw):
23
24
import difflib
24
25
25
26
# FIXME: difflib is wrong if there is no trailing newline.
47
48
newlines[-1] += '\n'
48
49
nonl = True
49
50
50
ud = difflib.unified_diff(oldlines, newlines,
51
fromfile=old_label, tofile=new_label)
51
ud = difflib.unified_diff(oldlines, newlines, **kw)
52
52
53
53
# work-around for difflib being too smart for its own good
54
54
# if /dev/null is "1,0", patch won't recognize it as /dev/null
65
65
print >>to_file
66
66
67
67
68
69
70
def external_diff(old_label, oldlines, new_label, newlines, to_file,
71
diff_opts):
72
"""Display a diff by calling out to the external diff program."""
73
import sys
74
75
if to_file != sys.stdout:
76
raise NotImplementedError("sorry, can't send external diff other than to stdout yet",
77
to_file)
78
79
# make sure our own output is properly ordered before the diff
80
to_file.flush()
81
82
from tempfile import NamedTemporaryFile
83
import os
84
85
oldtmpf = NamedTemporaryFile()
86
newtmpf = NamedTemporaryFile()
87
88
try:
89
# TODO: perhaps a special case for comparing to or from the empty
90
# sequence; can just use /dev/null on Unix
91
92
# TODO: if either of the files being compared already exists as a
93
# regular named file (e.g. in the working directory) then we can
94
# compare directly to that, rather than copying it.
95
96
oldtmpf.writelines(oldlines)
97
newtmpf.writelines(newlines)
98
99
oldtmpf.flush()
100
newtmpf.flush()
101
102
if not diff_opts:
103
diff_opts = []
104
diffcmd = ['diff',
105
'--label', old_label,
106
oldtmpf.name,
107
'--label', new_label,
108
newtmpf.name]
109
110
# diff only allows one style to be specified; they don't override.
111
# note that some of these take optargs, and the optargs can be
112
# directly appended to the options.
113
# this is only an approximate parser; it doesn't properly understand
114
# the grammar.
115
for s in ['-c', '-u', '-C', '-U',
116
'-e', '--ed',
117
'-q', '--brief',
118
'--normal',
119
'-n', '--rcs',
120
'-y', '--side-by-side',
121
'-D', '--ifdef']:
122
for j in diff_opts:
123
if j.startswith(s):
124
break
125
else:
126
continue
127
break
128
else:
129
diffcmd.append('-u')
130
131
if diff_opts:
132
diffcmd.extend(diff_opts)
133
134
rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
135
136
if rc != 0 and rc != 1:
137
# returns 1 if files differ; that's OK
138
if rc < 0:
139
msg = 'signal %d' % (-rc)
140
else:
141
msg = 'exit code %d' % rc
142
143
raise BzrError('external diff failed with %s; command: %r' % (rc, diffcmd))
144
finally:
145
oldtmpf.close() # and delete
146
newtmpf.close()
147
148
149
150
def show_diff(b, revision, specific_files, external_diff_options=None):
68
def show_diff(b, revision, specific_files):
151
69
import sys
152
70
153
71
if revision == None:
157
75
158
76
new_tree = b.working_tree()
159
77
160
show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
161
external_diff_options)
162
163
164
165
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
166
external_diff_options=None):
167
"""Show in text form the changes from one tree to another.
168
169
to_files
170
If set, include only changes to these files.
171
172
external_diff_options
173
If set, use an external GNU diff and pass these options.
174
"""
175
176
78
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
177
79
old_label = ''
178
80
new_label = ''
185
87
# TODO: Generation of pseudo-diffs for added/deleted files could
186
88
# be usefully made into a much faster special case.
187
89
188
if external_diff_options:
189
assert isinstance(external_diff_options, basestring)
190
opts = external_diff_options.split()
191
def diff_file(olab, olines, nlab, nlines, to_file):
192
external_diff(olab, olines, nlab, nlines, to_file, opts)
193
else:
194
diff_file = internal_diff
195
196
197
90
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
198
91
specific_files=specific_files)
199
92
200
93
for path, file_id, kind in delta.removed:
201
94
print '*** removed %s %r' % (kind, path)
202
95
if kind == 'file':
203
diff_file(old_label + path,
204
old_tree.get_file(file_id).readlines(),
205
DEVNULL,
206
[],
207
to_file)
96
_diff_one(old_tree.get_file(file_id).readlines(),
97
[],
98
sys.stdout,
99
fromfile=old_label + path,
100
tofile=DEVNULL)
208
101
209
102
for path, file_id, kind in delta.added:
210
103
print '*** added %s %r' % (kind, path)
211
104
if kind == 'file':
212
diff_file(DEVNULL,
213
[],
214
new_label + path,
215
new_tree.get_file(file_id).readlines(),
216
to_file)
105
_diff_one([],
106
new_tree.get_file(file_id).readlines(),
107
sys.stdout,
108
fromfile=DEVNULL,
109
tofile=new_label + path)
217
110
218
111
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
219
112
print '*** renamed %s %r => %r' % (kind, old_path, new_path)
220
113
if text_modified:
221
diff_file(old_label + old_path,
222
old_tree.get_file(file_id).readlines(),
223
new_label + new_path,
224
new_tree.get_file(file_id).readlines(),
225
to_file)
114
_diff_one(old_tree.get_file(file_id).readlines(),
115
new_tree.get_file(file_id).readlines(),
116
sys.stdout,
117
fromfile=old_label + old_path,
118
tofile=new_label + new_path)
226
119
227
120
for path, file_id, kind in delta.modified:
228
121
print '*** modified %s %r' % (kind, path)
229
122
if kind == 'file':
230
diff_file(old_label + path,
231
old_tree.get_file(file_id).readlines(),
232
new_label + path,
233
new_tree.get_file(file_id).readlines(),
234
to_file)
235
236
237
238
class TreeDelta(object):
123
_diff_one(old_tree.get_file(file_id).readlines(),
124
new_tree.get_file(file_id).readlines(),
125
sys.stdout,
126
fromfile=old_label + path,
127
tofile=new_label + path)
128
129
130
131
class TreeDelta:
239
132
"""Describes changes from one tree to another.
240
133
241
134
Contains four lists:
386
279
elif want_unchanged:
387
280
delta.unchanged.append((new_path, file_id, kind))
388
281
else:
389
kind = old_inv.get_file_kind(file_id)
390
282
old_path = old_inv.id2path(file_id)
391
283
if specific_files:
392
284
if not is_inside_any(specific_files, old_path):
Loggerhead is a web-based interface for Breezy
Version: 2.0.1