/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/bundle_data.py

Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
284
284
        sha1 = StrictTestament(rev, inventory).as_sha1()
285
285
        if sha1 != rev_info.sha1:
286
286
            raise TestamentMismatch(rev.revision_id, rev_info.sha1, sha1)
287
 
        if rev_to_sha1.has_key(rev.revision_id):
 
287
        if rev.revision_id in rev_to_sha1:
288
288
            raise BzrError('Revision {%s} given twice in the list'
289
289
                    % (rev.revision_id))
290
290
        rev_to_sha1[rev.revision_id] = sha1
454
454
        """A file/directory has been renamed from old_path => new_path"""
455
455
        new_path = self._true_path(new_path)
456
456
        old_path = self._true_path(old_path)
457
 
        assert not self._renamed.has_key(new_path)
458
 
        assert not self._renamed_r.has_key(old_path)
 
457
        assert new_path not in self._renamed
 
458
        assert old_path not in self._renamed_r
459
459
        self._renamed[new_path] = old_path
460
460
        self._renamed_r[old_path] = new_path
461
461
 
467
467
        self._kinds[new_id] = kind
468
468
 
469
469
    def note_last_changed(self, file_id, revision_id):
470
 
        if (self._last_changed.has_key(file_id)
 
470
        if (file_id in self._last_changed
471
471
                and self._last_changed[file_id] != revision_id):
472
472
            raise BzrError('Mismatched last-changed revision for file_id {%s}'
473
473
                    ': %s != %s' % (file_id,
511
511
            old_path = new_path
512
512
        #If the new path wasn't in renamed, the old one shouldn't be in
513
513
        #renamed_r
514
 
        if self._renamed_r.has_key(old_path):
 
514
        if old_path in self._renamed_r:
515
515
            return None
516
516
        return old_path 
517
517
 
524
524
        new_path = self._renamed_r.get(old_path)
525
525
        if new_path is not None:
526
526
            return new_path
527
 
        if self._renamed.has_key(new_path):
 
527
        if new_path in self._renamed:
528
528
            return None
529
529
        dirname,basename = os.path.split(old_path)
530
530
        if dirname != '':
537
537
            new_path = old_path
538
538
        #If the old path wasn't in renamed, the new one shouldn't be in
539
539
        #renamed_r
540
 
        if self._renamed.has_key(new_path):
 
540
        if new_path in self._renamed:
541
541
            return None
542
542
        return new_path 
543
543