← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transform.py

Add a new method ``Tree.revision_tree`` which allows access to cached
trees for arbitrary revisions. This allows the in development dirstate
tree format to provide access to the callers to cached copies of 
inventory data which are cheaper to access than inventories from the
repository. (Robert Collins, Martin Pool)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transform.py
1326
1326
            trans_id = conflict[1]
1327
1327
            try:
1328
1328
                tt.cancel_deletion(trans_id)
1329
 
                new_conflicts.add((c_type, 'Not deleting', trans_id))
 
1329
                new_conflicts.add(('deleting parent', 'Not deleting', 
 
1330
                                   trans_id))
1330
1331
            except KeyError:
1331
1332
                tt.create_directory(trans_id)
1332
 
                new_conflicts.add((c_type, 'Created directory.', trans_id))
 
1333
                new_conflicts.add((c_type, 'Created directory', trans_id))
1333
1334
        elif c_type == 'unversioned parent':
1334
1335
            tt.version_file(tt.inactive_file_id(conflict[1]), conflict[1])
1335
1336
            new_conflicts.add((c_type, 'Versioned directory', conflict[1]))