/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/tests/test_uncommit.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_uncommit.py
51
51
        # The file should not be removed
52
52
        self.assertPathExists('tree/two')
53
53
        # And it should still be listed as added
54
 
        self.assertTrue(tree.is_versioned('two'))
 
54
        self.assertIsNot(None, tree.path2id('two'))
55
55
 
56
56
    def test_uncommit_bound(self):
57
57
        tree, history = self.make_linear_tree()
58
 
        child = tree.controldir.sprout('child').open_workingtree()
 
58
        child = tree.bzrdir.sprout('child').open_workingtree()
59
59
        child.branch.bind(tree.branch)
60
60
 
61
61
        self.assertEqual(history[1], tree.last_revision())
74
74
 
75
75
    def test_uncommit_bound_local(self):
76
76
        tree, history = self.make_linear_tree()
77
 
        child = tree.controldir.sprout('child').open_workingtree()
 
77
        child = tree.bzrdir.sprout('child').open_workingtree()
78
78
        child.branch.bind(tree.branch)
79
79
 
80
80
        self.assertEqual(history[1], tree.last_revision())
95
95
 
96
96
        # If this tree isn't bound, local=True raises an exception
97
97
        self.assertRaises(errors.LocalRequiresBoundBranch,
98
 
                          uncommit.uncommit, tree.branch, tree=tree,
99
 
                          local=True)
 
98
            uncommit.uncommit, tree.branch, tree=tree, local=True)
100
99
 
101
100
    def test_uncommit_remove_tags(self):
102
101
        tree, history = self.make_linear_tree()
113
112
 
114
113
    def test_uncommit_remove_tags_keeps_pending_merges(self):
115
114
        tree, history = self.make_linear_tree()
116
 
        copy = tree.controldir.sprout('copyoftree').open_workingtree()
117
 
        copy.commit(message='merged', rev_id=b'merged')
 
115
        copy = tree.bzrdir.sprout('copyoftree').open_workingtree()
 
116
        copy.commit(message='merged', rev_id='merged')
118
117
        tree.merge_from_branch(copy.branch)
119
 
        tree.branch.tags.set_tag('pointsatmerged', b'merged')
 
118
        tree.branch.tags.set_tag('pointsatmerged', 'merged')
120
119
        history.append(tree.commit('merge'))
121
 
        self.assertEqual(
122
 
            b'merged', tree.branch.tags.lookup_tag('pointsatmerged'))
 
120
        self.assertEqual('merged', tree.branch.tags.lookup_tag('pointsatmerged'))
123
121
        self.assertEqual(history[2], tree.last_revision())
124
122
        self.assertEqual((3, history[2]), tree.branch.last_revision_info())
125
123
        tree.branch.tags.set_tag(u"pointsatexisting", history[1])
127
125
        uncommit.uncommit(tree.branch, tree=tree)
128
126
        self.assertEqual(history[1], tree.last_revision())
129
127
        self.assertEqual((2, history[1]), tree.branch.last_revision_info())
130
 
        self.assertEqual([history[1], b'merged'], tree.get_parent_ids())
 
128
        self.assertEqual([history[1], 'merged'], tree.get_parent_ids())
131
129
        self.assertEqual({
132
130
            "pointsatexisting": history[1],
133
 
            "pointsatmerged": b'merged',
 
131
            "pointsatmerged": 'merged',
134
132
            }, tree.branch.tags.get_tag_dict())
135
133
 
136
134
    def test_uncommit_keep_tags(self):