← 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-06 22:15:52 UTC
  • mfrom: (1185.13.2)
  • mto: This revision was merged to the branch mainline in revision 1420.
  • Revision ID: robertc@robertcollins.net-20051006221552-9b15c96fa504e0ad
merge from upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
114
114
            print >>to_file, 'added:'
115
115
            show_list(self.added)
116
116
 
117
 
        extra_modified = []
118
 
 
119
117
        if self.renamed:
120
118
            print >>to_file, 'renamed:'
121
119
            for (oldpath, newpath, fid, kind,
122
120
                 text_modified, meta_modified) in self.renamed:
123
 
                if text_modified or meta_modified:
124
 
                    extra_modified.append((newpath, fid, kind,
125
 
                                           text_modified, meta_modified))
126
121
                if meta_modified:
127
122
                    newpath += '*'
128
123
                if show_ids:
130
125
                else:
131
126
                    print >>to_file, '  %s => %s' % (oldpath, newpath)
132
127
                    
133
 
        if self.modified or extra_modified:
 
128
        if self.modified:
134
129
            print >>to_file, 'modified:'
135
130
            show_list(self.modified)
136
 
            show_list(extra_modified)
137
131
            
138
132
        if show_unchanged and self.unchanged:
139
133
            print >>to_file, 'unchanged:'
225
219
 
226
220
    mutter('start looking for new files')
227
221
    for file_id in new_inv:
228
 
        if file_id in old_inv or file_id not in new_tree:
 
222
        if file_id in old_inv:
229
223
            continue
230
224
        kind = new_inv.get_file_kind(file_id)
231
225
        if kind == 'root_directory':