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