bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
1658.1.9
by Martin Pool
 Give an error for bzr diff on an nonexistent file (Malone #3619)  | 
1  | 
# Copyright (C) 2005, 2006 Canonical
 | 
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
2  | 
#
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
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.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
7  | 
#
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
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.
 | 
|
| 
1887.1.1
by Adeodato Simó
 Do not separate paragraphs in the copyright statement with blank lines,  | 
12  | 
#
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
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
 | 
|
16  | 
||
| 
1399.1.3
by Robert Collins
 move change detection for text and metadata from delta to entry.detect_changes  | 
17  | 
from bzrlib.inventory import InventoryEntry  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
18  | 
from bzrlib.trace import mutter  | 
| 
1852.11.1
by Robert Collins
 Deprecate compare_trees and move its body to InterTree.changes_from.  | 
19  | 
from bzrlib.symbol_versioning import deprecated_function, zero_ten  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
20  | 
|
| 
1732.1.29
by John Arbash Meinel
 Update documentation and TODO for compare_trees  | 
21  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
22  | 
class TreeDelta(object):  | 
23  | 
"""Describes changes from one tree to another.  | 
|
24  | 
||
25  | 
    Contains four lists:
 | 
|
26  | 
||
27  | 
    added
 | 
|
28  | 
        (path, id, kind)
 | 
|
29  | 
    removed
 | 
|
30  | 
        (path, id, kind)
 | 
|
31  | 
    renamed
 | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
32  | 
        (oldpath, newpath, id, kind, text_modified, meta_modified)
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
33  | 
    modified
 | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
34  | 
        (path, id, kind, text_modified, meta_modified)
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
35  | 
    unchanged
 | 
36  | 
        (path, id, kind)
 | 
|
37  | 
||
38  | 
    Each id is listed only once.
 | 
|
39  | 
||
40  | 
    Files that are both modified and renamed are listed only in
 | 
|
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
41  | 
    renamed, with the text_modified flag true. The text_modified
 | 
42  | 
    applies either to the the content of the file or the target of the
 | 
|
43  | 
    symbolic link, depending of the kind of file.
 | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
44  | 
|
45  | 
    Files are only considered renamed if their name has changed or
 | 
|
46  | 
    their parent directory has changed.  Renaming a directory
 | 
|
47  | 
    does not count as renaming all its contents.
 | 
|
48  | 
||
49  | 
    The lists are normally sorted when the delta is created.
 | 
|
50  | 
    """
 | 
|
51  | 
def __init__(self):  | 
|
52  | 
self.added = []  | 
|
53  | 
self.removed = []  | 
|
54  | 
self.renamed = []  | 
|
55  | 
self.modified = []  | 
|
56  | 
self.unchanged = []  | 
|
57  | 
||
58  | 
def __eq__(self, other):  | 
|
59  | 
if not isinstance(other, TreeDelta):  | 
|
60  | 
return False  | 
|
61  | 
return self.added == other.added \  | 
|
62  | 
and self.removed == other.removed \  | 
|
63  | 
and self.renamed == other.renamed \  | 
|
64  | 
and self.modified == other.modified \  | 
|
65  | 
and self.unchanged == other.unchanged  | 
|
66  | 
||
67  | 
def __ne__(self, other):  | 
|
68  | 
return not (self == other)  | 
|
69  | 
||
70  | 
def __repr__(self):  | 
|
71  | 
return "TreeDelta(added=%r, removed=%r, renamed=%r, modified=%r," \  | 
|
72  | 
" unchanged=%r)" % (self.added, self.removed, self.renamed,  | 
|
73  | 
self.modified, self.unchanged)  | 
|
74  | 
||
75  | 
def has_changed(self):  | 
|
| 
1189
by Martin Pool
 - BROKEN: partial support for commit into weave  | 
76  | 
return bool(self.modified  | 
77  | 
or self.added  | 
|
78  | 
or self.removed  | 
|
79  | 
or self.renamed)  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
80  | 
|
81  | 
def touches_file_id(self, file_id):  | 
|
82  | 
"""Return True if file_id is modified by this delta."""  | 
|
83  | 
for l in self.added, self.removed, self.modified:  | 
|
84  | 
for v in l:  | 
|
85  | 
if v[1] == file_id:  | 
|
86  | 
return True  | 
|
87  | 
for v in self.renamed:  | 
|
88  | 
if v[2] == file_id:  | 
|
89  | 
return True  | 
|
90  | 
return False  | 
|
91  | 
||
92  | 
||
93  | 
def show(self, to_file, show_ids=False, show_unchanged=False):  | 
|
| 
1780.2.1
by Robert Collins
 Remove some unused imports.  | 
94  | 
"""output this delta in status-like form to to_file."""  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
95  | 
def show_list(files):  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
96  | 
for item in files:  | 
97  | 
path, fid, kind = item[:3]  | 
|
98  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
99  | 
if kind == 'directory':  | 
100  | 
path += '/'  | 
|
101  | 
elif kind == 'symlink':  | 
|
102  | 
path += '@'  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
103  | 
|
104  | 
if len(item) == 5 and item[4]:  | 
|
105  | 
path += '*'  | 
|
106  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
107  | 
if show_ids:  | 
108  | 
print >>to_file, ' %-30s %s' % (path, fid)  | 
|
109  | 
else:  | 
|
110  | 
print >>to_file, ' ', path  | 
|
111  | 
||
112  | 
if self.removed:  | 
|
113  | 
print >>to_file, 'removed:'  | 
|
114  | 
show_list(self.removed)  | 
|
115  | 
||
116  | 
if self.added:  | 
|
117  | 
print >>to_file, 'added:'  | 
|
118  | 
show_list(self.added)  | 
|
119  | 
||
| 
1185.36.2
by Daniel Silverstone
 Allow the delta display routine to show when a file  | 
120  | 
extra_modified = []  | 
121  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
122  | 
if self.renamed:  | 
123  | 
print >>to_file, 'renamed:'  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
124  | 
for (oldpath, newpath, fid, kind,  | 
125  | 
text_modified, meta_modified) in self.renamed:  | 
|
| 
1185.36.2
by Daniel Silverstone
 Allow the delta display routine to show when a file  | 
126  | 
if text_modified or meta_modified:  | 
127  | 
extra_modified.append((newpath, fid, kind,  | 
|
128  | 
text_modified, meta_modified))  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
129  | 
if meta_modified:  | 
130  | 
newpath += '*'  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
131  | 
if show_ids:  | 
132  | 
print >>to_file, ' %s => %s %s' % (oldpath, newpath, fid)  | 
|
133  | 
else:  | 
|
134  | 
print >>to_file, ' %s => %s' % (oldpath, newpath)  | 
|
135  | 
||
| 
1185.36.2
by Daniel Silverstone
 Allow the delta display routine to show when a file  | 
136  | 
if self.modified or extra_modified:  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
137  | 
print >>to_file, 'modified:'  | 
138  | 
show_list(self.modified)  | 
|
| 
1185.36.2
by Daniel Silverstone
 Allow the delta display routine to show when a file  | 
139  | 
show_list(extra_modified)  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
140  | 
|
141  | 
if show_unchanged and self.unchanged:  | 
|
142  | 
print >>to_file, 'unchanged:'  | 
|
143  | 
show_list(self.unchanged)  | 
|
144  | 
||
145  | 
||
| 
1852.11.1
by Robert Collins
 Deprecate compare_trees and move its body to InterTree.changes_from.  | 
146  | 
@deprecated_function(zero_ten)  | 
| 
1852.10.3
by Robert Collins
 Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.  | 
147  | 
def compare_trees(old_tree, new_tree, want_unchanged=False,  | 
148  | 
specific_files=None, extra_trees=None,  | 
|
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
149  | 
require_versioned=False):  | 
| 
1852.11.1
by Robert Collins
 Deprecate compare_trees and move its body to InterTree.changes_from.  | 
150  | 
"""compare_trees was deprecated in 0.10. Please see Tree.changes_from."""  | 
151  | 
return new_tree.changes_from(old_tree,  | 
|
152  | 
want_unchanged=want_unchanged,  | 
|
153  | 
specific_files=specific_files,  | 
|
154  | 
extra_trees=extra_trees,  | 
|
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
155  | 
require_versioned=require_versioned)  | 
156  | 
||
157  | 
||
158  | 
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids):  | 
|
| 
1543.1.1
by Denys Duchier
 lock operations for trees - use them for diff  | 
