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
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
|
#! /usr/bin/env python
# -*- coding: UTF-8 -*-
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from sets import Set
from trace import mutter
from errors import BzrError
def diff_trees(old_tree, new_tree):
"""Compute diff between two trees.
They may be in different branches and may be working or historical
trees.
Yields a sequence of (state, id, old_name, new_name, kind).
Each filename and each id is listed only once.
"""
## TODO: Compare files before diffing; only mention those that have changed
## TODO: Set nice names in the headers, maybe include diffstat
## TODO: Perhaps make this a generator rather than using
## a callback object?
## TODO: Allow specifying a list of files to compare, rather than
## doing the whole tree? (Not urgent.)
## TODO: Allow diffing any two inventories, not just the
## current one against one. We mgiht need to specify two
## stores to look for the files if diffing two branches. That
## might imply this shouldn't be primarily a Branch method.
## XXX: This doesn't report on unknown files; that can be done
## from a separate method.
old_it = old_tree.list_files()
new_it = new_tree.list_files()
def next(it):
try:
return it.next()
except StopIteration:
return None
old_item = next(old_it)
new_item = next(new_it)
# We step through the two sorted iterators in parallel, trying to
# keep them lined up.
while (old_item != None) or (new_item != None):
# OK, we still have some remaining on both, but they may be
# out of step.
if old_item != None:
old_name, old_class, old_kind, old_id = old_item
else:
old_name = None
if new_item != None:
new_name, new_class, new_kind, new_id = new_item
else:
new_name = None
mutter(" diff pairwise %r" % (old_item,))
mutter(" %r" % (new_item,))
if old_item:
# can't handle the old tree being a WorkingTree
assert old_class == 'V'
if new_item and (new_class != 'V'):
yield new_class, None, None, new_name, new_kind
new_item = next(new_it)
elif (not new_item) or (old_item and (old_name < new_name)):
mutter(" extra entry in old-tree sequence")
if new_tree.has_id(old_id):
# will be mentioned as renamed under new name
pass
else:
yield 'D', old_id, old_name, None, old_kind
old_item = next(old_it)
elif (not old_item) or (new_item and (new_name < old_name)):
mutter(" extra entry in new-tree sequence")
if old_tree.has_id(new_id):
yield 'R', new_id, old_tree.id2path(new_id), new_name, new_kind
else:
yield 'A', new_id, None, new_name, new_kind
new_item = next(new_it)
elif old_id != new_id:
assert old_name == new_name
# both trees have a file of this name, but it is not the
# same file. in other words, the old filename has been
# overwritten by either a newly-added or a renamed file.
# (should we return something about the overwritten file?)
if old_tree.has_id(new_id):
# renaming, overlying a deleted file
yield 'R', new_id, old_tree.id2path(new_id), new_name, new_kind
else:
yield 'A', new_id, None, new_name, new_kind
new_item = next(new_it)
old_item = next(old_it)
else:
assert old_id == new_id
assert old_id != None
assert old_name == new_name
assert old_kind == new_kind
if old_kind == 'directory':
yield '.', new_id, old_name, new_name, new_kind
elif old_tree.get_file_size(old_id) != new_tree.get_file_size(old_id):
mutter(" file size has changed, must be different")
yield 'M', new_id, old_name, new_name, new_kind
elif old_tree.get_file_sha1(old_id) == new_tree.get_file_sha1(old_id):
mutter(" SHA1 indicates they're identical")
## assert compare_files(old_tree.get_file(i), new_tree.get_file(i))
yield '.', new_id, old_name, new_name, new_kind
else:
mutter(" quick compare shows different")
yield 'M', new_id, old_name, new_name, new_kind
new_item = next(new_it)
old_item = next(old_it)
def show_diff(b, revision, file_list):
import difflib, sys, types
if revision == None:
old_tree = b.basis_tree()
else:
old_tree = b.revision_tree(b.lookup_revision(revision))
new_tree = b.working_tree()
# TODO: Options to control putting on a prefix or suffix, perhaps as a format string
old_label = ''
new_label = ''
DEVNULL = '/dev/null'
# Windows users, don't panic about this filename -- it is a
# special signal to GNU patch that the file should be created or
# deleted respectively.
# TODO: Generation of pseudo-diffs for added/deleted files could
# be usefully made into a much faster special case.
# TODO: Better to return them in sorted order I think.
if file_list:
file_list = [b.relpath(f) for f in file_list]
# FIXME: If given a file list, compare only those files rather
# than comparing everything and then throwing stuff away.
for file_state, fid, old_name, new_name, kind in diff_trees(old_tree, new_tree):
if file_list and (new_name not in file_list):
continue
# Don't show this by default; maybe do it if an option is passed
# idlabel = ' {%s}' % fid
idlabel = ''
# FIXME: Something about the diff format makes patch unhappy
# with newly-added files.
def diffit(oldlines, newlines, **kw):
# FIXME: difflib is wrong if there is no trailing newline.
# The syntax used by patch seems to be "\ No newline at
# end of file" following the last diff line from that
# file. This is not trivial to insert into the
# unified_diff output and it might be better to just fix
# or replace that function.
# In the meantime we at least make sure the patch isn't
# mangled.
# Special workaround for Python2.3, where difflib fails if
# both sequences are empty.
if not oldlines and not newlines:
return
nonl = False
if oldlines and (oldlines[-1][-1] != '\n'):
oldlines[-1] += '\n'
nonl = True
if newlines and (newlines[-1][-1] != '\n'):
newlines[-1] += '\n'
nonl = True
ud = difflib.unified_diff(oldlines, newlines, **kw)
sys.stdout.writelines(ud)
if nonl:
print "\\ No newline at end of file"
sys.stdout.write('\n')
if file_state in ['.', '?', 'I']:
continue
elif file_state == 'A':
print '*** added %s %r' % (kind, new_name)
if kind == 'file':
diffit([],
new_tree.get_file(fid).readlines(),
fromfile=DEVNULL,
tofile=new_label + new_name + idlabel)
elif file_state == 'D':
assert isinstance(old_name, types.StringTypes)
print '*** deleted %s %r' % (kind, old_name)
if kind == 'file':
diffit(old_tree.get_file(fid).readlines(), [],
fromfile=old_label + old_name + idlabel,
tofile=DEVNULL)
elif file_state in ['M', 'R']:
if file_state == 'M':
assert kind == 'file'
assert old_name == new_name
print '*** modified %s %r' % (kind, new_name)
elif file_state == 'R':
print '*** renamed %s %r => %r' % (kind, old_name, new_name)
if kind == 'file':
diffit(old_tree.get_file(fid).readlines(),
new_tree.get_file(fid).readlines(),
fromfile=old_label + old_name + idlabel,
tofile=new_label + new_name)
else:
raise BzrError("can't represent state %s {%s}" % (file_state, fid))
|