Rev 2477: Fix blackbox test_mv usage of inventory, and the errors raised by workingtree4.move - though that should be made into a workingtree conformance test. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

At http://bazaar.launchpad.net/~bzr/bzr/dirstate

------------------------------------------------------------
revno: 2477
revision-id: robertc at robertcollins.net-20070301093426-yavn95x00rpc5nyb
parent: robertc at robertcollins.net-20070301085003-1k4kx7hxz8ce5x8p
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Thu 2007-03-01 20:34:26 +1100
message:
  Fix blackbox test_mv usage of inventory, and the errors raised by workingtree4.move - though that should be made into a workingtree conformance test.
modified:
  bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/tests/blackbox/test_mv.py'
--- a/bzrlib/tests/blackbox/test_mv.py	2007-01-20 01:44:46 +0000
+++ b/bzrlib/tests/blackbox/test_mv.py	2007-03-01 09:34:26 +0000
@@ -111,8 +111,6 @@
         self.run_bzr('mv', 'hello.txt', 'sub2')
         self.assertMoved('hello.txt','sub2/hello.txt')
 
-        tree.read_working_inventory()
-
         self.build_tree(['sub1/'])
         tree.add(['sub1'])
         self.run_bzr('mv', 'sub2/hello.txt', 'sub1')
@@ -129,7 +127,6 @@
         os.chdir('sub1/sub2')
         self.run_bzr('mv', '../hello.txt', '.')
         self.failUnlessExists('./hello.txt')
-        tree.read_working_inventory()
 
         os.chdir('..')
         self.run_bzr('mv', 'sub2/hello.txt', '.')

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-03-01 08:01:14 +0000
+++ b/bzrlib/workingtree_4.py	2007-03-01 09:34:26 +0000
@@ -469,7 +469,7 @@
             state._get_block_entry_index(to_entry_dirname, to_basename, 0)
         if not entry_present:
             raise errors.BzrMoveFailedError('', to_dir,
-                errors.NotInWorkingDirectory(to_dir))
+                errors.NotVersionedError(to_dir))
         to_entry = state._dirblocks[to_entry_block_index][1][to_entry_entry_index]
         # get a handle on the block itself.
         to_block_index = state._ensure_block(