bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
| 
2052.3.1
by John Arbash Meinel
 Add tests to cleanup the copyright of all source files  | 
1  | 
# Copyright (C) 2005, 2006 Canonical Ltd
 | 
| 
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  | 
||
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
17  | 
from bzrlib import errors  | 
| 
1399.1.3
by Robert Collins
 move change detection for text and metadata from delta to entry.detect_changes  | 
18  | 
from bzrlib.inventory import InventoryEntry  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
19  | 
from bzrlib.trace import mutter  | 
| 
1904.2.1
by Martin Pool
 compare_trees is deprecated in 0.9 not 0.10  | 
20  | 
from bzrlib.symbol_versioning import deprecated_function, zero_nine  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
21  | 
|
| 
1732.1.29
by John Arbash Meinel
 Update documentation and TODO for compare_trees  | 
22  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
23  | 
class TreeDelta(object):  | 
24  | 
"""Describes changes from one tree to another.  | 
|
25  | 
||
26  | 
    Contains four lists:
 | 
|
27  | 
||
28  | 
    added
 | 
|
29  | 
        (path, id, kind)
 | 
|
30  | 
    removed
 | 
|
31  | 
        (path, id, kind)
 | 
|
32  | 
    renamed
 | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
33  | 
        (oldpath, newpath, id, kind, text_modified, meta_modified)
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
34  | 
    modified
 | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
35  | 
        (path, id, kind, text_modified, meta_modified)
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
36  | 
    unchanged
 | 
37  | 
        (path, id, kind)
 | 
|
38  | 
||
39  | 
    Each id is listed only once.
 | 
|
40  | 
||
41  | 
    Files that are both modified and renamed are listed only in
 | 
|
| 
1092.2.6
by Robert Collins
 symlink support updated to work  | 
42  | 
    renamed, with the text_modified flag true. The text_modified
 | 
43  | 
    applies either to the the content of the file or the target of the
 | 
|
44  | 
    symbolic link, depending of the kind of file.
 | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
45  | 
|
46  | 
    Files are only considered renamed if their name has changed or
 | 
|
47  | 
    their parent directory has changed.  Renaming a directory
 | 
|
48  | 
    does not count as renaming all its contents.
 | 
|
49  | 
||
50  | 
    The lists are normally sorted when the delta is created.
 | 
|
51  | 
    """
 | 
|
52  | 
def __init__(self):  | 
|
53  | 
self.added = []  | 
|
54  | 
self.removed = []  | 
|
55  | 
self.renamed = []  | 
|
56  | 
self.modified = []  | 
|
57  | 
self.unchanged = []  | 
|
58  | 
||
59  | 
def __eq__(self, other):  | 
|
60  | 
if not isinstance(other, TreeDelta):  | 
|
61  | 
return False  | 
|
62  | 
return self.added == other.added \  | 
|
63  | 
and self.removed == other.removed \  | 
|
64  | 
and self.renamed == other.renamed \  | 
|
65  | 
and self.modified == other.modified \  | 
|
66  | 
and self.unchanged == other.unchanged  | 
|
67  | 
||
68  | 
def __ne__(self, other):  | 
|
69  | 
return not (self == other)  | 
|
70  | 
||
71  | 
def __repr__(self):  | 
|
72  | 
return "TreeDelta(added=%r, removed=%r, renamed=%r, modified=%r," \  | 
|
73  | 
" unchanged=%r)" % (self.added, self.removed, self.renamed,  | 
|
74  | 
self.modified, self.unchanged)  | 
|
75  | 
||
76  | 
def has_changed(self):  | 
|
| 
1189
by Martin Pool
 - BROKEN: partial support for commit into weave  | 
77  | 
return bool(self.modified  | 
78  | 
or self.added  | 
|
79  | 
or self.removed  | 
|
80  | 
or self.renamed)  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
81  | 
|
82  | 
def touches_file_id(self, file_id):  | 
|
83  | 
"""Return True if file_id is modified by this delta."""  | 
|
84  | 
for l in self.added, self.removed, self.modified:  | 
|
85  | 
for v in l:  | 
|
86  | 
if v[1] == file_id:  | 
|
87  | 
return True  | 
|
88  | 
for v in self.renamed:  | 
|
89  | 
if v[2] == file_id:  | 
|
90  | 
return True  | 
|
91  | 
return False  | 
|
92  | 
||
93  | 
||
| 
2147.2.1
by Keir Mierle
 Add a --short flag to status to get svn-style status  | 
94  | 
def show(self, to_file, show_ids=False, show_unchanged=False, short_status=False):  | 
| 
1780.2.1
by Robert Collins
 Remove some unused imports.  | 
95  | 
"""output this delta in status-like form to to_file."""  | 
| 
2147.2.1
by Keir Mierle
 Add a --short flag to status to get svn-style status  | 
