Rev 3484: Minor _build_tree clean-ups (Ian Clatworthy) in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3484
revision-id:pqm at pqm.ubuntu.com-20080609032621-t822lbsu7n2ide2k
parent: pqm at pqm.ubuntu.com-20080608002120-r3kcq0kxq24lhnak
parent: ian.clatworthy at canonical.com-20080609025712-oj0n2ugyezt4545l
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-06-09 04:26:21 +0100
message:
  Minor _build_tree clean-ups (Ian Clatworthy)
modified:
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    revno: 3483.1.1
    revision-id:ian.clatworthy at canonical.com-20080609025712-oj0n2ugyezt4545l
    parent: pqm at pqm.ubuntu.com-20080608002120-r3kcq0kxq24lhnak
    parent: ian.clatworthy at canonical.com-20080608203415-2n2otd5qie6vi97w
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: ianc-integration
    timestamp: Mon 2008-06-09 12:57:12 +1000
    message:
      Minor _build_tree clean-ups (Ian Clatworthy)
    modified:
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    revno: 3483.2.1
    revision-id:ian.clatworthy at canonical.com-20080608203415-2n2otd5qie6vi97w
    parent: pqm at pqm.ubuntu.com-20080608002120-r3kcq0kxq24lhnak
    committer: Ian Clatworthy <ian.clatworthy at canonical.com>
    branch nick: bzr.build-tree
    timestamp: Mon 2008-06-09 06:34:15 +1000
    message:
      minor _build_tree cleanups
    modified:
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2008-06-07 19:33:26 +0000
+++ b/bzrlib/transform.py	2008-06-08 20:34:15 +0000
@@ -1675,14 +1675,14 @@
         try:
             deferred_contents = []
             num = 0
+            total = len(tree.inventory)
             if delta_from_tree:
                 precomputed_delta = []
             else:
                 precomputed_delta = None
             for num, (tree_path, entry) in \
                 enumerate(tree.inventory.iter_entries_by_dir()):
-                pb.update("Building tree", num - len(deferred_contents),
-                          len(tree.inventory))
+                pb.update("Building tree", num - len(deferred_contents), total)
                 if entry.parent_id is None:
                     continue
                 reparent = False
@@ -1705,21 +1705,17 @@
                         tt.delete_contents(tt.trans_id_tree_path(tree_path))
                         if kind == 'directory':
                             reparent = True
-                if entry.parent_id not in file_trans_id:
-                    raise AssertionError(
-                        'entry %s parent id %r is not in file_trans_id %r'
-                        % (entry, entry.parent_id, file_trans_id))
                 parent_id = file_trans_id[entry.parent_id]
                 if entry.kind == 'file':
                     # We *almost* replicate new_by_entry, so that we can defer
                     # getting the file text, and get them all at once.
                     trans_id = tt.create_path(entry.name, parent_id)
                     file_trans_id[file_id] = trans_id
-                    tt.version_file(entry.file_id, trans_id)
-                    executable = tree.is_executable(entry.file_id, tree_path)
+                    tt.version_file(file_id, trans_id)
+                    executable = tree.is_executable(file_id, tree_path)
                     if executable:
                         tt.set_executability(executable, trans_id)
-                    deferred_contents.append((entry.file_id, trans_id))
+                    deferred_contents.append((file_id, trans_id))
                 else:
                     file_trans_id[file_id] = new_by_entry(tt, entry, parent_id,
                                                           tree)