Rev 2332: Tune working inventory generation more: walk the blocks, skipping deleted rows. in file:///home/robertc/source/baz/dirstate/
Robert Collins
robertc at robertcollins.net
Fri Feb 16 06:44:28 GMT 2007
At file:///home/robertc/source/baz/dirstate/
------------------------------------------------------------
revno: 2332
revision-id: robertc at robertcollins.net-20070216064426-tfdvexihpqq05csl
parent: robertc at robertcollins.net-20070216061015-60p0vv623cigcg5x
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate
timestamp: Fri 2007-02-16 17:44:26 +1100
message:
Tune working inventory generation more: walk the blocks, skipping deleted rows.
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/bzrdir.py'
--- a/bzrlib/bzrdir.py 2007-01-17 14:33:15 +0000
+++ b/bzrlib/bzrdir.py 2007-02-16 06:44:26 +0000
@@ -711,11 +711,15 @@
# case that the newly sprouted branch is a remote one
if result_repo is None or result_repo.make_working_trees():
wt = result.create_workingtree()
- if wt.inventory.root is None:
- try:
- wt.set_root_id(self.open_workingtree.get_root_id())
- except errors.NoWorkingTree:
- pass
+ wt.lock_write()
+ try:
+ if wt.path2id('') is None:
+ try:
+ wt.set_root_id(self.open_workingtree.get_root_id())
+ except errors.NoWorkingTree:
+ pass
+ finally:
+ wt.unlock()
return result
=== modified file 'bzrlib/dirstate.py'
--- a/bzrlib/dirstate.py 2007-02-16 06:02:39 +0000
+++ b/bzrlib/dirstate.py 2007-02-16 06:44:26 +0000
@@ -321,6 +321,7 @@
:param tree: The tree which should provide parent information and
inventory ids.
"""
+ tree.lock_read()
# XXX: aka the big ugly.
result = DirState()
result._state_file = open(dir_state_filename, 'wb+')
@@ -406,6 +407,7 @@
#lines.append(result._get_ghosts_line([]))
result._set_data(parent_ids, root_row, dirblocks)
result.save()
+ tree.unlock()
return result
def get_ghosts(self):
=== modified file 'bzrlib/tests/test_dirstate.py'
--- a/bzrlib/tests/test_dirstate.py 2007-02-15 22:28:34 +0000
+++ b/bzrlib/tests/test_dirstate.py 2007-02-16 06:44:26 +0000
@@ -67,7 +67,7 @@
# there should be one fileid in this tree - the root of the tree.
root_stat_pack = dirstate.pack_stat(os.stat(tree.basedir))
self.assertEqual(
- [(('', '', 'directory', tree.inventory.root.file_id, 0, root_stat_pack, ''), [])],
+ [(('', '', 'directory', tree.path2id(''), 0, root_stat_pack, ''), [])],
list(state._iter_rows()))
check_state()
state = dirstate.DirState.on_file('dirstate')
=== modified file 'bzrlib/tests/test_workingtree.py'
--- a/bzrlib/tests/test_workingtree.py 2007-02-14 03:17:48 +0000
+++ b/bzrlib/tests/test_workingtree.py 2007-02-16 06:44:26 +0000
@@ -306,16 +306,22 @@
subtree.add(['file-a'], ['id-a'])
rev1 = subtree.commit('commit in subdir')
rev1_tree = subtree.basis_tree()
+ rev1_tree.lock_read()
+ self.addCleanup(rev1_tree.unlock)
subtree2 = subtree.bzrdir.sprout('subdir2').open_workingtree()
self.build_tree(['subdir2/file-b'])
subtree2.add(['file-b'], ['id-b'])
rev2 = subtree2.commit('commit in subdir2')
rev2_tree = subtree2.basis_tree()
+ rev2_tree.lock_read()
+ self.addCleanup(rev2_tree.unlock)
subtree.merge_from_branch(subtree2.branch)
rev3 = subtree.commit('merge from subdir2')
rev3_tree = subtree.basis_tree()
+ rev3_tree.lock_read()
+ self.addCleanup(rev3_tree.unlock)
repo = tree.branch.repository
repo.fetch(subtree.branch.repository, rev3)
@@ -345,6 +351,8 @@
subtree = self.make_branch_and_tree('subdir')
rev1 = subtree.commit('commit in subdir')
rev1_tree = subtree.basis_tree()
+ rev1_tree.lock_read()
+ self.addCleanup(rev1_tree.unlock)
tree.branch.pull(subtree.branch)
@@ -368,8 +376,12 @@
subtree = self.make_branch_and_tree('subdir')
rev1 = subtree.commit('commit in subdir')
rev1_tree = subtree.basis_tree()
+ rev1_tree.lock_read()
+ self.addCleanup(rev1_tree.unlock)
rev2 = subtree.commit('second commit in subdir', allow_pointless=True)
rev2_tree = subtree.basis_tree()
+ rev2_tree.lock_read()
+ self.addCleanup(rev2_tree.unlock)
tree.branch.pull(subtree.branch)
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-02-16 06:02:39 +0000
+++ b/bzrlib/workingtree_4.py 2007-02-16 06:44:26 +0000
@@ -213,26 +213,27 @@
current_row = state._root_row
current_id = current_row[0][3].decode('utf8')
inv = Inventory(root_id=current_id)
- rows.next()
# we could do this straight out of the dirstate; it might be fast
# and should be profiled - RBC 20070216
parent_ids = {'' : inv.root.file_id}
- for line in rows:
- dirname, name, kind, fileid_utf8, size, stat, link_or_sha1 = line[0]
- if dirname == '/':
- # not in this revision tree.
+ for block in state._dirblocks:
+ # block of unversioned files, skip.
+ if block[0] == '/':
continue
- parent_id = parent_ids[dirname]
- file_id = fileid_utf8.decode('utf8')
- entry = entry_factory[kind](file_id, name.decode('utf8'), parent_id)
- if kind == 'file':
- #entry.executable = executable
- #entry.text_size = size
- #entry.text_sha1 = sha1
- pass
- elif kind == 'directory':
- parent_ids[(dirname + '/' + name).strip('/')] = file_id
- inv.add(entry)
+ dirname = block[0]
+ parent_id = parent_ids[block[0]]
+ for line in block[1]:
+ _, name, kind, fileid_utf8, size, stat, link_or_sha1 = line[0]
+ file_id = fileid_utf8.decode('utf8')
+ entry = entry_factory[kind](file_id, name.decode('utf8'), parent_id)
+ if kind == 'file':
+ #entry.executable = executable
+ #entry.text_size = size
+ #entry.text_sha1 = sha1
+ pass
+ elif kind == 'directory':
+ parent_ids[(dirname + '/' + name).strip('/')] = file_id
+ inv.add(entry)
self._inventory = inv
def get_file_sha1(self, file_id, path=None, stat_value=None):
@@ -825,6 +826,7 @@
parent_rows = iter(sorted(parent_rows, key=lambda x:x[0][2:3]))
root_row = parent_rows.next()
inv = Inventory(root_id=root_row[1], revision_id=self._revision_id)
+ inv.root.revision = root_row[1][parent_index][0].decode('utf8')
# we could do this straight out of the dirstate; it might be fast
# and should be profiled - RBC 20070216
parent_ids = {'' : inv.root.file_id}
More information about the bazaar-commits
mailing list