Rev 2486: Add test showing reverts UI working as Aaron intended it to. in http://bazaar.launchpad.net/~bzr/bzr/dirstate

[Robert Collins]

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

------------------------------------------------------------
revno: 2486
revision-id: robertc at robertcollins.net-20070306214551-ayvx2ziz2hgbkqm0
parent: robertc at robertcollins.net-20070306134733-gx8sio7eqnhfi3zn
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.dogfood
timestamp: Wed 2007-03-07 08:45:51 +1100
message:
  Add test showing reverts UI working as Aaron intended it to.
modified:
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
=== modified file 'bzrlib/delta.py'
--- a/bzrlib/delta.py	2007-03-05 03:10:21 +0000
+++ b/bzrlib/delta.py	2007-03-06 21:45:51 +0000
@@ -346,6 +346,10 @@
             if kind[0] is not None:
                 old_path += osutils.kind_marker(kind[0])
             old_path += " => "
+        elif versioned == 'removed':
+            # not present in target
+            old_path = ""
+            path = paths[0]
         else:
             old_path = ""
             path = paths[1]

=== modified file 'bzrlib/tests/blackbox/test_revert.py'
--- a/bzrlib/tests/blackbox/test_revert.py	2007-03-05 01:15:25 +0000
+++ b/bzrlib/tests/blackbox/test_revert.py	2007-03-06 21:45:51 +0000
@@ -164,3 +164,25 @@
         os.chdir('revertdir')
         self.run_bzr('revert')
         os.chdir('..')
+
+    def test_revert_newly_added(self):
+        # this tests the UI reports reverting a newly added file
+        # correct (such files are not deleted)
+        tree = self.make_branch_and_tree('.')
+        self.build_tree(['file'])
+        tree.add(['file'])
+        out, err = self.run_bzr('revert')
+        self.assertEqual('', out)
+        self.assertEqual('-   file\n', err)
+
+    def test_revert_removing_file(self):
+        # this tests the UI reports reverting a file which has been committed
+        # to a revision that did not have it, reports it as being deleted.
+        tree = self.make_branch_and_tree('.')
+        tree.commit('empty commit')
+        self.build_tree(['file'])
+        tree.add(['file'])
+        tree.commit('add file')
+        out, err = self.run_bzr('revert', '-r', '-2')
+        self.assertEqual('', out)
+        self.assertEqual('-D  file\n', err)