← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Aaron Bentley
  • Date: 2007-02-25 15:15:16 UTC
  • mto: (2255.2.152 dirstate)
  • mto: This revision was merged to the branch mainline in revision 2322.
  • Revision ID: aaron.bentley@utoronto.ca-20070225151516-38bls2quulk8xsu5
Merge refactoring of add_reference

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
829
829
    
830
830
    kind = 'tree-reference'
831
831
    
832
 
    def __init__(self, file_id, name, parent_id, revision, reference_revision):
 
832
    def __init__(self, file_id, name, parent_id, revision=None,
 
833
                 reference_revision=None):
833
834
        InventoryEntry.__init__(self, file_id, name, parent_id)
834
835
        self.revision = revision
835
836
        self.reference_revision = reference_revision
1363
1364
    'directory':InventoryDirectory,
1364
1365
    'file':InventoryFile,
1365
1366
    'symlink':InventoryLink,
 
1367
    'tree-reference': TreeReference
1366
1368
}
1367
1369
 
1368
1370
def make_entry(kind, name, parent_id, file_id=None):