/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
19
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
20
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
21
class TreeDelta(object):
22
    """Describes changes from one tree to another.
23
24
    Contains four lists:
25
26
    added
27
        (path, id, kind)
28
    removed
29
        (path, id, kind)
30
    renamed
1398 by Robert Collins
integrate in Gustavos x-bit patch
31
        (oldpath, newpath, id, kind, text_modified, meta_modified)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
32
    modified
1398 by Robert Collins
integrate in Gustavos x-bit patch
33
        (path, id, kind, text_modified, meta_modified)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
34
    unchanged
35
        (path, id, kind)
36
37
    Each id is listed only once.
38
39
    Files that are both modified and renamed are listed only in
1092.2.6 by Robert Collins
symlink support updated to work
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.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
43
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.
47
48
    The lists are normally sorted when the delta is created.
49
    """
50
    def __init__(self):
51
        self.added = []
52
        self.removed = []
53
        self.renamed = []
54
        self.modified = []
55
        self.unchanged = []
56
57
    def __eq__(self, other):
58
        if not isinstance(other, TreeDelta):
59
            return False
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
65
66
    def __ne__(self, other):
67
        return not (self == other)
68
69
    def __repr__(self):
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)
73
74
    def has_changed(self):
1189 by Martin Pool
- BROKEN: partial support for commit into weave
75
        return bool(self.modified
76
                    or self.added
77
                    or self.removed
78
                    or self.renamed)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
79
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:
83
            for v in l:
84
                if v[1] == file_id:
85
                    return True
86
        for v in self.renamed:
87
            if v[2] == file_id:
88
                return True
89
        return False
90
            
91
92
    def show(self, to_file, show_ids=False, show_unchanged=False):
93
        def show_list(files):
1398 by Robert Collins
integrate in Gustavos x-bit patch
94
            for item in files:
95
                path, fid, kind = item[:3]
96
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
97
                if kind == 'directory':
98
                    path += '/'
99
                elif kind == 'symlink':
100
                    path += '@'
1398 by Robert Collins
integrate in Gustavos x-bit patch
101
102
                if len(item) == 5 and item[4]:
103
                    path += '*'
104
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
105
                if show_ids:
106
                    print >>to_file, '  %-30s %s' % (path, fid)
107
                else:
108
                    print >>to_file, ' ', path
109
            
110
        if self.removed:
111
            print >>to_file, 'removed:'
112
            show_list(self.removed)
113
                
114
        if self.added:
115
            print >>to_file, 'added:'
116
            show_list(self.added)
117
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
118
        extra_modified = []
119
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
120
        if self.renamed:
121
            print >>to_file, 'renamed:'
1398 by Robert Collins
integrate in Gustavos x-bit patch
122
            for (oldpath, newpath, fid, kind,
123
                 text_modified, meta_modified) in self.renamed:
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
124
                if text_modified or meta_modified:
125
                    extra_modified.append((newpath, fid, kind,
126
                                           text_modified, meta_modified))
1398 by Robert Collins
integrate in Gustavos x-bit patch
127
                if meta_modified:
128
                    newpath += '*'
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
129
                if show_ids:
130
                    print >>to_file, '  %s => %s %s' % (oldpath, newpath, fid)
131
                else:
132
                    print >>to_file, '  %s => %s' % (oldpath, newpath)
133
                    
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
134
        if self.modified or extra_modified:
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
135
            print >>to_file, 'modified:'
136
            show_list(self.modified)
1185.36.2 by Daniel Silverstone
Allow the delta display routine to show when a file
137
            show_list(extra_modified)
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
138
            
139
        if show_unchanged and self.unchanged:
140
            print >>to_file, 'unchanged:'
141
            show_list(self.unchanged)
