← 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-10-24 13:59:18 UTC
  • mfrom: (1185.20.1)
  • Revision ID: robertc@robertcollins.net-20051024135918-024629d7ee347b5c
fix upgrading of trees with no commits

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
1
 
#! /usr/bin/env python
2
1
# -*- coding: UTF-8 -*-
3
2
 
4
3
# This program is free software; you can redistribute it and/or modify
15
14
# along with this program; if not, write to the Free Software
16
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
17
16
 
 
17
from bzrlib.inventory import InventoryEntry
18
18
from bzrlib.trace import mutter
19
19
 
20
20
class TreeDelta(object):
27
27
    removed
28
28
        (path, id, kind)
29
29
    renamed
30
 
        (oldpath, newpath, id, kind, text_modified)
 
30
        (oldpath, newpath, id, kind, text_modified, meta_modified)
31
31
    modified
32
 
        (path, id, kind)
 
32
        (path, id, kind, text_modified, meta_modified)
33
33
    unchanged
34
34
        (path, id, kind)
35
35
 
36
36
    Each id is listed only once.
37
37
 
38
38
    Files that are both modified and renamed are listed only in
39
 
    renamed, with the text_modified flag true.
 
39
    renamed, with the text_modified flag true. The text_modified
 
40
    applies either to the the content of the file or the target of the
 
41
    symbolic link, depending of the kind of file.
40
42
 
41
43
    Files are only considered renamed if their name has changed or
42
44
    their parent directory has changed.  Renaming a directory
69
71
            self.modified, self.unchanged)
70
72
 
71
73
    def has_changed(self):
72
 
        changes = len(self.added) + len(self.removed) + len(self.renamed)
73
 
        changes += len(self.modified) 
74
 
        return (changes != 0)
 
74
        return bool(self.modified
 
75
                    or self.added
 
76
                    or self.removed
 
77
                    or self.renamed)
75
78
 
76
79
    def touches_file_id(self, file_id):
77
80
        """Return True if file_id is modified by this delta."""
87
90
 
88
91
    def show(self, to_file, show_ids=False, show_unchanged=False):
89
92
        def show_list(files):
90
 
            for path, fid, kind in files:
 
93
            for item in files:
 
94
                path, fid, kind = item[:3]
 
95
 
91
96
                if kind == 'directory':
92
97
                    path += '/'
93
98
                elif kind == 'symlink':
94
99
                    path += '@'
95
 
                    
 
100
 
 
101
                if len(item) == 5 and item[4]:
 
102
                    path += '*'
 
103
 
96
104
                if show_ids:
97
105
                    print >>to_file, '  %-30s %s' % (path, fid)
98
106
                else:
108
116
 
109
117
        if self.renamed:
110
118
            print >>to_file, 'renamed:'
111
 
            for oldpath, newpath, fid, kind, text_modified in self.renamed:
 
119
            for (oldpath, newpath, fid, kind,
 
120
                 text_modified, meta_modified) in self.renamed:
 
121
                if meta_modified:
 
122
                    newpath += '*'
112
123
                if show_ids:
113
124
                    print >>to_file, '  %s => %s %s' % (oldpath, newpath, fid)
114
125
                else:
161
172
            kind = old_ie.kind
162
173
            assert kind == new_ie.kind
163
174
            
164
 
            assert kind in ('file', 'directory', 'symlink', 'root_directory'), \
 
175
            assert kind in InventoryEntry.known_kinds, \
165
176
                   'invalid file kind %r' % kind
166
177
 
167
178
            if kind == 'root_directory':
172
183
                    and not is_inside_any(specific_files, new_inv.id2path(file_id))):
173
184
                    continue
174
185
 
175
 
            if kind == 'file':
176
 
                old_sha1 = old_tree.get_file_sha1(file_id)
177
 
                new_sha1 = new_tree.get_file_sha1(file_id)
178
 
                text_modified = (old_sha1 != new_sha1)
179
 
            else:
180
 
                ## mutter("no text to check for %r %r" % (file_id, kind))
181
 
                text_modified = False
 
186
            # temporary hack until all entries are populated before clients 
 
187
            # get them
 
188
            old_path = old_inv.id2path(file_id)
 
189
            new_path = new_inv.id2path(file_id)
 
190
            old_ie._read_tree_state(old_path, old_tree)
 
191
            new_ie._read_tree_state(new_path, new_tree)
 
192
            text_modified, meta_modified = new_ie.detect_changes(old_ie)
182
193
 
183
194
            # TODO: Can possibly avoid calculating path strings if the
184
195
            # two files are unchanged and their names and parents are
187
198
            
188
199
            if (old_ie.name != new_ie.name
189
200
                or old_ie.parent_id != new_ie.parent_id):
190
 
                delta.renamed.append((old_inv.id2path(file_id),
191
 
                                      new_inv.id2path(file_id),
 
201
                delta.renamed.append((old_path,
 
202
                                      new_path,
192
203
                                      file_id, kind,
193
 
                                      text_modified))
194
 
            elif text_modified:
195
 
                delta.modified.append((new_inv.id2path(file_id), file_id, kind))
 
204
                                      text_modified, meta_modified))
 
205
            elif text_modified or meta_modified:
 
206
                delta.modified.append((new_path, file_id, kind,
 
207
                                       text_modified, meta_modified))
196
208
            elif want_unchanged:
197
 
                delta.unchanged.append((new_inv.id2path(file_id), file_id, kind))
 
209
                delta.unchanged.append((new_path, file_id, kind))
198
210
        else:
199
211
            kind = old_inv.get_file_kind(file_id)
200
212
            if kind == 'root_directory':