/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_revision.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-10 18:39:27 UTC
  • mfrom: (6653.6.7 rename-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170610183927-8yn4wmsk1ki92xc3
Rename ``bzrdir`` attribute to ``controldir``.

Merged from https://code.launchpad.net/~jelmer/brz/rename-controldir/+merge/325433

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_revision.py
62
62
    tree1.commit("Commit two", rev_id="a@u-0-1")
63
63
    tree1.commit("Commit three", rev_id="a@u-0-2")
64
64
 
65
 
    tree2 = tree1.bzrdir.sprout("branch2").open_workingtree()
 
65
    tree2 = tree1.controldir.sprout("branch2").open_workingtree()
66
66
    br2 = tree2.branch
67
67
    tree2.commit("Commit four", rev_id="b@u-0-3")
68
68
    tree2.commit("Commit five", rev_id="b@u-0-4")
132
132
    def setUp(self):
133
133
        TestCaseWithTransport.setUp(self)
134
134
        self.br1, self.br2 = make_branches(self)
135
 
        wt1 = self.br1.bzrdir.open_workingtree()
136
 
        wt2 = self.br2.bzrdir.open_workingtree()
 
135
        wt1 = self.br1.controldir.open_workingtree()
 
136
        wt2 = self.br2.controldir.open_workingtree()
137
137
        wt2.commit("Commit eleven", rev_id="b@u-0-7")
138
138
        wt2.commit("Commit twelve", rev_id="b@u-0-8")
139
139
        wt2.commit("Commit thirtteen", rev_id="b@u-0-9")