← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Robert Collins
  • Date: 2005-11-28 05:13:41 UTC
  • mfrom: (1185.33.54 merge-recovered)
  • Revision ID: robertc@robertcollins.net-20051128051341-059936f2f29a12c8
Merge from Martin. Adjust check to work with HTTP again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
2
 
#
 
1
# -*- coding: UTF-8 -*-
 
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
18
17
from bzrlib.inventory import InventoryEntry
19
18
from bzrlib.trace import mutter
20
 
from bzrlib.symbol_versioning import deprecated_function, zero_nine
21
 
 
22
19
 
23
20
class TreeDelta(object):
24
21
    """Describes changes from one tree to another.
91
88
        return False
92
89
            
93
90
 
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=''):
 
91
    def show(self, to_file, show_ids=False, show_unchanged=False):
 
92
        def show_list(files):
97
93
            for item in files:
98
94
                path, fid, kind = item[:3]
99
95
 
106
102
                    path += '*'
107
103
 
108
104
                if show_ids:
109
 
                    print >>to_file, '%s  %-30s %s' % (short_status_letter, path, fid)
 
105
                    print >>to_file, '  %-30s %s' % (path, fid)
110
106
                else:
111
 
                    print >>to_file, '%s  %s' % (short_status_letter, path)
 
107
                    print >>to_file, ' ', path
112
108
            
113
109
        if 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')
 
110
            print >>to_file, 'removed:'
 
111
            show_list(self.removed)
119
112
                
120
113
        if 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')
 
114
            print >>to_file, 'added:'
 
115
            show_list(self.added)
126
116
 
127
117
        extra_modified = []
128
118
 
129
119
        if self.renamed:
130
 
            short_status_letter = 'R'
131
 
            if not short_status:
132
 
                print >>to_file, 'renamed:'
133
 
                short_status_letter = ''
 
120
            print >>to_file, 'renamed:'
134
121
            for (oldpath, newpath, fid, kind,
135
122
                 text_modified, meta_modified) in self.renamed:
136
123
                if text_modified or meta_modified:
139
126
                if meta_modified:
140
127
                    newpath += '*'
141
128
                if show_ids:
142
 
                    print >>to_file, '%s  %s => %s %s' % (short_status_letter,
143
 
                                                          oldpath, newpath, fid)
 
129
                    print >>to_file, '  %s => %s %s' % (oldpath, newpath, fid)
144
130
                else:
145
 
                    print >>to_file, '%s  %s => %s' % (short_status_letter,
146
 
                                                       oldpath, newpath)
 
131
                    print >>to_file, '  %s => %s' % (oldpath, newpath)
147
132
                    
148
133
        if self.modified or 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)
 
134
            print >>to_file, 'modified:'
 
135
            show_list(self.modified)
 
136
            show_list(extra_modified)
155
137
            
156
138
        if show_unchanged and self.unchanged:
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):
 
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.
 
161
    """
 
162
 
 
163
    from osutils import is_inside_any
 
164
    
 
165
    old_inv = old_tree.inventory
 
166
    new_inv = new_tree.inventory
179
167
    delta = TreeDelta()
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])))
 
168
    mutter('start compare_trees')
 
169
 
 
170
    # TODO: match for specific files can be rather smarter by finding
 
171
    # the IDs of those files up front and then considering only that.
 
172
 
 
173
    for file_id in old_tree:
 
174
        if file_id in new_tree:
 
175
            old_ie = old_inv[file_id]
 
176
            new_ie = new_inv[file_id]
 
177
 
 
178
            kind = old_ie.kind
 
179
            assert kind == new_ie.kind
 
180
            
 
181
            assert kind in InventoryEntry.known_kinds, \
 
182
                   'invalid file kind %r' % kind
 
183
 
 
184
            if kind == 'root_directory':
 
185
                continue
 
186
            
 
187
            if specific_files:
 
188
                if (not is_inside_any(specific_files, old_inv.id2path(file_id)) 
 
189
                    and not is_inside_any(specific_files, new_inv.id2path(file_id))):
 
190
                    continue
 
191
 
 
192
            # temporary hack until all entries are populated before clients 
 
193
            # get them
 
194
            old_path = old_inv.id2path(file_id)
 
195
            new_path = new_inv.id2path(file_id)
 
196
            old_ie._read_tree_state(old_path, old_tree)
 
197
            new_ie._read_tree_state(new_path, new_tree)
 
198
            text_modified, meta_modified = new_ie.detect_changes(old_ie)
 
199
 
 
200
            # TODO: Can possibly avoid calculating path strings if the
 
201
            # two files are unchanged and their names and parents are
 
202
            # the same and the parents are unchanged all the way up.
 
203
            # May not be worthwhile.
 
204
            
 
205
            if (old_ie.name != new_ie.name
 
206
                or old_ie.parent_id != new_ie.parent_id):
 
207
                delta.renamed.append((old_path,
 
208
                                      new_path,
 
209
                                      file_id, kind,
 
210
                                      text_modified, meta_modified))
 
211
            elif text_modified or meta_modified:
 
212
                delta.modified.append((new_path, file_id, kind,
 
213
                                       text_modified, meta_modified))
 
214
            elif want_unchanged:
 
215
                delta.unchanged.append((new_path, file_id, kind))
215
216
        else:
216
 
            delta.unchanged.append((path, file_id, kind[1]))
 
217
            kind = old_inv.get_file_kind(file_id)
 
218
            if kind == 'root_directory':
 
219
                continue
 
220
            old_path = old_inv.id2path(file_id)
 
221
            if specific_files:
 
222
                if not is_inside_any(specific_files, old_path):
 
223
                    continue
 
224
            delta.removed.append((old_path, file_id, kind))
217
225
 
 
226
    mutter('start looking for new files')
 
227
    for file_id in new_inv:
 
228
        if file_id in old_inv or file_id not in new_tree:
 
229
            continue
 
230
        kind = new_inv.get_file_kind(file_id)
 
231
        if kind == 'root_directory':
 
232
            continue
 
233
        new_path = new_inv.id2path(file_id)
 
234
        if specific_files:
 
235
            if not is_inside_any(specific_files, new_path):
 
236
                continue
 
237
        delta.added.append((new_path, file_id, kind))
 
238
            
218
239
    delta.removed.sort()
219
240
    delta.added.sort()
220
241
    delta.renamed.sort()
221
 
    # TODO: jam 20060529 These lists shouldn't need to be sorted
222
 
    #       since we added them in alphabetical order.
223
242
    delta.modified.sort()
224
243
    delta.unchanged.sort()
225
244