159  | 
|
| 
1732.1.5
by John Arbash Meinel
 revert 1735  | 
160  | 
from osutils import is_inside_any  | 
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
161  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
162  | 
old_inv = old_tree.inventory  | 
163  | 
new_inv = new_tree.inventory  | 
|
164  | 
delta = TreeDelta()  | 
|
165  | 
mutter('start compare_trees')  | 
|
166  | 
||
| 
1658.1.9
by Martin Pool
 Give an error for bzr diff on an nonexistent file (Malone #3619)  | 
167  | 
    # TODO: Rather than iterating over the whole tree and then filtering, we
 | 
168  | 
    # could diff just the specified files (if any) and their subtrees.  
 | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
169  | 
|
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
170  | 
old_files = old_tree.list_files()  | 
171  | 
new_files = new_tree.list_files()  | 
|
| 
1732.1.7
by John Arbash Meinel
 Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.  | 
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  | 
||
| 
1551.7.14
by Aaron Bentley
 Use specified_file_ids instead of is_inside_any in compare_trees  | 
192  | 
if specific_file_ids:  | 
| 
1878.2.4
by John Arbash Meinel
 Fix incorrect variable use. it worked, but it wasn't the correct one to use.  | 
193  | 
if (old_entry.file_id not in specific_file_ids and  | 
194  | 
new_entry.file_id not in specific_file_ids):  | 
|
| 
1732.1.15
by John Arbash Meinel
 Re-add the specific files handling to _compare_trees  | 
195  | 
                return
 | 
196  | 
||
197  | 
        # temporary hack until all entries are populated before clients 
 | 
|
198  | 
        # get them
 | 
|
| 
1732.1.7
by John Arbash Meinel
 Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.  | 
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  | 
||
| 
1732.1.15
by John Arbash Meinel
 Re-add the specific files handling to _compare_trees  | 
203  | 
        # If the name changes, or the parent_id changes, we have a rename
 | 
204  | 
        # (if we move a parent, that doesn't count as a rename for the file)
 | 
|
| 
1732.1.7
by John Arbash Meinel
 Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.  | 
205  | 
if (old_entry.name != new_entry.name  | 
206  | 
or old_entry.parent_id != new_entry.parent_id):  | 
|
207  | 
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):  | 
|
| 
1732.1.29
by John Arbash Meinel
 Update documentation and TODO for compare_trees  | 
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  | 
        """
 | 
|
| 
1732.1.7
by John Arbash Meinel
 Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.  | 
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):  | 
|
| 
1732.1.29
by John Arbash Meinel
 Update documentation and TODO for compare_trees  | 
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  | 
        """
 | 
