/brz/remove-bazaar

To get this branch, use:
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
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
1904.2.1 by Martin Pool
compare_trees is deprecated in 0.9 not 0.10
19
from bzrlib.symbol_versioning import deprecated_function, zero_nine
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
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
93
    def show(self, to_file, show_ids=False, show_unchanged=False, short_status=False):
1780.2.1 by Robert Collins
Remove some unused imports.
94
        """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
95
        def show_list(files, short_status_letter=''):
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:
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
108
                    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
109
                else:
2147.2.2 by Keir Mierle
Fix spacing error and add tests for status --short command flag.
110
                    print >>to_file, '%s  %s' % (short_status_letter, path)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
111
            
112
        if self.removed:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
113
            if not short_status:
114
                print >>to_file, 'removed:'
115
                show_list(self.removed)
116
            else:
117
                show_list(self.removed, 'D')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
118
                
119
        if self.added:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
120
            if not short_status:
121
                print >>to_file, 'added:'
122
                show_list(self.added)
123
            else:
124
                show_list(self.added, 'A')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
125
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
126
        extra_modified = []
127
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
128
        if self.renamed:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
129
            short_status_letter = 'R'
130
            if not short_status:
131
                print >>to_file, 'renamed:'
132
                short_status_letter = ''
1398 by Robert Collins
integrate in Gustavos x-bit patch
133
            for (oldpath, newpath, fid, kind,
134
                 text_modified, meta_modified) in self.renamed:
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
135
                if text_modified or meta_modified:
136
                    extra_modified.append((newpath, fid, kind,
137
                                           text_modified, meta_modified))
1398 by Robert Collins
integrate in Gustavos x-bit patch
138
                if meta_modified:
139
                    newpath += '*'
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
140
                if show_ids:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
141
                    print >>to_file, '%s  %s => %s %s' % (short_status_letter,
142
                                                          oldpath, newpath, fid)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
143
                else:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
144
                    print >>to_file, '%s  %s => %s' % (short_status_letter,
145
                                                       oldpath, newpath)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
146
                    
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
147
        if self.modified or extra_modified:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
148
            short_status_letter = 'M'
149
            if not short_status:
150
                print >>to_file, 'modified:'
151
                short_status_letter = ''
152
            show_list(self.modified, short_status_letter)
153
            show_list(extra_modified, short_status_letter)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
154
            
155
        if show_unchanged and self.unchanged:
2147.2.1 by Keir Mierle
Add a --short flag to status to get svn-style status
156
            if not short_status:
157
                print >>to_file, 'unchanged:'
158
                show_list(self.unchanged)
159
            else:
160
                show_list(self.unchanged, 'S')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
161
162
1904.2.1 by Martin Pool
compare_trees is deprecated in 0.9 not 0.10
163
@deprecated_function(zero_nine)
1852.10.3 by Robert Collins
Remove all uses of compare_trees and replace with Tree.changes_from throughout bzrlib.
164
def compare_trees(old_tree, new_tree, want_unchanged=False,
165
                  specific_files=None, extra_trees=None,
1731.1.62 by Aaron Bentley
Changes from review comments
166
                  require_versioned=False):
1852.11.1 by Robert Collins
Deprecate compare_trees and move its body to InterTree.changes_from.
167
    """compare_trees was deprecated in 0.10. Please see Tree.changes_from."""
168
    return new_tree.changes_from(old_tree,
169
        want_unchanged=want_unchanged,
170
        specific_files=specific_files,
171
        extra_trees=extra_trees,
1731.1.33 by Aaron Bentley
Revert no-special-root changes
172
        require_versioned=require_versioned,
1731.1.62 by Aaron Bentley
Changes from review comments
173
        include_root=False)
1731.1.33 by Aaron Bentley
Revert no-special-root changes
174
175
176
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids,
177
                   include_root):
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
178
1732.1.5 by John Arbash Meinel
revert 1735
179
    from osutils import is_inside_any
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
180
    old_inv = old_tree.inventory
181
    new_inv = new_tree.inventory
182
    delta = TreeDelta()
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
183
    # mutter('start compare_trees')
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
184
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
185
    # TODO: Rather than iterating over the whole tree and then filtering, we
186
    # 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
187
1731.1.33 by Aaron Bentley
Revert no-special-root changes
188
    old_files = old_tree.list_files(include_root)
189
    new_files = new_tree.list_files(include_root)
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
190
191
    more_old = True
192
    more_new = True
193
194
    added = {}
195
    removed = {}
196
197
    def get_next(iter):
198
        try:
199
            return iter.next()
200
        except StopIteration:
201
            return None, None, None, None, None
202
    old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
203
    new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
204
1910.2.62 by Aaron Bentley
Cleanups
205
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
206
    def check_matching(old_path, old_entry, new_path, new_entry):
207
        """We have matched up 2 file_ids, check for changes."""
208
        assert old_entry.kind == new_entry.kind
209
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
210
        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.
211
            if (old_entry.file_id not in specific_file_ids and 
212
                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
213
                return
214
215
        # temporary hack until all entries are populated before clients 
216
        # 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.
217
        old_entry._read_tree_state(old_path, old_tree)
218
        new_entry._read_tree_state(new_path, new_tree)
219
        text_modified, meta_modified = new_entry.detect_changes(old_entry)
220
        
1732.1.15 by John Arbash Meinel
Re-add the specific files handling to _compare_trees
221
        # If the name changes, or the parent_id changes, we have a rename
222
        # (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.
223
        if (old_entry.name != new_entry.name 
224
            or old_entry.parent_id != new_entry.parent_id):
225
            delta.renamed.append((old_path,
226
                                  new_path,
227
                                  old_entry.file_id, old_entry.kind,
228
                                  text_modified, meta_modified))
229
        elif text_modified or meta_modified:
230
            delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
231
                                   text_modified, meta_modified))
232
        elif want_unchanged:
233
            delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
234
235
236
    def handle_old(path, entry):
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
237
        """old entry without a new entry match
