← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/delta.py

  • Committer: Aaron Bentley
  • Date: 2006-09-21 23:23:03 UTC
  • mto: This revision was merged to the branch mainline in revision 2048.
  • Revision ID: aaron.bentley@utoronto.ca-20060921232303-456dc6bfcc66f870
Got 0.9 bundles working, with root included by changes_from

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/delta.py
185
185
    old_path, old_class, old_kind, old_file_id, old_entry = get_next(old_files)
186
186
    new_path, new_class, new_kind, new_file_id, new_entry = get_next(new_files)
187
187
 
188
 
 
189
188
    def check_matching(old_path, old_entry, new_path, new_entry):
190
189
        """We have matched up 2 file_ids, check for changes."""
191
190
        assert old_entry.kind == new_entry.kind
252
251
            assert entry.file_id not in added
253
252
            added[entry.file_id] = path, entry
254
253
 
255
 
    while old_path or new_path:
 
254
    while old_path is not None or new_path is not None:
256
255
        # list_files() returns files in alphabetical path sorted order
257
256
        if old_path == new_path:
258
257
            if old_file_id == new_file_id: