← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commit.py

  • Committer: Martin Pool
  • Date: 2005-07-11 06:13:18 UTC
  • mfrom: (unknown (missing))
  • Revision ID: mbp@sourcefrog.net-20050711061318-80557a9f045b1f38
- merge john's revision-naming code

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commit.py
211
211
        working inventory.
212
212
    """
213
213
    from bzrlib.inventory import Inventory
214
 
    from bzrlib.osutils import isdir, isfile, sha_string, quotefn, \
 
214
    from osutils import isdir, isfile, sha_string, quotefn, \
215
215
         local_time_offset, username, kind_marker, is_inside_any
216
216
    
217
 
    from bzrlib.branch import gen_file_id
218
 
    from bzrlib.errors import BzrError
219
 
    from bzrlib.revision import Revision
 
217
    from branch import gen_file_id
 
218
    from errors import BzrError
 
219
    from revision import Revision
220
220
    from bzrlib.trace import mutter, note
221
221
 
222
222
    any_changes = False
223
 
    inv = Inventory(work_inv.root.file_id)
 
223
    inv = Inventory()
224
224
    missing_ids = []
225
225
    
226
226
    for path, entry in work_inv.iter_entries():