238
239
        Check to see if a matching new entry was already seen as an
240
        added file, and switch the pair into being a rename.
241
        Otherwise just mark the old entry being removed.
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 added:
244
            # Actually this is a rename, we found a new file_id earlier
245
            # at a different location, so it is no-longer added
246
            x_new_path, x_new_entry = added.pop(entry.file_id)
247
            check_matching(path, entry, x_new_path, x_new_entry)
248
        else:
249
            # We have an old_file_id which doesn't line up with a new_file_id
250
            # So this file looks to be removed
251
            assert entry.file_id not in removed
252
            removed[entry.file_id] = path, entry
253
254
    def handle_new(path, entry):
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
255
        """new entry without an old entry match
256
        
257
        Check to see if a matching old entry was already seen as a
258
        removal, and change the pair into a rename.
259
        Otherwise just mark the new entry as an added file.
260
        """
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
261
        if entry.file_id in removed:
262
            # We saw this file_id earlier at an old different location
263
            # it is no longer removed, just renamed
264
            x_old_path, x_old_entry = removed.pop(entry.file_id)
265
            check_matching(x_old_path, x_old_entry, path, entry)
266
        else:
267
            # We have a new file which does not match an old file
268
            # mark it as added
269
            assert entry.file_id not in added
270
            added[entry.file_id] = path, entry
1907.1.1 by Aaron Bentley
Unshelved all changes except those related to removing RootEntry
271
1910.2.57 by Aaron Bentley
Got 0.9 bundles working, with root included by changes_from
272
    while old_path is not None or new_path is not None:
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
273
        # list_files() returns files in alphabetical path sorted order
274
        if old_path == new_path:
275
            if old_file_id == new_file_id:
276
                # This is the common case, the files are in the same place
277
                # check if there were any content changes
278
279
                if old_file_id is None:
280
                    # We have 2 unversioned files, no deltas possible???
281
                    pass
282
                else:
283
                    check_matching(old_path, old_entry, new_path, new_entry)
284
            else:
285
                # The ids don't match, so we have to handle them both
286
                # separately.
287
                if old_file_id is not None:
288
                    handle_old(old_path, old_entry)
289
290
                if new_file_id is not None:
291
                    handle_new(new_path, new_entry)
292
293
            # The two entries were at the same path, so increment both sides
294
            old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
295
            new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
296
        elif new_path is None or (old_path is not None and old_path < new_path):
297
            # Assume we don't match, only process old_path
298
            if old_file_id is not None:
299
                handle_old(old_path, old_entry)
300
            # old_path came first, so increment it, trying to match up
301
            old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
302
        elif new_path is not None:
303
            # new_path came first, so increment it, trying to match up
304
            if new_file_id is not None:
305
                handle_new(new_path, new_entry)
306
            new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
307
308
    # Now we have a set of added and removed files, mark them all
309
    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
310
        if specific_file_ids:
311
            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
312
                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.
313
        delta.removed.append((old_path, old_entry.file_id, old_entry.kind))
314
    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
315
        if specific_file_ids:
316
            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
317
                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.
318
        delta.added.append((new_path, new_entry.file_id, new_entry.kind))
319
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
320
    delta.removed.sort()
321
    delta.added.sort()
322
    delta.renamed.sort()
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
323
    # TODO: jam 20060529 These lists shouldn't need to be sorted
324
    #       since we added them in alphabetical order.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
325
    delta.modified.sort()
326
    delta.unchanged.sort()
327
328
    return delta