← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_uncommit.py

  • Committer: Martin Pool
  • Date: 2010-02-25 06:17:27 UTC
  • mfrom: (5055 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5057.
  • Revision ID: mbp@sourcefrog.net-20100225061727-4sd9lt0qmdc6087t
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_uncommit.py
49
49
        self.assertEqual((1, history[0]), tree.branch.last_revision_info())
50
50
 
51
51
        # The file should not be removed
52
 
        self.assertPathExists('tree/two')
 
52
        self.failUnlessExists('tree/two')
53
53
        # And it should still be listed as added
54
54
        self.assertIsNot(None, tree.path2id('two'))
55
55
 
96
96
        # If this tree isn't bound, local=True raises an exception
97
97
        self.assertRaises(errors.LocalRequiresBoundBranch,
98
98
            uncommit.uncommit, tree.branch, tree=tree, local=True)
99
 
 
100
 
    def test_uncommit_remove_tags(self):
101
 
        tree, history = self.make_linear_tree()
102
 
        self.assertEqual(history[1], tree.last_revision())
103
 
        self.assertEqual((2, history[1]), tree.branch.last_revision_info())
104
 
        tree.branch.tags.set_tag(u"pointsatexisting", history[0])
105
 
        tree.branch.tags.set_tag(u"pointsatremoved", history[1])
106
 
        uncommit.uncommit(tree.branch, tree=tree)
107
 
        self.assertEqual(history[0], tree.last_revision())
108
 
        self.assertEqual((1, history[0]), tree.branch.last_revision_info())
109
 
        self.assertEqual({
110
 
            "pointsatexisting": history[0]
111
 
            }, tree.branch.tags.get_tag_dict())
112
 
 
113
 
    def test_uncommit_keep_tags(self):
114
 
        tree, history = self.make_linear_tree()
115
 
        self.assertEqual(history[1], tree.last_revision())
116
 
        self.assertEqual((2, history[1]), tree.branch.last_revision_info())
117
 
        tree.branch.tags.set_tag(u"pointsatexisting", history[0])
118
 
        tree.branch.tags.set_tag(u"pointsatremoved", history[1])
119
 
        uncommit.uncommit(tree.branch, tree=tree, keep_tags=True)
120
 
        self.assertEqual(history[0], tree.last_revision())
121
 
        self.assertEqual((1, history[0]), tree.branch.last_revision_info())
122
 
        self.assertEqual({
123
 
            "pointsatexisting": history[0],
124
 
            "pointsatremoved": history[1],
125
 
            }, tree.branch.tags.get_tag_dict())