← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: John Arbash Meinel
  • Date: 2006-11-10 21:06:11 UTC
  • mto: This revision was merged to the branch mainline in revision 2159.
  • Revision ID: john@arbash-meinel.com-20061110210611-ee346404477ecb86
Fix imports to ensure modules are loaded before they are used

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
41
41
    errors,
42
42
    osutils,
43
43
    symbol_versioning,
 
44
    workingtree,
44
45
    )
45
46
""")
46
47
 
1086
1087
 
1087
1088
        if len(parts) == 0:
1088
1089
            if file_id is None:
1089
 
                file_id = bzrlib.workingtree.gen_root_id()
 
1090
                file_id = workingtree.gen_root_id()
1090
1091
            self.root = InventoryDirectory(file_id, '', None)
1091
1092
            self._byid = {self.root.file_id: self.root}
1092
1093
            return
1280
1281
    :param file_id: the file_id to use. if None, one will be created.
1281
1282
    """
1282
1283
    if file_id is None:
1283
 
        file_id = bzrlib.workingtree.gen_file_id(name)
 
1284
        file_id = workingtree.gen_file_id(name)
1284
1285
 
1285
1286
    norm_name, can_access = osutils.normalized_filename(name)
1286
1287
    if norm_name != name: