Rev 2447: WorkingTree.unversion() should not raise if unversioning a child and a parent. in http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate
John Arbash Meinel
john at arbash-meinel.com
Thu Mar 1 01:57:33 GMT 2007
At http://bazaar.launchpad.net/%7Ebzr/bzr/dirstate
------------------------------------------------------------
revno: 2447
revision-id: john at arbash-meinel.com-20070301015628-3qy7ndtsui6ya4ix
parent: robertc at robertcollins.net-20070301015005-ydqud90417giqbhg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate
timestamp: Wed 2007-02-28 19:56:28 -0600
message:
WorkingTree.unversion() should not raise if unversioning a child and a parent.
Also switch all calls to os.path.join() over to osutils.pathjoin() for correctness
on win32.
modified:
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
-------------- next part --------------
=== modified file 'bzrlib/tests/workingtree_implementations/test_unversion.py'
--- a/bzrlib/tests/workingtree_implementations/test_unversion.py 2007-02-14 09:52:22 +0000
+++ b/bzrlib/tests/workingtree_implementations/test_unversion.py 2007-03-01 01:56:28 +0000
@@ -60,7 +60,7 @@
self.assertTrue(tree.has_filename('b'))
self.assertTrue(tree.has_filename('c'))
tree.unlock()
-
+
def test_unversion_subtree(self):
"""Unversioning the root of a subtree unversions the entire subtree."""
tree = self.make_branch_and_tree('.')
@@ -76,3 +76,26 @@
self.assertTrue(tree.has_filename('a/b'))
self.assertTrue(tree.has_filename('c'))
tree.unlock()
+
+ def test_unversion_subtree_and_children(self):
+ """Passing a child id will raise NoSuchId.
+
+ This is because the parent directory will have already been removed.
+ """
+ tree = self.make_branch_and_tree('.')
+ self.build_tree(['a/', 'a/b', 'a/c', 'd'])
+ tree.add(['a', 'a/b', 'a/c', 'd'], ['a-id', 'b-id', 'c-id', 'd-id'])
+ tree.lock_write()
+ try:
+ tree.unversion(['b-id', 'a-id'])
+ self.assertFalse(tree.has_id('a-id'))
+ self.assertFalse(tree.has_id('b-id'))
+ self.assertFalse(tree.has_id('c-id'))
+ self.assertTrue(tree.has_id('d-id'))
+ # The files are still on disk
+ self.assertTrue(tree.has_filename('a'))
+ self.assertTrue(tree.has_filename('a/b'))
+ self.assertTrue(tree.has_filename('a/c'))
+ self.assertTrue(tree.has_filename('d'))
+ finally:
+ tree.unlock()
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2007-03-01 00:47:45 +0000
+++ b/bzrlib/workingtree_4.py 2007-03-01 01:56:28 +0000
@@ -351,7 +351,7 @@
# TODO:
# if row stat is valid, use cached sha1, else, get a new sha1.
if path is None:
- path = os.path.join(*key[0:2]).decode('utf8')
+ path = pathjoin(key[0], key[1]).decode('utf8')
return self._hashcache.get_sha1(path, stat_value)
def _get_inventory(self):
@@ -958,7 +958,6 @@
# I haven't written the code to unversion / yet - it should be
# supported.
raise errors.BzrError('Unversioning the / is not currently supported')
- details_length = len(state._dirblocks[0][1][0][1])
block_index = 0
while block_index < len(state._dirblocks):
# process one directory at a time.
@@ -980,6 +979,8 @@
# just forget the whole block.
entry_index = 0
while entry_index < len(block[1]):
+ # Mark this file id as having been removed
+ ids_to_unversion.discard(block[1][entry_index][0][2])
if not state._make_absent(block[1][entry_index]):
entry_index += 1
# go to the next block. (At the moment we dont delete empty
@@ -996,7 +997,7 @@
entry_index += 1
continue
if entry[1][0][0] == 'd':
- paths_to_unversion.add(os.path.join(*entry[0][0:2]))
+ paths_to_unversion.add(pathjoin(entry[0][0], entry[0][1]))
if not state._make_absent(entry):
entry_index += 1
# we have unversioned this id
@@ -1570,7 +1571,7 @@
# as well.
old_path = source_details[1]
old_dirname, old_basename = os.path.split(old_path)
- path = os.path.join(entry[0][0], entry[0][1])
+ path = pathjoin(entry[0][0], entry[0][1])
old_entry = state._get_entry(source_index,
path_utf8=old_path)
# update the source details variable to be the real
@@ -1580,10 +1581,10 @@
else:
old_dirname = entry[0][0]
old_basename = entry[0][1]
- old_path = path = os.path.join(old_dirname, old_basename)
+ old_path = path = pathjoin(old_dirname, old_basename)
if path_info is None:
# the file is missing on disk, show as removed.
- old_path = os.path.join(entry[0][0], entry[0][1])
+ old_path = pathjoin(entry[0][0], entry[0][1])
content_change = True
target_kind = None
target_exec = False
@@ -1666,7 +1667,7 @@
elif source_minikind in 'a' and target_minikind in 'fdl':
# looks like a new file
if path_info is not None:
- path = os.path.join(*entry[0][0:2])
+ path = pathjoin(entry[0][0], entry[0][1])
# parent id is the entry for the path in the target tree
# TODO: these are the same for an entire directory: cache em.
parent_id = state._get_entry(target_index, path_utf8=entry[0][0])[0][2]
@@ -1692,7 +1693,7 @@
# if its still on disk, *and* theres no other entry at this
# path [we dont know this in this routine at the moment -
# perhaps we should change this - then it would be an unknown.
- old_path = os.path.join(*entry[0][0:2])
+ old_path = pathjoin(entry[0][0], entry[0][1])
# parent id is the entry for the path in the target tree
parent_id = state._get_entry(source_index, path_utf8=entry[0][0])[0][2]
if parent_id == entry[0][2]:
More information about the bazaar-commits
mailing list