« back to all changes in this revision
Viewing changes to bzrlib/diff.py
- browse files at revision 505
- compare with another revision
- download diff
- download tarball
- view history from revision 505
- Committer: Martin Pool
- Date: 2005-05-16 02:50:33 UTC
- Revision ID: mbp@sourcefrog.net-20050516025033-fa777681f59ffd37
- commit is verbose by default
- files added:
- bzrlib/tests.py
- files removed:
- patches
- files modified:
- NEWS
added
removed
bzrlib/diff.py
15
15
# along with this program; if not, write to the Free Software
16
16
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
17
18
from sets import Set, ImmutableSet
19
18
20
from trace import mutter
19
21
from errors import BzrError
20
22
21
23
22
def internal_diff(old_label, oldlines, new_label, newlines, to_file):
24
25
def _diff_one(oldlines, newlines, to_file, **kw):
23
26
import difflib
24
27
25
28
# FIXME: difflib is wrong if there is no trailing newline.
47
50
newlines[-1] += '\n'
48
51
nonl = True
49
52
50
ud = difflib.unified_diff(oldlines, newlines,
51
fromfile=old_label, tofile=new_label)
53
ud = difflib.unified_diff(oldlines, newlines, **kw)
52
54
53
55
# work-around for difflib being too smart for its own good
54
56
# if /dev/null is "1,0", patch won't recognize it as /dev/null
65
67
print >>to_file
66
68
67
69
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
from tempfile import NamedTemporaryFile
80
import os
81
82
oldtmpf = NamedTemporaryFile()
83
newtmpf = NamedTemporaryFile()
84
85
try:
86
# TODO: perhaps a special case for comparing to or from the empty
87
# sequence; can just use /dev/null on Unix
88
89
# TODO: if either of the files being compared already exists as a
90
# regular named file (e.g. in the working directory) then we can
91
# compare directly to that, rather than copying it.
92
93
oldtmpf.writelines(oldlines)
94
newtmpf.writelines(newlines)
95
96
oldtmpf.flush()
97
newtmpf.flush()
98
99
if not diff_opts:
100
diff_opts = []
101
diffcmd = ['diff',
102
'--label', old_label,
103
oldtmpf.name,
104
'--label', new_label,
105
newtmpf.name]
106
107
# diff only allows one style to be specified; they don't override.
108
# note that some of these take optargs, and the optargs can be
109
# directly appended to the options.
110
# this is only an approximate parser; it doesn't properly understand
111
# the grammar.
112
for s in ['-c', '-u', '-C', '-U',
113
'-e', '--ed',
114
'-q', '--brief',
115
'--normal',
116
'-n', '--rcs',
117
'-y', '--side-by-side',
118
'-D', '--ifdef']:
119
for j in diff_opts:
120
if j.startswith(s):
121
break
122
else:
123
continue
124
break
125
else:
126
diffcmd.append('-u')
127
128
if diff_opts:
129
diffcmd.extend(diff_opts)
130
131
rc = os.spawnvp(os.P_WAIT, 'diff', diffcmd)
132
133
if rc != 0 and rc != 1:
134
# returns 1 if files differ; that's OK
135
if rc < 0:
136
msg = 'signal %d' % (-rc)
137
else:
138
msg = 'exit code %d' % rc
139
140
raise BzrError('external diff failed with %s; command: %r' % (rc, diffcmd))
141
finally:
142
oldtmpf.close() # and delete
143
newtmpf.close()
144
145
146
147
def show_diff(b, revision, specific_files, external_diff_options=None):
70
def show_diff(b, revision, specific_files):
148
71
import sys
149
72
150
73
if revision == None:
154
77
155
78
new_tree = b.working_tree()
156
79
157
show_diff_trees(old_tree, new_tree, sys.stdout, specific_files,
158
external_diff_options)
159
160
161
162
def show_diff_trees(old_tree, new_tree, to_file, specific_files=None,
163
external_diff_options=None):
164
"""Show in text form the changes from one tree to another.
165
166
to_files
167
If set, include only changes to these files.
168
169
external_diff_options
170
If set, use an external GNU diff and pass these options.
171
"""
172
173
80
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
174
81
old_label = ''
175
82
new_label = ''
182
89
# TODO: Generation of pseudo-diffs for added/deleted files could
183
90
# be usefully made into a much faster special case.
184
91
185
if external_diff_options:
186
assert isinstance(external_diff_options, basestring)
187
opts = external_diff_options.split()
188
def diff_file(olab, olines, nlab, nlines, to_file):
189
external_diff(olab, olines, nlab, nlines, to_file, opts)
190
else:
191
diff_file = internal_diff
192
193
194
92
delta = compare_trees(old_tree, new_tree, want_unchanged=False,
195
93
specific_files=specific_files)
196
94
197
95
for path, file_id, kind in delta.removed:
198
96
print '*** removed %s %r' % (kind, path)
199
97
if kind == 'file':
200
diff_file(old_label + path,
201
old_tree.get_file(file_id).readlines(),
202
DEVNULL,
203
[],
204
to_file)
98
_diff_one(old_tree.get_file(file_id).readlines(),
99
[],
100
sys.stdout,
101
fromfile=old_label + path,
102
tofile=DEVNULL)
205
103
206
104
for path, file_id, kind in delta.added:
207
105
print '*** added %s %r' % (kind, path)
208
106
if kind == 'file':
209
diff_file(DEVNULL,
210
[],
211
new_label + path,
212
new_tree.get_file(file_id).readlines(),
213
to_file)
107
_diff_one([],
108
new_tree.get_file(file_id).readlines(),
109
sys.stdout,
110
fromfile=DEVNULL,
111
tofile=new_label + path)
214
112
215
113
for old_path, new_path, file_id, kind, text_modified in delta.renamed:
216
114
print '*** renamed %s %r => %r' % (kind, old_path, new_path)
217
115
if text_modified:
218
diff_file(old_label + old_path,
219
old_tree.get_file(file_id).readlines(),
220
new_label + new_path,
221
new_tree.get_file(file_id).readlines(),
222
to_file)
116
_diff_one(old_tree.get_file(file_id).readlines(),
117
new_tree.get_file(file_id).readlines(),
118
sys.stdout,
119
fromfile=old_label + old_path,
120
tofile=new_label + new_path)
223
121
224
122
for path, file_id, kind in delta.modified:
225
123
print '*** modified %s %r' % (kind, path)
226
124
if kind == 'file':
227
diff_file(old_label + path,
228
old_tree.get_file(file_id).readlines(),
229
new_label + path,
230
new_tree.get_file(file_id).readlines(),
231
to_file)
232
233
234
235
class TreeDelta(object):
125
_diff_one(old_tree.get_file(file_id).readlines(),
126
new_tree.get_file(file_id).readlines(),
127
sys.stdout,
128
fromfile=old_label + path,
129
tofile=new_label + path)
130
131
132
133
class TreeDelta:
236
134
"""Describes changes from one tree to another.
237
135
238
136
Contains four lists:
262
160
self.modified = []
263
161
self.unchanged = []
264
162
265
266
def touches_file_id(self, file_id):
267
"""Return True if file_id is modified by this delta."""
268
for l in self.added, self.removed, self.modified:
269
for v in l:
270
if v[1] == file_id:
271
return True
272
for v in self.renamed:
273
if v[2] == file_id:
274
return True
275
return False
276
277
278
163
def show(self, to_file, show_ids=False, show_unchanged=False):
279
164
def show_list(files):
280
165
for path, fid, kind in files:
383
268
elif want_unchanged:
384
269
delta.unchanged.append((new_path, file_id, kind))
385
270
else:
386
kind = old_inv.get_file_kind(file_id)
387
271
old_path = old_inv.id2path(file_id)
388
272
if specific_files:
389
273
if not is_inside_any(specific_files, old_path):
Loggerhead is a web-based interface for Breezy
Version: 2.0.1