/brz/remove-bazaar

To get this branch, use:
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
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
2
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.
7
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.
12
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
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
19
from bzrlib import tree
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
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
146
def compare_trees(old_tree, new_tree, want_unchanged=False, 
147
                  specific_files=None, require_versioned=False,
148
                  extra_trees=None):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
149
    """Describe changes from one tree to another.
150
151
    Returns a TreeDelta with details of added, modified, renamed, and
152
    deleted entries.
153
154
    The root entry is specifically exempt.
155
156
    This only considers versioned files.
157
158
    want_unchanged
159
        If true, also list files unchanged from one version to
160
        the next.
161
162
    specific_files
163
        If true, only check for changes to specified names or
1551.7.18 by Aaron Bentley
Indentation and documentation fixes
164
        files within them.  By default, unversioned files are ignored.
165
166
    require_versioned
167
        If true, an all files are required to be versioned, and
168
        PathsNotVersionedError will be thrown if they are not.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
169
    """
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
170
    # NB: show_status depends on being able to pass in non-versioned files and
171
    # report them as unknown
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
172
    old_tree.lock_read()
173
    try:
174
        new_tree.lock_read()
175
        try:
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
176
            trees = (new_tree, old_tree)
177
            if extra_trees is not None:
178
                trees = trees + tuple(extra_trees)
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
179
            specific_file_ids = tree.specified_file_ids(specific_files, 
1551.7.17 by Aaron Bentley
Switch to PathsNotVersioned, accept extra_trees
180
                trees, require_versioned=require_versioned)
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
181
            return _compare_trees(old_tree, new_tree, want_unchanged,
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
182
                                  specific_file_ids)
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
183
        finally:
184
            new_tree.unlock()
185
    finally:
186
        old_tree.unlock()
187
188
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
189
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
190
1732.1.5 by John Arbash Meinel
revert 1735
191
    from osutils import is_inside_any
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
192
    
193
    old_inv = old_tree.inventory
194
    new_inv = new_tree.inventory
195
    delta = TreeDelta()
196
    mutter('start compare_trees')
197
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
198
    # TODO: Rather than iterating over the whole tree and then filtering, we
199
    # 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
200
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
201
    old_files = old_tree.list_files()
202
    new_files = new_tree.list_files()
203
204
    more_old = True
205
    more_new = True
206
207
    added = {}
208
    removed = {}
209
210
    def get_next(iter):
211
        try:
212
            return iter.next()
213
        except StopIteration:
214
            return None, None, None, None, None
215
    old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
216
    new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
217
218
219
    def check_matching(old_path, old_entry, new_path, new_entry):
220
        """We have matched up 2 file_ids, check for changes."""
221
        assert old_entry.kind == new_entry.kind
222
223
        if old_entry.kind == 'root_directory':
224
            return
225
1551.7.14 by Aaron Bentley
Use specified_file_ids instead of is_inside_any in compare_trees
226
        if specific_file_ids:
227
            if (old_file_id not in specific_file_ids and 
228
                new_file_id not in specific_file_ids):
1732.1.15 by John Arbash Meinel
Re-add the specific files handling to _compare_trees
229
                return
230
231
        # temporary hack until all entries are populated before clients 
232
        # 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.
233
        old_entry._read_tree_state(old_path, old_tree)
234
        new_entry._read_tree_state(new_path, new_tree)
235
        text_modified, meta_modified = new_entry.detect_changes(old_entry)
236
        
1732.1.15 by John Arbash Meinel
Re-add the specific files handling to _compare_trees
237
        # If the name changes, or the parent_id changes, we have a rename
238
        # (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.
239
        if (old_entry.name != new_entry.name 
240
            or old_entry.parent_id != new_entry.parent_id):
241
            delta.renamed.append((old_path,
242
                                  new_path,
243
                                  old_entry.file_id, old_entry.kind,
244
                                  text_modified, meta_modified))
245
        elif text_modified or meta_modified:
246
            delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
247
                                   text_modified, meta_modified))
248
        elif want_unchanged:
249
            delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
250
251
252
    def handle_old(path, entry):
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
253
        """old entry without a new entry match
254
255
        Check to see if a matching new entry was already seen as an
256
        added file, and switch the pair into being a rename.
257
        Otherwise just mark the old entry being removed.
258
        """
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
259
        if entry.file_id in added:
260
            # Actually this is a rename, we found a new file_id earlier
261
            # at a different location, so it is no-longer added
262
            x_new_path, x_new_entry = added.pop(entry.file_id)
263
            check_matching(path, entry, x_new_path, x_new_entry)
264
        else:
265
            # We have an old_file_id which doesn't line up with a new_file_id
266
            # So this file looks to be removed
267
            assert entry.file_id not in removed
268
            removed[entry.file_id] = path, entry
269
270
    def handle_new(path, entry):
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
271
        """new entry without an old entry match
272
        
273
        Check to see if a matching old entry was already seen as a
274
        removal, and change the pair into a rename.
275
        Otherwise just mark the new entry as an added file.
276
        """
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
277
        if entry.file_id in removed:
278
            # We saw this file_id earlier at an old different location
279
            # it is no longer removed, just renamed
280
            x_old_path, x_old_entry = removed.pop(entry.file_id)
281
            check_matching(x_old_path, x_old_entry, path, entry)
282
        else:
283
            # We have a new file which does not match an old file
284
            # mark it as added
285
            assert entry.file_id not in added
286
            added[entry.file_id] = path, entry
287
288
    while old_path or new_path:
289
        # list_files() returns files in alphabetical path sorted order
290
        if old_path == new_path:
291
            if old_file_id == new_file_id:
292
                # This is the common case, the files are in the same place
293
                # check if there were any content changes
294
295
                if old_file_id is None:
296
                    # We have 2 unversioned files, no deltas possible???
297
                    pass
298
                else:
299
                    check_matching(old_path, old_entry, new_path, new_entry)
300
            else:
301
                # The ids don't match, so we have to handle them both
302
                # separately.
303
                if old_file_id is not None:
304
                    handle_old(old_path, old_entry)
305
306
                if new_file_id is not None:
307
                    handle_new(new_path, new_entry)
308
309
            # The two entries were at the same path, so increment both sides
310
            old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
311
            new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
312
        elif new_path is None or (old_path is not None and old_path < new_path):
313
            # Assume we don't match, only process old_path
314
            if old_file_id is not None:
315
                handle_old(old_path, old_entry)
316
            # old_path came first, so increment it, trying to match up
317
            old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
318
        elif new_path is not None:
319
            # new_path came first, so increment it, trying to match up
320
            if new_file_id is not None:
321
                handle_new(new_path, new_entry)
322
            new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
323
324
    # Now we have a set of added and removed files, mark them all
325
    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
326
        if specific_file_ids:
327
            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
328
                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.
329
        delta.removed.append((old_path, old_entry.file_id, old_entry.kind))
330
    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
331
        if specific_file_ids:
332
            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
333
                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.
334
        delta.added.append((new_path, new_entry.file_id, new_entry.kind))
335
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
336
    delta.removed.sort()
337
    delta.added.sort()
338
    delta.renamed.sort()
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
339
    # TODO: jam 20060529 These lists shouldn't need to be sorted
340
    #       since we added them in alphabetical order.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
341
    delta.modified.sort()
342
    delta.unchanged.sort()
343
344
    return delta