142
143
144
1731.1.15 by Aaron Bentley
Allow compare_trees to list root
145
def compare_trees(old_tree, new_tree, want_unchanged=False, 
146
                  specific_files=None, include_root=False):
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
147
    """Describe changes from one tree to another.
148
149
    Returns a TreeDelta with details of added, modified, renamed, and
150
    deleted entries.
151
1731.1.15 by Aaron Bentley
Allow compare_trees to list root
152
    The root entry is specifically exempt, unless include_root is specified.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
153
154
    This only considers versioned files.
155
156
    want_unchanged
157
        If true, also list files unchanged from one version to
158
        the next.
159
160
    specific_files
161
        If true, only check for changes to specified names or
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
162
        files within them.  Any unversioned files given have no effect
163
        (but this might change in the future).
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
164
    """
1662.1.9 by Martin Pool
Give a clear error for bzr status of an unversioned, nonexistent file. (Malone #3619)
165
    # NB: show_status depends on being able to pass in non-versioned files and
166
    # report them as unknown
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
167
    old_tree.lock_read()
168
    try:
169
        new_tree.lock_read()
170
        try:
171
            return _compare_trees(old_tree, new_tree, want_unchanged,
1731.1.15 by Aaron Bentley
Allow compare_trees to list root
172
                                  specific_files, include_root)
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
173
        finally:
174
            new_tree.unlock()
175
    finally:
176
        old_tree.unlock()
177
178
1731.1.15 by Aaron Bentley
Allow compare_trees to list root
179
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files,
180
                   include_root):
1543.1.1 by Denys Duchier
lock operations for trees - use them for diff
181
1732.1.5 by John Arbash Meinel
revert 1735
182
    from osutils import is_inside_any
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
183
    
184
    old_inv = old_tree.inventory
185
    new_inv = new_tree.inventory
186
    delta = TreeDelta()
187
    mutter('start compare_trees')
