Rev 5637: Handle --force flags and propmting the user for what they might really want. in http://bazaar.launchpad.net/~jameinel/bzr/2.4-reset-checkout
John Arbash Meinel
john at arbash-meinel.com
Tue Jan 25 23:21:50 UTC 2011
At http://bazaar.launchpad.net/~jameinel/bzr/2.4-reset-checkout
------------------------------------------------------------
revno: 5637
revision-id: john at arbash-meinel.com-20110125232146-axecjegxo7xwc79y
parent: john at arbash-meinel.com-20110125225408-w5b5mmh117q4jjz1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 2.4-reset-checkout
timestamp: Tue 2011-01-25 17:21:46 -0600
message:
Handle --force flags and propmting the user for what they might really want.
-------------- next part --------------
=== modified file 'bzrlib/builtins.py'
--- a/bzrlib/builtins.py 2011-01-24 21:26:40 +0000
+++ b/bzrlib/builtins.py 2011-01-25 23:21:46 +0000
@@ -498,11 +498,41 @@
that, you can supply --revision to force the state of the tree.
"""
- takes_options = ['revision']
+ takes_options = ['revision', 'directory',
+ Option('force',
+ help='Reset the tree even if it doesn\'t appear to be'
+ ' corrupted.'),
+ ]
hidden = True
- def run(self, revision=None):
- pass
+ def run(self, revision=None, directory='.', force=False):
+ tree, _ = WorkingTree.open_containing(directory)
+ self.add_cleanup(tree.lock_tree_write().unlock)
+ if not force:
+ try:
+ tree.check_state()
+ except errors.BzrError:
+ pass # There seems to be a real error here, so we'll reset
+ else:
+ # Refuse
+ raise errors.BzrCommandError(
+ 'The tree does not appear to be corrupt. You probably'
+ ' want "bzr revert" instead. Use "--force" if you are'
+ ' sure you want to reset the working tree.')
+ if revision is None:
+ revision_ids = None
+ else:
+ revision_ids = [r.as_revision_id(tree.branch) for r in revision]
+ try:
+ tree.reset_state(revision_ids)
+ except errors.BzrError, e:
+ if revision_ids is None:
+ extra = (', the header appears corrupt, try passing -r -1'
+ ' to set the state to the last commit')
+ else:
+ extra = ''
+ raise errors.BzrCommandError('failed to reset the tree state'
+ + extra)
class cmd_revno(Command):
=== modified file 'bzrlib/tests/blackbox/test_reset_workingtree.py'
--- a/bzrlib/tests/blackbox/test_reset_workingtree.py 2011-01-24 22:57:04 +0000
+++ b/bzrlib/tests/blackbox/test_reset_workingtree.py 2011-01-25 23:21:46 +0000
@@ -21,39 +21,77 @@
from bzrlib.tests import TestCaseWithTransport
-def _get_dirstate_path(tree):
- """Get the path to the dirstate file."""
- # This is a bit ugly, but the alternative was hard-coding the path
- tree.lock_read()
- try:
- ds = tree.current_dirstate()
- return ds._filename
- finally:
- tree.unlock()
-
-
class TestResetWorkingTree(TestCaseWithTransport):
- def test_reset_noop(self):
- tree = self.make_branch_and_tree('tree')
- self.build_tree(['tree/foo', 'tree/dir/', 'tree/dir/bar'])
- tree.add(['foo', 'dir', 'dir/bar'])
- tree.commit('first')
- self.run_bzr('reset-workingtree')
-
- def test_reset_broken_dirstate(self):
- tree = self.make_branch_and_tree('tree')
+ def break_dirstate(self, tree, completely=False):
+ """Write garbage into the dirstate file."""
# This test assumes that the format uses a DirState file, which we then
# manually corrupt. If we change the way to get at that dirstate file,
# then we can update how this is done
self.assertIsNot(None, getattr(tree, 'current_dirstate', None))
- path = _get_dirstate_path(tree)
- f = open(path, 'ab')
- try:
- f.write('broken-trailing-garbage\n')
+ tree.lock_read()
+ try:
+ dirstate = tree.current_dirstate()
+ dirstate_path = dirstate._filename
+ self.failUnlessExists(dirstate_path)
+ finally:
+ tree.unlock()
+ # We have to have the tree unlocked at this point, so we can safely
+ # mutate the state file on all platforms.
+ if completely:
+ f = open(dirstate_path, 'wb')
+ else:
+ f = open(dirstate_path, 'ab')
+ try:
+ f.write('garbage-at-end-of-file\n')
finally:
f.close()
- self.run_bzr('reset-workingtree')
+
+ def make_initial_tree(self):
+ tree = self.make_branch_and_tree('tree')
+ self.build_tree(['tree/foo', 'tree/dir/', 'tree/dir/bar'])
+ tree.add(['foo', 'dir', 'dir/bar'])
+ tree.commit('first')
+ return tree
+
+ def test_reset_refuses_uncorrupted(self):
+ tree = self.make_initial_tree()
+ # If the tree doesn't appear to be corrupt, we refuse, but prompt the
+ # user to let them know that:
+ # a) they may want to use 'bzr revert' instead of reset-workingtree
+ # b) they can use --force if they really want to do this
+ self.run_bzr_error(['The tree does not appear to be corrupt',
+ '"bzr revert"',
+ '--force'],
+ 'reset-workingtree -d tree')
+
+ def test_reset_forced(self):
+ tree = self.make_initial_tree()
+ tree.rename_one('dir', 'alt_dir')
+ self.assertIsNot(None, tree.path2id('alt_dir'))
+ self.run_bzr('reset-workingtree -d tree --force')
+ # This requires the tree has reloaded the working state
+ self.assertIs(None, tree.path2id('alt_dir'))
+ self.failUnlessExists('tree/alt_dir')
+
+ def test_reset_corrupted_dirstate(self):
+ tree = self.make_initial_tree()
+ self.break_dirstate(tree)
+ self.run_bzr('reset-workingtree -d tree')
+ tree = workingtree.WorkingTree.open('tree')
+ # At this point, check should be happy
+ tree.check_state()
+
+ def test_reset_naive_destroyed_fails(self):
+ tree = self.make_initial_tree()
+ self.break_dirstate(tree, completely=True)
+ self.run_bzr_error(['the header appears corrupt, try passing'],
+ 'reset-workingtree -d tree')
+
+ def test_reset_destroyed_with_revs_passes(self):
+ tree = self.make_initial_tree()
+ self.break_dirstate(tree, completely=True)
+ self.run_bzr('reset-workingtree -d tree -r -1')
tree = workingtree.WorkingTree.open('tree')
# At this point, check should be happy
tree.check_state()
=== modified file 'bzrlib/tests/per_workingtree/test_check_state.py'
--- a/bzrlib/tests/per_workingtree/test_check_state.py 2011-01-25 22:54:08 +0000
+++ b/bzrlib/tests/per_workingtree/test_check_state.py 2011-01-25 23:21:46 +0000
@@ -93,9 +93,11 @@
def test_reset_state_handles_corrupted_dirstate(self):
tree = self.make_initial_tree()
+ rev_id = tree.last_revision()
self.break_dirstate(tree)
tree.reset_state()
tree.check_state()
+ self.assertEqual(rev_id, tree.last_revision())
def test_reset_state_handles_destroyed_dirstate(self):
# If you pass the revision_id, we can handle a completely destroyed
@@ -105,3 +107,4 @@
self.break_dirstate(tree, completely=True)
tree.reset_state(revision_ids=[rev_id])
tree.check_state()
+ self.assertEqual(rev_id, tree.last_revision())
=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py 2011-01-25 22:54:08 +0000
+++ b/bzrlib/workingtree_4.py 2011-01-25 23:21:46 +0000
@@ -1309,7 +1309,7 @@
else:
trees = zip(revision_ids,
self.branch.repository.revision_trees(revision_ids))
- base_tree = trees.pop(0)[1]
+ base_tree = trees[0][1]
state = self.current_dirstate()
# We don't support ghosts yet
state.set_state_from_scratch(base_tree.inventory, trees, [])
More information about the bazaar-commits
mailing list