/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/blackbox/test_rmbranch.py

  • Committer: Jelmer Vernooij
  • Date: 2018-11-16 23:15:15 UTC
  • mfrom: (7180 work)
  • mto: This revision was merged to the branch mainline in revision 7183.
  • Revision ID: jelmer@jelmer.uk-20181116231515-zqd2yn6kj8lfydyp
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_rmbranch.py
42
42
        # Remove a local branch.
43
43
        tree = self.example_tree('a')
44
44
        self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
45
 
            'rmbranch a')
 
45
                           'rmbranch a')
46
46
        self.run_bzr('rmbranch --force a')
47
47
        dir = controldir.ControlDir.open('a')
48
48
        self.assertFalse(dir.has_branch())
66
66
        # location argument defaults to current directory
67
67
        self.example_tree('a')
68
68
        self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
69
 
            'rmbranch a')
 
69
                           'rmbranch a')
70
70
        self.run_bzr('rmbranch --force', working_dir='a')
71
71
        dir = controldir.ControlDir.open('a')
72
72
        self.assertFalse(dir.has_branch())
76
76
        tree = self.example_tree('a')
77
77
        tree.controldir.create_branch(name="otherbranch")
78
78
        self.assertTrue(tree.controldir.has_branch('otherbranch'))
79
 
        self.run_bzr('rmbranch %s,branch=otherbranch' % tree.controldir.user_url)
 
79
        self.run_bzr('rmbranch %s,branch=otherbranch' %
 
80
                     tree.controldir.user_url)
80
81
        dir = controldir.ControlDir.open('a')
81
82
        self.assertFalse(dir.has_branch('otherbranch'))
82
83
        self.assertTrue(dir.has_branch())
97
98
        branch = dir.create_branch('otherbranch')
98
99
        branch.create_checkout('a')
99
100
        self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
100
 
            'rmbranch otherbranch -d %s' % branch.controldir.user_url)
 
101
                           'rmbranch otherbranch -d %s' % branch.controldir.user_url)
101
102
        self.assertTrue(dir.has_branch('otherbranch'))
102
 
        self.run_bzr('rmbranch --force otherbranch -d %s' % branch.controldir.user_url)
 
103
        self.run_bzr('rmbranch --force otherbranch -d %s' %
 
104
                     branch.controldir.user_url)
103
105
        self.assertFalse(dir.has_branch('otherbranch'))
104
106
 
105
107