|
| 
1732.1.7
by John Arbash Meinel
 Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.  | 
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  | 
|
| 
1907.1.1
by Aaron Bentley
 Unshelved all changes except those related to removing RootEntry  | 
253  | 
|
254  | 
while old_path or new_path:  | 
|
| 
1732.1.7
by John Arbash Meinel
 Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.  | 
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():  | 
|
| 
1551.7.14
by Aaron Bentley
 Use specified_file_ids instead of is_inside_any in compare_trees  | 
292  | 
if specific_file_ids:  | 
293  | 
if not old_entry.file_id in specific_file_ids:  | 
|
| 
1732.1.15
by John Arbash Meinel
 Re-add the specific files handling to _compare_trees  | 
294  | 
                continue
 | 
| 
1732.1.7
by John Arbash Meinel
 Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.  | 
295  | 
delta.removed.append((old_path, old_entry.file_id, old_entry.kind))  | 
296  | 
for new_path, new_entry in added.itervalues():  | 
|
| 
1551.7.14
by Aaron Bentley
 Use specified_file_ids instead of is_inside_any in compare_trees  | 
297  | 
if specific_file_ids:  | 
298  | 
if not new_entry.file_id in specific_file_ids:  | 
|
| 
1732.1.15
by John Arbash Meinel
 Re-add the specific files handling to _compare_trees  | 
299  | 
                continue
 | 
| 
1732.1.7
by John Arbash Meinel
 Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.  | 
300  | 
delta.added.append((new_path, new_entry.file_id, new_entry.kind))  | 
301  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
302  | 
delta.removed.sort()  | 
303  | 
delta.added.sort()  | 
|
304  | 
delta.renamed.sort()  | 
|
| 
1732.1.29
by John Arbash Meinel
 Update documentation and TODO for compare_trees  | 
305  | 
    # TODO: jam 20060529 These lists shouldn't need to be sorted
 | 
306  | 
    #       since we added them in alphabetical order.
 | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
307  | 
delta.modified.sort()  | 
308  | 
delta.unchanged.sort()  | 
|
309  | 
||
310  | 
return delta  |