← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: John Arbash Meinel
  • Date: 2007-01-31 17:48:55 UTC
  • mto: This revision was merged to the branch mainline in revision 2249.
  • Revision ID: john@arbash-meinel.com-20070131174855-gxkjd9rvy17uc6ko
Switch from for line in foo: f.write(line) to f.writelines(foo)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
1
 
# Copyright (C) 2005, 2006 Canonical
2
 
 
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
 
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
 
 
7
#
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
11
# GNU General Public License for more details.
12
 
 
 
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
 
17
from bzrlib import errors
17
18
from bzrlib.inventory import InventoryEntry
18
19
from bzrlib.trace import mutter
 
20
from bzrlib.symbol_versioning import deprecated_function, zero_nine
 
21
 
19
22
 
20
23
class TreeDelta(object):
21
24
    """Describes changes from one tree to another.
88
91
        return False
89
92
            
90
93
 
91
 
    def show(self, to_file, show_ids=False, show_unchanged=False):
92
 
        def show_list(files):
 
94
    def show(self, to_file, show_ids=False, show_unchanged=False, short_status=False):
 
95
        """output this delta in status-like form to to_file."""
 
96
        def show_list(files, short_status_letter=''):
93
97
            for item in files:
94
98
                path, fid, kind = item[:3]
95
99
 
102
106
                    path += '*'
103
107
 
104
108
                if show_ids:
105
 
                    print >>to_file, '  %-30s %s' % (path, fid)
 
109
                    print >>to_file, '%s  %-30s %s' % (short_status_letter, path, fid)
106
110
                else:
107
 
                    print >>to_file, ' ', path
 
111
                    print >>to_file, '%s  %s' % (short_status_letter, path)
108
112
            
109
113
        if self.removed:
110
 
            print >>to_file, 'removed:'
111
 
            show_list(self.removed)
 
114
            if not short_status:
 
115
                print >>to_file, 'removed:'
 
116
                show_list(self.removed)
 
117
            else:
 
118
                show_list(self.removed, 'D')
112
119
                
113
120
        if self.added:
114
 
            print >>to_file, 'added:'
115
 
            show_list(self.added)
 
121
            if not short_status:
 
122
                print >>to_file, 'added:'
 
123
                show_list(self.added)
 
124
            else:
 
125
                show_list(self.added, 'A')
116
126
 
117
127
        extra_modified = []
118
128
 
119
129
        if self.renamed:
120
 
            print >>to_file, 'renamed:'
 
130
            short_status_letter = 'R'
 
131
            if not short_status:
 
132
                print >>to_file, 'renamed:'
 
133
                short_status_letter = ''
121
134
            for (oldpath, newpath, fid, kind,
122
135
                 text_modified, meta_modified) in self.renamed:
123
136
                if text_modified or meta_modified:
126
139
                if meta_modified:
127
140
                    newpath += '*'
128
141
                if show_ids:
129
 
                    print >>to_file, '  %s => %s %s' % (oldpath, newpath, fid)
 
142
                    print >>to_file, '%s  %s => %s %s' % (short_status_letter,
 
143
                                                          oldpath, newpath, fid)
130
144
                else:
131
 
                    print >>to_file, '  %s => %s' % (oldpath, newpath)
 
145
                    print >>to_file, '%s  %s => %s' % (short_status_letter,
 
146
                                                       oldpath, newpath)
132
147
                    
133
148
        if self.modified or extra_modified:
134
 
            print >>to_file, 'modified:'
135
 
            show_list(self.modified)
136
 
            show_list(extra_modified)
 
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)
137
155
            
138
156
        if show_unchanged and self.unchanged:
139
 
            print >>to_file, 'unchanged:'
140
 
            show_list(self.unchanged)
141
 
 
142
 
 
143
 
 
144
 
def compare_trees(old_tree, new_tree, want_unchanged=False, specific_files=None):
145
 
    """Describe changes from one tree to another.
146
 
 
147
 
    Returns a TreeDelta with details of added, modified, renamed, and
148
 
    deleted entries.
149
 
 
150
 
    The root entry is specifically exempt.
151
 
 
152
 
    This only considers versioned files.
153
 
 
154
 
    want_unchanged
155
 
        If true, also list files unchanged from one version to
156
 
        the next.
157
 
 
158
 
    specific_files
159
 
        If true, only check for changes to specified names or
160
 
        files within them.  Any unversioned files given have no effect
161
 
        (but this might change in the future).