188
1658.1.9 by Martin Pool
Give an error for bzr diff on an nonexistent file (Malone #3619)
189
    # TODO: Rather than iterating over the whole tree and then filtering, we
190
    # could diff just the specified files (if any) and their subtrees.  
191
    # Perhaps should take a list of file-ids instead?   Need to indicate any
192
    # ids or names which were not found in the trees.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
193
1731.1.15 by Aaron Bentley
Allow compare_trees to list root
194
    old_files = old_tree.list_files(include_root)
195
    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.
196
197
    more_old = True
198
    more_new = True
199
200
    added = {}
201
    removed = {}
202
203
    def get_next(iter):
204
        try:
205
            return iter.next()
206
        except StopIteration:
207
            return None, None, None, None, None
208
    old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
209
    new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
210
211
212
    def check_matching(old_path, old_entry, new_path, new_entry):
213
        """We have matched up 2 file_ids, check for changes."""
214
        assert old_entry.kind == new_entry.kind
215
1732.1.15 by John Arbash Meinel
Re-add the specific files handling to _compare_trees
216
        if specific_files:
217
            if (not is_inside_any(specific_files, old_path)
218
                and not is_inside_any(specific_files, new_path)):
219
                return
220
221
        # temporary hack until all entries are populated before clients 
222
        # 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.
223
        old_entry._read_tree_state(old_path, old_tree)
224
        new_entry._read_tree_state(new_path, new_tree)
225
        text_modified, meta_modified = new_entry.detect_changes(old_entry)
226
        
1732.1.15 by John Arbash Meinel
Re-add the specific files handling to _compare_trees
227
        # If the name changes, or the parent_id changes, we have a rename
228
        # (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.
229
        if (old_entry.name != new_entry.name 
230
            or old_entry.parent_id != new_entry.parent_id):
231
            delta.renamed.append((old_path,
232
                                  new_path,
233
                                  old_entry.file_id, old_entry.kind,
234
                                  text_modified, meta_modified))
235
        elif text_modified or meta_modified:
236
            delta.modified.append((new_path, new_entry.file_id, new_entry.kind,
237
                                   text_modified, meta_modified))
238
        elif want_unchanged:
239
            delta.unchanged.append((new_path, new_entry.file_id, new_entry.kind))
240
241
242
    def handle_old(path, entry):
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
243
        """old entry without a new entry match
244
245
        Check to see if a matching new entry was already seen as an
246
        added file, and switch the pair into being a rename.
247
        Otherwise just mark the old entry being removed.
248
        """
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
249
        if entry.file_id in added:
250
            # Actually this is a rename, we found a new file_id earlier
251
            # at a different location, so it is no-longer added
252
            x_new_path, x_new_entry = added.pop(entry.file_id)
253
            check_matching(path, entry, x_new_path, x_new_entry)
254
        else:
255
            # We have an old_file_id which doesn't line up with a new_file_id
256
            # So this file looks to be removed
257
            assert entry.file_id not in removed
258
            removed[entry.file_id] = path, entry
259
260
    def handle_new(path, entry):
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
261
        """new entry without an old entry match
262
        
263
        Check to see if a matching old entry was already seen as a
264
        removal, and change the pair into a rename.
265
        Otherwise just mark the new entry as an added file.
266
        """
1732.1.7 by John Arbash Meinel
Instead of iterating randomly in both trees, _compare_trees now iterates in order on both trees simultaneously.
267
        if entry.file_id in removed:
268
            # We saw this file_id earlier at an old different location
269
            # it is no longer removed, just renamed
270
            x_old_path, x_old_entry = removed.pop(entry.file_id)
271
            check_matching(x_old_path, x_old_entry, path, entry)
272
        else:
273
            # We have a new file which does not match an old file
274
            # mark it as added
275
            assert entry.file_id not in added
276
            added[entry.file_id] = path, entry
1731.1.15 by Aaron Bentley
Allow compare_trees to list root
277
    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.
278
        # list_files() returns files in alphabetical path sorted order
279
        if old_path == new_path:
280
            if old_file_id == new_file_id:
281
                # This is the common case, the files are in the same place
282
                # check if there were any content changes
283
284
                if old_file_id is None:
285
                    # We have 2 unversioned files, no deltas possible???
286
                    pass
287
                else:
288
                    check_matching(old_path, old_entry, new_path, new_entry)
289
            else:
290
                # The ids don't match, so we have to handle them both
291
                # separately.
292
                if old_file_id is not None:
293
                    handle_old(old_path, old_entry)
294
295
                if new_file_id is not None:
296
                    handle_new(new_path, new_entry)
297
298
            # The two entries were at the same path, so increment both sides
299
            old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
300
            new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
301
        elif new_path is None or (old_path is not None and old_path < new_path):
302
            # Assume we don't match, only process old_path
303
            if old_file_id is not None:
304
                handle_old(old_path, old_entry)
305
            # old_path came first, so increment it, trying to match up
306
            old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
307
        elif new_path is not None:
308
            # new_path came first, so increment it, trying to match up
309
            if new_file_id is not None:
310
                handle_new(new_path, new_entry)
311
            new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
312
313
    # Now we have a set of added and removed files, mark them all
314
    for old_path, old_entry in removed.itervalues():
1732.1.15 by John Arbash Meinel
Re-add the specific files handling to _compare_trees
315
        if specific_files:
316
            if not is_inside_any(specific_files, old_path):
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.removed.append((old_path, old_entry.file_id, old_entry.kind))
319
    for new_path, new_entry in added.itervalues():
1732.1.15 by John Arbash Meinel
Re-add the specific files handling to _compare_trees
320
        if specific_files:
321
            if not is_inside_any(specific_files, new_path):
322
                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.
323
        delta.added.append((new_path, new_entry.file_id, new_entry.kind))
324
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
325
    delta.removed.sort()
326
    delta.added.sort()
327
    delta.renamed.sort()
1732.1.29 by John Arbash Meinel
Update documentation and TODO for compare_trees
328
    # TODO: jam 20060529 These lists shouldn't need to be sorted
329
    #       since we added them in alphabetical order.
974.1.26 by aaron.bentley at utoronto
merged mbp@sourcefrog.net-20050817233101-0939da1cf91f2472
330
    delta.modified.sort()
331
    delta.unchanged.sort()
332
333
    return delta