96  | 
def show_list(files, short_status_letter=''):  | 
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
97  | 
for item in files:  | 
98  | 
path, fid, kind = item[:3]  | 
|
99  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
100  | 
if kind == 'directory':  | 
101  | 
path += '/'  | 
|
102  | 
elif kind == 'symlink':  | 
|
103  | 
path += '@'  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
104  | 
|
105  | 
if len(item) == 5 and item[4]:  | 
|
106  | 
path += '*'  | 
|
107  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
108  | 
if show_ids:  | 
| 
2147.2.2
by Keir Mierle
 Fix spacing error and add tests for status --short command flag.  | 
109  | 
print >>to_file, '%s %-30s %s' % (short_status_letter, path, fid)  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
110  | 
else:  | 
| 
2147.2.2
by Keir Mierle
 Fix spacing error and add tests for status --short command flag.  | 
111  | 
print >>to_file, '%s %s' % (short_status_letter, path)  | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
112  | 
|
113  | 
if self.removed:  | 
|
| 
2147.2.1
by Keir Mierle
 Add a --short flag to status to get svn-style status  | 
114  | 
if not short_status:  | 
115  | 
print >>to_file, 'removed:'  | 
|
116  | 
show_list(self.removed)  | 
|
117  | 
else:  | 
|
118  | 
show_list(self.removed, 'D')  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
119  | 
|
120  | 
if self.added:  | 
|
| 
2147.2.1
by Keir Mierle
 Add a --short flag to status to get svn-style status  | 
121  | 
if not short_status:  | 
122  | 
print >>to_file, 'added:'  | 
|
123  | 
show_list(self.added)  | 
|
124  | 
else:  | 
|
125  | 
show_list(self.added, 'A')  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
126  | 
|
| 
1185.36.2
by Daniel Silverstone
 Allow the delta display routine to show when a file  | 
127  | 
extra_modified = []  | 
128  | 
||
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
129  | 
if self.renamed:  | 
| 
2147.2.1
by Keir Mierle
 Add a --short flag to status to get svn-style status  | 
130  | 
short_status_letter = 'R'  | 
131  | 
if not short_status:  | 
|
132  | 
print >>to_file, 'renamed:'  | 
|
133  | 
short_status_letter = ''  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
134  | 
for (oldpath, newpath, fid, kind,  | 
135  | 
text_modified, meta_modified) in self.renamed:  | 
|
| 
1185.36.2
by Daniel Silverstone
 Allow the delta display routine to show when a file  | 
136  | 
if text_modified or meta_modified:  | 
137  | 
extra_modified.append((newpath, fid, kind,  | 
|
138  | 
text_modified, meta_modified))  | 
|
| 
1398
by Robert Collins
 integrate in Gustavos x-bit patch  | 
139  | 
if meta_modified:  | 
140  | 
newpath += '*'  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
141  | 
if show_ids:  | 
| 
2147.2.1
by Keir Mierle
 Add a --short flag to status to get svn-style status  | 
142  | 
print >>to_file, '%s %s => %s %s' % (short_status_letter,  | 
143  | 
oldpath, newpath, fid)  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
144  | 
else:  | 
| 
2147.2.1
by Keir Mierle
 Add a --short flag to status to get svn-style status  | 
145  | 
print >>to_file, '%s %s => %s' % (short_status_letter,  | 
146  | 
oldpath, newpath)  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
147  | 
|
| 
1185.36.2
by Daniel Silverstone
 Allow the delta display routine to show when a file  | 
148  | 
if self.modified or extra_modified:  | 
| 
2147.2.1
by Keir Mierle
 Add a --short flag to status to get svn-style status  | 
149  | 
short_status_letter = 'M'  | 
150  | 
if not short_status:  | 
|
151  | 
print >>to_file, 'modified:'  | 
|
152  | 
short_status_letter = ''  | 
|
153  | 
show_list(self.modified, short_status_letter)  | 
|
154  | 
show_list(extra_modified, short_status_letter)  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
155  | 
|
156  | 
if show_unchanged and self.unchanged:  | 
|
| 
2147.2.1
by Keir Mierle
 Add a --short flag to status to get svn-style status  | 
157  | 
if not short_status:  | 
158  | 
print >>to_file, 'unchanged:'  | 
|
159  | 
show_list(self.unchanged)  | 
|
160  | 
else:  | 
|
161  | 
show_list(self.unchanged, 'S')  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
162  | 
|
163  | 
||
| 
1904.2.1
by Martin Pool
 compare_trees is deprecated in 0.9 not 0.10  | 
164  | 
@deprecated_function(zero_nine)  | 
| 
1852.10.3
by Robert Collins
 Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.  | 
165  | 
def compare_trees(old_tree, new_tree, want_unchanged=False,  | 
166  | 
specific_files=None, extra_trees=None,  | 
|
| 
1731.1.62
by Aaron Bentley
 Changes from review comments  | 
167  | 
require_versioned=False):  | 
| 
1852.11.1
by Robert Collins
 Deprecate compare_trees and move its body to InterTree.changes_from.  | 