162
 
    """
163
 
    # NB: show_status depends on being able to pass in non-versioned files and
164
 
    # report them as unknown
165
 
    old_tree.lock_read()
166
 
    try:
167
 
        new_tree.lock_read()
168
 
        try:
169
 
            return _compare_trees(old_tree, new_tree, want_unchanged,
170
 
                                  specific_files)
171
 
        finally:
172
 
            new_tree.unlock()
173
 
    finally:
174
 
        old_tree.unlock()
175
 
 
176
 
 
177
 
def _compare_trees(old_tree, new_tree, want_unchanged, specific_files):
178
 
 
179
 
    from osutils import is_inside_any
180
 
    
181
 
    old_inv = old_tree.inventory
182
 
    new_inv = new_tree.inventory
 
157
            if not short_status:
 
158
                print >>to_file, 'unchanged:'
 
159
                show_list(self.unchanged)
 
160
            else:
 
161
                show_list(self.unchanged, 'S')
 
162
 
 
163
 
 
164
@deprecated_function(zero_nine)
 
165
def compare_trees(old_tree, new_tree, want_unchanged=False,
 
166
                  specific_files=None, extra_trees=None,
 
167
                  require_versioned=False):
 
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,
 
173
        require_versioned=require_versioned,
 
174
        include_root=False)
 
175
 
 
176
 
 
177
def _compare_trees(old_tree, new_tree, want_unchanged, specific_file_ids,
 
178
                   include_root):
183
179
    delta = TreeDelta()
184
 
    mutter('start compare_trees')
185
 
 
186
 
    # TODO: Rather than iterating over the whole tree and then filtering, we
187
 
    # could diff just the specified files (if any) and their subtrees.  
188
 
    # Perhaps should take a list of file-ids instead?   Need to indicate any
189
 
    # ids or names which were not found in the trees.
190
 
 
191
 
    for file_id in old_tree:
192
 
        if file_id in new_tree:
193
 
            old_ie = old_inv[file_id]
194
 
            new_ie = new_inv[file_id]
195
 
 
196
 
            kind = old_ie.kind
197
 
            assert kind == new_ie.kind
198
 
            
199
 
            assert kind in InventoryEntry.known_kinds, \
200
 
                   'invalid file kind %r' % kind
201
 
 
202
 
            if kind == 'root_directory':
203
 
                continue
204
 
            
205
 
            if specific_files:
206
 
                if (not is_inside_any(specific_files, old_inv.id2path(file_id)) 
207
 
                    and not is_inside_any(specific_files, new_inv.id2path(file_id))):
208
 
                    continue
209
 
 
210
 
            # temporary hack until all entries are populated before clients 
211
 
            # get them
212
 
            old_path = old_inv.id2path(file_id)
213
 
            new_path = new_inv.id2path(file_id)
214
 
            old_ie._read_tree_state(old_path, old_tree)
215
 
            new_ie._read_tree_state(new_path, new_tree)
216
 
            text_modified, meta_modified = new_ie.detect_changes(old_ie)
217
 
 
218
 
            # TODO: Can possibly avoid calculating path strings if the
219
 
            # two files are unchanged and their names and parents are
220
 
            # the same and the parents are unchanged all the way up.
221
 
            # May not be worthwhile.
222
 
            
223
 
            if (old_ie.name != new_ie.name
224
 
                or old_ie.parent_id != new_ie.parent_id):
225
 
                delta.renamed.append((old_path,
226
 
                                      new_path,
227
 
                                      file_id, kind,
228
 
                                      text_modified, meta_modified))
229
 
            elif text_modified or meta_modified:
230
 
                delta.modified.append((new_path, file_id, kind,
231
 
                                       text_modified, meta_modified))
232
 
            elif want_unchanged:
233
 
                delta.unchanged.append((new_path, file_id, kind))
 
180
    # mutter('start compare_trees')
 
181
 
 
182
    for (file_id, path, content_change, versioned, parent_id, name, kind,
 
183
         executable) in new_tree._iter_changes(old_tree, want_unchanged, 
 
184
                                               specific_file_ids):
 
185
        if not include_root and (None, None) == parent_id:
 
186
            continue
 
187
        assert kind[0] == kind[1] or None in kind
 
188
        # the only 'kind change' permitted is creation/deletion
 
189
        fully_present = tuple((versioned[x] and kind[x] is not None) for
 
190
                              x in range(2))
 
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
 
200
        elif name[0] != name[1] or parent_id[0] != parent_id[1]:
 
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)
 
204
            old_path = old_tree.id2path(file_id)
 
205
            delta.renamed.append((old_path,
 
206
                                  path,
 
207
                                  file_id, 
 
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])))
234
215
        else:
235
 
            kind = old_inv.get_file_kind(file_id)
236
 
            if kind == 'root_directory':
237
 
                continue
238
 
            old_path = old_inv.id2path(file_id)
239
 
            if specific_files:
240
 
                if not is_inside_any(specific_files, old_path):
241
 
                    continue
242
 
            delta.removed.append((old_path, file_id, kind))
 
216
            delta.unchanged.append((path, file_id, kind[1]))
243
217
 
244
 
    mutter('start looking for new files')
245
 
    for file_id in new_inv:
246
 
        if file_id in old_inv or file_id not in new_tree:
247
 
            continue
248
 
        kind = new_inv.get_file_kind(file_id)
249
 
        if kind == 'root_directory':
250
 
            continue
251
 
        new_path = new_inv.id2path(file_id)
252
 
        if specific_files:
253
 
            if not is_inside_any(specific_files, new_path):
254
 
                continue
255
 
        delta.added.append((new_path, file_id, kind))
256
 
            
257
218
    delta.removed.sort()
258
219
    delta.added.sort()
259
220
    delta.renamed.sort()
 
221
    # TODO: jam 20060529 These lists shouldn't need to be sorted
 
222
    #       since we added them in alphabetical order.
260
223
    delta.modified.sort()
261
224
    delta.unchanged.sort()
262
225