« back to all changes in this revision
Viewing changes to bzrlib/delta.py
- browse files at revision 2012.1.2
- compare with another revision
- compare with revision 1857
- download diff
- download tarball
- view history from revision 2012.1.2
- Committer: Aaron Bentley
- Date: 2006-09-15 22:06:21 UTC
- mto: This revision was merged to the branch mainline in revision 2162.
- Revision ID: abentley@panoramicfeedback.com-20060915220621-169e0e9be092e01e
reimplement compare_trees
- files modified:
- bzrlib/delta.py
added
removed
bzrlib/delta.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
16
16
17
from bzrlib import errors
17
18
from bzrlib.inventory import InventoryEntry
18
19
from bzrlib.trace import mutter
19
20
from bzrlib.symbol_versioning import deprecated_function, zero_nine
157
158
158
159
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids):
159
160
160
from osutils import is_inside_any
161
162
old_inv = old_tree.inventory
163
new_inv = new_tree.inventory
164
161
delta = TreeDelta()
165
162
# mutter('start compare_trees')
166
163
164
root_id = new_tree.inventory.root.file_id
167
165
# TODO: Rather than iterating over the whole tree and then filtering, we
168
166
# could diff just the specified files (if any) and their subtrees.
169
167
170
old_files = old_tree.list_files()
171
new_files = new_tree.list_files()
172
173
more_old = True
174
more_new = True
175
176
added = {}
177
removed = {}
178
179
def get_next(iter):
180
try:
181
return iter.next()
182
except StopIteration:
183
return None, None, None, None, None
184
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
185
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
186
187
188
def check_matching(old_path, old_entry, new_path, new_entry):
189
"""We have matched up 2 file_ids, check for changes."""
190
assert old_entry.kind == new_entry.kind
191
192
if specific_file_ids:
193
if (old_entry.file_id not in specific_file_ids and
194
new_entry.file_id not in specific_file_ids):
195
return
196
197
# temporary hack until all entries are populated before clients
198
# get them
199
old_entry._read_tree_state(old_path, old_tree)
200
new_entry._read_tree_state(new_path, new_tree)
201
text_modified, meta_modified = new_entry.detect_changes(old_entry)
202
168
for (file_id, path, content_change, versioned, parent_id, name, kind,
169
executable) in new_tree.iter_changes(old_tree, want_unchanged):
170
if specific_file_ids and file_id not in specific_file_ids:
171
continue
172
if file_id == root_id:
173
continue
174
assert kind is None or None in kind
175
# the only 'kind change' permitted is creation/deletion
176
if kind is not None:
177
new_kind = kind[1]
178
else:
179
try:
180
new_kind = new_tree.kind(file_id)
181
except errors.NoSuchFile:
182
new_kind = None
183
203
184
# If the name changes, or the parent_id changes, we have a rename
204
185
# (if we move a parent, that doesn't count as a rename for the file)
205
if (old_entry.name != new_entry.name
206
or old_entry.parent_id != new_entry.parent_id):
186
if versioned is not None:
187
if versioned == (False, True) and (kind is not None
188
and kind[1] is not None):
189
delta.added.append((path, file_id, new_kind))
190
else:
191
assert versioned == (True, False)
192
old_path = old_tree.id2path(file_id)
193
old_kind = old_tree.kind(file_id)
194
delta.removed.append((old_path, file_id, old_kind))
195
elif kind is not None:
196
if kind[0] is None:
197
delta.added.append((path, file_id, new_kind))
198
else:
199
assert kind[1] is None
200
old_path = old_tree.id2path(file_id)
201
old_kind = old_tree.kind(file_id)
202
delta.removed.append((old_path, file_id, old_kind))
203
204
elif name is not None or parent_id is not None:
205
old_path = old_tree.id2path(file_id)
207
206
delta.renamed.append((old_path,
208
new_path,
209
old_entry.file_id, old_entry.kind,
210
text_modified, meta_modified))
211
elif text_modified or meta_modified:
212
delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
213
text_modified, meta_modified))
214
elif want_unchanged:
215
delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
216
217
218
def handle_old(path, entry):
219
"""old entry without a new entry match
220
221
Check to see if a matching new entry was already seen as an
222
added file, and switch the pair into being a rename.
223
Otherwise just mark the old entry being removed.
224
"""
225
if entry.file_id in added:
226
# Actually this is a rename, we found a new file_id earlier
227
# at a different location, so it is no-longer added
228
x_new_path, x_new_entry = added.pop(entry.file_id)
229
check_matching(path, entry, x_new_path, x_new_entry)
230
else:
231
# We have an old_file_id which doesn't line up with a new_file_id
232
# So this file looks to be removed
233
assert entry.file_id not in removed
234
removed[entry.file_id] = path, entry
235
236
def handle_new(path, entry):
237
"""new entry without an old entry match
238
239
Check to see if a matching old entry was already seen as a
240
removal, and change the pair into a rename.
241
Otherwise just mark the new entry as an added file.
242
"""
243
if entry.file_id in removed:
244
# We saw this file_id earlier at an old different location
245
# it is no longer removed, just renamed
246
x_old_path, x_old_entry = removed.pop(entry.file_id)
247
check_matching(x_old_path, x_old_entry, path, entry)
248
else:
249
# We have a new file which does not match an old file
250
# mark it as added
251
assert entry.file_id not in added
252
added[entry.file_id] = path, entry
253
254
while old_path or new_path:
255
# list_files() returns files in alphabetical path sorted order
256
if old_path == new_path:
257
if old_file_id == new_file_id:
258
# This is the common case, the files are in the same place
259
# check if there were any content changes
260
261
if old_file_id is None:
262
# We have 2 unversioned files, no deltas possible???
263
pass
264
else:
265
check_matching(old_path, old_entry, new_path, new_entry)
266
else:
267
# The ids don't match, so we have to handle them both
268
# separately.
269
if old_file_id is not None:
270
handle_old(old_path, old_entry)
271
272
if new_file_id is not None:
273
handle_new(new_path, new_entry)
274
275
# The two entries were at the same path, so increment both sides
276
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
277
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
278
elif new_path is None or (old_path is not None and old_path < new_path):
279
# Assume we don't match, only process old_path
280
if old_file_id is not None:
281
handle_old(old_path, old_entry)
282
# old_path came first, so increment it, trying to match up
283
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
284
elif new_path is not None:
285
# new_path came first, so increment it, trying to match up
286
if new_file_id is not None:
287
handle_new(new_path, new_entry)
288
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
289
290
# Now we have a set of added and removed files, mark them all
291
for old_path, old_entry in removed.itervalues():
292
if specific_file_ids:
293
if not old_entry.file_id in specific_file_ids:
294
continue
295
delta.removed.append((old_path, old_entry.file_id, old_entry.kind))
296
for new_path, new_entry in added.itervalues():
297
if specific_file_ids:
298
if not new_entry.file_id in specific_file_ids:
299
continue
300
delta.added.append((new_path, new_entry.file_id, new_entry.kind))
207
path,
208
file_id,
209
new_kind,
210
content_change, (executable is not None)))
211
elif content_change is True or executable is not None:
212
delta.modified.append((path, file_id, new_kind,
213
content_change, (executable is not None)))
214
else:
215
delta.unchanged.append((path, file_id, new_kind))
301
216
302
217
delta.removed.sort()
303
218
delta.added.sort()
Loggerhead is a web-based interface for Breezy
Version: 2.0.1