168  | 
"""compare_trees was deprecated in 0.10. Please see Tree.changes_from."""  | 
169  | 
return new_tree.changes_from(old_tree,  | 
|
170  | 
want_unchanged=want_unchanged,  | 
|
171  | 
specific_files=specific_files,  | 
|
172  | 
extra_trees=extra_trees,  | 
|
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
173  | 
require_versioned=require_versioned,  | 
| 
1731.1.62
by Aaron Bentley
 Changes from review comments  | 
174  | 
include_root=False)  | 
| 
1731.1.33
by Aaron Bentley
 Revert no-special-root changes  | 
175  | 
|
176  | 
||
177  | 
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids,  | 
|
178  | 
include_root):  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
179  | 
delta = TreeDelta()  | 
| 
1908.3.1
by Carl Friedrich Bolz
 Clean up some mutter() calls.  | 
180  | 
    # mutter('start compare_trees')
 | 
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
181  | 
|
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
182  | 
for (file_id, path, content_change, versioned, parent_id, name, kind,  | 
| 
2012.1.10
by Aaron Bentley
 Make iter_changes private, so it can be changed freely  | 
183  | 
executable) in new_tree._iter_changes(old_tree, want_unchanged,  | 
184  | 
specific_file_ids):  | 
|
| 
2012.1.8
by Aaron Bentley
 Merge from bzr.dev  | 
185  | 
if not include_root and (None, None) == parent_id:  | 
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
186  | 
            continue
 | 
| 
2012.1.3
by Aaron Bentley
 Always generate tuples (because kind is always used, even when not different)  | 
187  | 
assert kind[0] == kind[1] or None in kind  | 
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
188  | 
        # the only 'kind change' permitted is creation/deletion
 | 
| 
2012.1.4
by Aaron Bentley
 Simplify add/remove code  | 
189  | 
fully_present = tuple((versioned[x] and kind[x] is not None) for  | 
190  | 
x in range(2))  | 
|
| 
2012.1.5
by Aaron Bentley
 Implement specific file id and dangling id handling  | 
191  | 
if fully_present[0] != fully_present[1]:  | 
192  | 
if fully_present[1] is True:  | 
|
193  | 
delta.added.append((path, file_id, kind[1]))  | 
|
194  | 
else:  | 
|
195  | 
assert fully_present[0] is True  | 
|
196  | 
old_path = old_tree.id2path(file_id)  | 
|
197  | 
delta.removed.append((old_path, file_id, kind[0]))  | 
|
198  | 
elif fully_present[0] is False:  | 
|
199  | 
            continue
 | 
|
| 
2012.1.3
by Aaron Bentley
 Always generate tuples (because kind is always used, even when not different)  | 
200  | 
elif name[0] != name[1] or parent_id[0] != parent_id[1]:  | 
| 
2012.1.4
by Aaron Bentley
 Simplify add/remove code  | 
201  | 
            # If the name changes, or the parent_id changes, we have a rename
 | 
202  | 
            # (if we move a parent, that doesn't count as a rename for the
 | 
|
203  | 
            # file)
 | 
|
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
204  | 
old_path = old_tree.id2path(file_id)  | 
| 
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  | 
delta.renamed.append((old_path,  | 
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
206  | 
path,  | 
207  | 
file_id,  | 
|
| 
2012.1.3
by Aaron Bentley
 Always generate tuples (because kind is always used, even when not different)  | 
208  | 
kind[1],  | 
209  | 
content_change,  | 
|
210  | 
(executable[0] != executable[1])))  | 
|
211  | 
elif content_change is True or executable[0] != executable[1]:  | 
|
212  | 
delta.modified.append((path, file_id, kind[1],  | 
|
213  | 
content_change,  | 
|
214  | 
(executable[0] != executable[1])))  | 
|
| 
2012.1.2
by Aaron Bentley
 reimplement compare_trees  | 
215  | 
else:  | 
| 
2012.1.3
by Aaron Bentley
 Always generate tuples (because kind is always used, even when not different)  | 
216  | 
delta.unchanged.append((path, file_id, kind[1]))  | 
| 
1732.1.7
by John Arbash Meinel
 Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.  | 
217  | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
218  | 
delta.removed.sort()  | 
219  | 
delta.added.sort()  | 
|
220  | 
delta.renamed.sort()  | 
|
| 
1732.1.29
by John Arbash Meinel
 Update documentation and TODO for compare_trees  | 
221  | 
    # TODO: jam 20060529 These lists shouldn't need to be sorted
 | 
222  | 
    #       since we added them in alphabetical order.
 | 
|
| 
974.1.26
by aaron.bentley at utoronto
 merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472  | 
223  | 
delta.modified.sort()  | 
224  | 
delta.unchanged.sort()  | 
|
225  | 
||
226  | 
return delta  |