← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Martin Pool
  • Date: 2007-10-02 02:54:30 UTC
  • mto: This revision was merged to the branch mainline in revision 2873.
  • Revision ID: mbp@sourcefrog.net-20071002025430-5qkc146iuaqxdsgk
Ignore .pyd files in bzr tree (windows C extensions)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
19
19
    osutils,
20
20
    )
21
21
from bzrlib.inventory import InventoryEntry
22
 
from bzrlib.trace import mutter, is_quiet
 
22
from bzrlib.trace import mutter
23
23
from bzrlib.symbol_versioning import deprecated_function
24
24
 
25
25
 
122
122
                    path += '*'
123
123
 
124
124
                if show_ids:
125
 
                    to_file.write(indent + '%s  %-30s %s\n' % (short_status_letter,
126
 
                        path, fid))
 
125
                    print >>to_file, indent + '%s  %-30s %s' % (short_status_letter,
 
126
                        path, fid)
127
127
                else:
128
 
                    to_file.write(indent + '%s  %s\n' % (short_status_letter, path))
 
128
                    print >>to_file, indent + '%s  %s' % (short_status_letter, path)
129
129
            
130
130
        if self.removed:
131
131
            if not short_status:
132
 
                to_file.write(indent + 'removed:\n')
 
132
                print >>to_file, indent + 'removed:'
133
133
                show_list(self.removed)
134
134
            else:
135
135
                show_list(self.removed, 'D')
136
136
                
137
137
        if self.added:
138
138
            if not short_status:
139
 
                to_file.write(indent + 'added:\n')
 
139
                print >>to_file, indent + 'added:'
140
140
                show_list(self.added)
141
141
            else:
142
142
                show_list(self.added, 'A')
146
146
        if self.renamed:
147
147
            short_status_letter = 'R'
148
148
            if not short_status:
149
 
                to_file.write(indent + 'renamed:\n')
 
149
                print >>to_file, indent + 'renamed:'
150
150
                short_status_letter = ''
151
151
            for (oldpath, newpath, fid, kind,
152
152
                 text_modified, meta_modified) in self.renamed:
156
156
                if meta_modified:
157
157
                    newpath += '*'
158
158
                if show_ids:
159
 
                    to_file.write(indent + '%s  %s => %s %s\n' % (
160
 
                        short_status_letter, oldpath, newpath, fid))
 
159
                    print >>to_file, indent + '%s  %s => %s %s' % (
 
160
                        short_status_letter, oldpath, newpath, fid)
161
161
                else:
162
 
                    to_file.write(indent + '%s  %s => %s\n' % (
163
 
                        short_status_letter, oldpath, newpath))
 
162
                    print >>to_file, indent + '%s  %s => %s' % (
 
163
                        short_status_letter, oldpath, newpath)
164
164
 
165
165
        if self.kind_changed:
166
166
            if short_status:
167
167
                short_status_letter = 'K'
168
168
            else:
169
 
                to_file.write(indent + 'kind changed:\n')
 
169
                print >>to_file, indent + 'kind changed:'
170
170
                short_status_letter = ''
171
171
            for (path, fid, old_kind, new_kind) in self.kind_changed:
172
172
                if show_ids:
173
173
                    suffix = ' '+fid
174
174
                else:
175
175
                    suffix = ''
176
 
                to_file.write(indent + '%s  %s (%s => %s)%s\n' % (
177
 
                    short_status_letter, path, old_kind, new_kind, suffix))
 
176
                print >>to_file, indent + '%s  %s (%s => %s)%s' % (
 
177
                    short_status_letter, path, old_kind, new_kind, suffix)
178
178
 
179
179
        if self.modified or extra_modified:
180
180
            short_status_letter = 'M'
181
181
            if not short_status:
182
 
                to_file.write(indent + 'modified:\n')
 
182
                print >>to_file, indent + 'modified:'
183
183
                short_status_letter = ''
184
184
            show_list(self.modified, short_status_letter)
185
185
            show_list(extra_modified, short_status_letter)
186
186
            
187
187
        if show_unchanged and self.unchanged:
188
188
            if not short_status:
189
 
                to_file.write(indent + 'unchanged:\n')
 
189
                print >>to_file, indent + 'unchanged:'
190
190
                show_list(self.unchanged)
191
191
            else:
192
192
                show_list(self.unchanged, 'S')
193
193
 
194
194
        if self.unversioned:
195
 
            to_file.write(indent + 'unknown:\n')
 
195
            print >>to_file, indent + 'unknown:'
196
196
            show_list(self.unversioned)
197
197
 
198
198
    def get_changes_as_text(self, show_ids=False, show_unchanged=False,
314
314
        :param kind: A pair of file kinds, as generated by Tree._iter_changes.
315
315
            None indicates no file present.
316
316
        """
317
 
        if is_quiet():
318
 
            return
319
317
        if paths[1] == '' and versioned == 'added' and self.suppress_root_add:
320
318
            return
321
319
        if versioned == 'unversioned':
335
333
                # on a rename, we show old and new
336
334
                old_path, path = paths
337
335
            else:
338
 
                # if it's not renamed, we're showing both for kind changes
 
336
                # if its not renamed, we're showing both for kind changes
339
337
                # so only show the new path
340
338
                old_path, path = paths[1], paths[1]
341
339
            # if the file is not missing in the source, we show its kind