/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: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_uncommit.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2011, 2016 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
"""Test uncommit."""
18
18
 
19
19
 
20
 
from bzrlib import (
 
20
from .. import (
21
21
    errors,
22
22
    tests,
23
23
    uncommit,
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.assertIsNot(None, tree.path2id('two'))
 
54
        self.assertTrue(tree.is_versioned('two'))
55
55
 
56
56
    def test_uncommit_bound(self):
57
57
        tree, history = self.make_linear_tree()
58
 
        child = tree.bzrdir.sprout('child').open_workingtree()
 
58
        child = tree.controldir.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.bzrdir.sprout('child').open_workingtree()
 
77
        child = tree.controldir.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, local=True)
 
98
                          uncommit.uncommit, tree.branch, tree=tree,
 
99
                          local=True)
99
100
 
100
101
    def test_uncommit_remove_tags(self):
101
102
        tree, history = self.make_linear_tree()
112
113
 
113
114
    def test_uncommit_remove_tags_keeps_pending_merges(self):
114
115
        tree, history = self.make_linear_tree()
115
 
        copy = tree.bzrdir.sprout('copyoftree').open_workingtree()
116
 
        copy.commit(message='merged', rev_id='merged')
 
116
        copy = tree.controldir.sprout('copyoftree').open_workingtree()
 
117
        copy.commit(message='merged', rev_id=b'merged')
117
118
        tree.merge_from_branch(copy.branch)
118
 
        tree.branch.tags.set_tag('pointsatmerged', 'merged')
 
119
        tree.branch.tags.set_tag('pointsatmerged', b'merged')
119
120
        history.append(tree.commit('merge'))
120
 
        self.assertEquals('merged', tree.branch.tags.lookup_tag('pointsatmerged'))
 
121
        self.assertEqual(
 
122
            b'merged', tree.branch.tags.lookup_tag('pointsatmerged'))
121
123
        self.assertEqual(history[2], tree.last_revision())
122
124
        self.assertEqual((3, history[2]), tree.branch.last_revision_info())
123
125
        tree.branch.tags.set_tag(u"pointsatexisting", history[1])
125
127
        uncommit.uncommit(tree.branch, tree=tree)
126
128
        self.assertEqual(history[1], tree.last_revision())
127
129
        self.assertEqual((2, history[1]), tree.branch.last_revision_info())
128
 
        self.assertEquals([history[1], 'merged'], tree.get_parent_ids())
 
130
        self.assertEqual([history[1], b'merged'], tree.get_parent_ids())
129
131
        self.assertEqual({
130
132
            "pointsatexisting": history[1],
131
 
            "pointsatmerged": 'merged',
 
133
            "pointsatmerged": b'merged',
132
134
            }, tree.branch.tags.get_tag_dict())
133
135
 
134
136
    def test_uncommit_keep_tags(self):