1
# Copyright (C) 2005, 2006 Canonical
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from bzrlib.inventory import InventoryEntry
18
from bzrlib.trace import mutter
21
class TreeDelta(object):
22
"""Describes changes from one tree to another.
31
(oldpath, newpath, id, kind, text_modified, meta_modified)
33
(path, id, kind, text_modified, meta_modified)
37
Each id is listed only once.
39
Files that are both modified and renamed are listed only in
40
renamed, with the text_modified flag true. The text_modified
41
applies either to the the content of the file or the target of the
42
symbolic link, depending of the kind of file.
44
Files are only considered renamed if their name has changed or
45
their parent directory has changed. Renaming a directory
46
does not count as renaming all its contents.
48
The lists are normally sorted when the delta is created.
57
def __eq__(self, other):
58
if not isinstance(other, TreeDelta):
60
return self.added == other.added \
61
and self.removed == other.removed \
62
and self.renamed == other.renamed \
63
and self.modified == other.modified \
64
and self.unchanged == other.unchanged
66
def __ne__(self, other):
67
return not (self == other)
70
return "TreeDelta(added=%r, removed=%r, renamed=%r, modified=%r," \
71
" unchanged=%r)" % (self.added, self.removed, self.renamed,
72
self.modified, self.unchanged)
74
def has_changed(self):
75
return bool(self.modified
80
def touches_file_id(self, file_id):
81
"""Return True if file_id is modified by this delta."""
82
for l in self.added, self.removed, self.modified:
86
for v in self.renamed:
92
def show(self, to_file, show_ids=False, show_unchanged=False):
95
path, fid, kind = item[:3]
97
if kind == 'directory':
99
elif kind == 'symlink':
102
if len(item) == 5 and item[4]:
106
print >>to_file, ' %-30s %s' % (path, fid)
108
print >>to_file, ' ', path
111
print >>to_file, 'removed:'
112
show_list(self.removed)
115
print >>to_file, 'added:'
116
show_list(self.added)
121
print >>to_file, 'renamed:'
122
for (oldpath, newpath, fid, kind,
123
text_modified, meta_modified) in self.renamed:
124
if text_modified or meta_modified:
125
extra_modified.append((newpath, fid, kind,
126
text_modified, meta_modified))
130
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)
132
print >>to_file, ' %s => %s' % (oldpath, newpath)
134
if self.modified or extra_modified:
135
print >>to_file, 'modified:'
136
show_list(self.modified)
137
show_list(extra_modified)
139
if show_unchanged and self.unchanged:
140
print >>to_file, 'unchanged:'
141
show_list(self.unchanged)
145
def compare_trees(old_tree, new_tree, want_unchanged=False, specific_files=None):
146
"""Describe changes from one tree to another.
148
Returns a TreeDelta with details of added, modified, renamed, and
151
The root entry is specifically exempt.
153
This only considers versioned files.
156
If true, also list files unchanged from one version to
160
If true, only check for changes to specified names or
161
files within them. Any unversioned files given have no effect
162
(but this might change in the future).
164
# NB: show_status depends on being able to pass in non-versioned files and
165
# report them as unknown
170
return _compare_trees(old_tree, new_tree, want_unchanged,
178
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files):
180
from osutils import is_inside_any
182
old_inv = old_tree.inventory
183
new_inv = new_tree.inventory
185
mutter('start compare_trees')
187
# TODO: Rather than iterating over the whole tree and then filtering, we
188
# could diff just the specified files (if any) and their subtrees.
189
# Perhaps should take a list of file-ids instead? Need to indicate any
190
# ids or names which were not found in the trees.
192
old_files = old_tree.list_files()
193
new_files = new_tree.list_files()
204
except StopIteration:
205
return None, None, None, None, None
206
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
207
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
210
def check_matching(old_path, old_entry, new_path, new_entry):
211
"""We have matched up 2 file_ids, check for changes."""
212
assert old_entry.kind == new_entry.kind
215
if (not is_inside_any(specific_files, old_path)
216
and not is_inside_any(specific_files, new_path)):
219
# temporary hack until all entries are populated before clients
221
old_entry._read_tree_state(old_path, old_tree)
222
new_entry._read_tree_state(new_path, new_tree)
223
text_modified, meta_modified = new_entry.detect_changes(old_entry)
225
# If the name changes, or the parent_id changes, we have a rename
226
# (if we move a parent, that doesn't count as a rename for the file)
227
if (old_entry.name != new_entry.name
228
or old_entry.parent_id != new_entry.parent_id):
229
delta.renamed.append((old_path,
231
old_entry.file_id, old_entry.kind,
232
text_modified, meta_modified))
233
elif text_modified or meta_modified:
234
delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
235
text_modified, meta_modified))
237
delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
240
def handle_old(path, entry):
241
"""old entry without a new entry match
243
Check to see if a matching new entry was already seen as an
244
added file, and switch the pair into being a rename.
245
Otherwise just mark the old entry being removed.
247
if entry.file_id in added:
248
# Actually this is a rename, we found a new file_id earlier
249
# at a different location, so it is no-longer added
250
x_new_path, x_new_entry = added.pop(entry.file_id)
251
check_matching(path, entry, x_new_path, x_new_entry)
253
# We have an old_file_id which doesn't line up with a new_file_id
254
# So this file looks to be removed
255
assert entry.file_id not in removed
256
removed[entry.file_id] = path, entry
258
def handle_new(path, entry):
259
"""new entry without an old entry match
261
Check to see if a matching old entry was already seen as a
262
removal, and change the pair into a rename.
263
Otherwise just mark the new entry as an added file.
265
if entry.file_id in removed:
266
# We saw this file_id earlier at an old different location
267
# it is no longer removed, just renamed
268
x_old_path, x_old_entry = removed.pop(entry.file_id)
269
check_matching(x_old_path, x_old_entry, path, entry)
271
# We have a new file which does not match an old file
273
assert entry.file_id not in added
274
added[entry.file_id] = path, entry
276
while old_path or new_path:
277
# list_files() returns files in alphabetical path sorted order
278
if old_path == new_path:
279
if old_file_id == new_file_id:
280
# This is the common case, the files are in the same place
281
# check if there were any content changes
283
if old_file_id is None:
284
# We have 2 unversioned files, no deltas possible???
287
check_matching(old_path, old_entry, new_path, new_entry)
289
# The ids don't match, so we have to handle them both
291
if old_file_id is not None:
292
handle_old(old_path, old_entry)
294
if new_file_id is not None:
295
handle_new(new_path, new_entry)
297
# The two entries were at the same path, so increment both sides
298
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
299
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
300
elif new_path is None or (old_path is not None and old_path < new_path):
301
# Assume we don't match, only process old_path
302
if old_file_id is not None:
303
handle_old(old_path, old_entry)
304
# old_path came first, so increment it, trying to match up
305
old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
306
elif new_path is not None:
307
# new_path came first, so increment it, trying to match up
308
if new_file_id is not None:
309
handle_new(new_path, new_entry)
310
new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
312
# Now we have a set of added and removed files, mark them all
313
for old_path, old_entry in removed.itervalues():
315
if not is_inside_any(specific_files, old_path):
317
delta.removed.append((old_path, old_entry.file_id, old_entry.kind))
318
for new_path, new_entry in added.itervalues():
320
if not is_inside_any(specific_files, new_path):
322
delta.added.append((new_path, new_entry.file_id, new_entry.kind))
327
# TODO: jam 20060529 These lists shouldn't need to be sorted
328
# since we added them in alphabetical order.
329
delta.modified.sort()
330
delta.unchanged.sort()
added
removed
bzrlib/delta.py
