← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_pull.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_pull.py
18
18
 
19
19
from bzrlib import (
20
20
    branch,
21
 
    bzrdir,
 
21
    controldir,
22
22
    errors,
23
23
    memorytree,
24
24
    revision,
42
42
        parent.merge_from_branch(mine.branch)
43
43
        parent.commit('merge my change', rev_id='P2')
44
44
        mine.pull(parent.branch)
45
 
        self.assertEqual(['P1', 'P2'], mine.branch.revision_history())
 
45
        self.assertEqual('P2', mine.branch.last_revision())
46
46
 
47
47
    def test_pull_merged_indirect(self):
48
48
        # it should be possible to do a pull from one branch into another
59
59
        parent.merge_from_branch(other.branch)
60
60
        parent.commit('merge other', rev_id='P2')
61
61
        mine.pull(parent.branch)
62
 
        self.assertEqual(['P1', 'P2'], mine.branch.revision_history())
 
62
        self.assertEqual('P2', mine.branch.last_revision())
63
63
 
64
64
    def test_pull_updates_checkout_and_master(self):
65
65
        """Pulling into a checkout updates the checkout and the master branch"""
71
71
        rev2 = other.commit('other commit')
72
72
        # now pull, which should update both checkout and master.
73
73
        checkout.branch.pull(other.branch)
74
 
        self.assertEqual([rev1, rev2], checkout.branch.revision_history())
75
 
        self.assertEqual([rev1, rev2], master_tree.branch.revision_history())
 
74
        self.assertEqual(rev2, checkout.branch.last_revision())
 
75
        self.assertEqual(rev2, master_tree.branch.last_revision())
76
76
 
77
77
    def test_pull_local_updates_checkout_only(self):
78
78
        """Pulling --local into a checkout updates the checkout and not the
85
85
        rev2 = other.commit('other commit')
86
86
        # now pull local, which should update checkout but not master.
87
87
        checkout.branch.pull(other.branch, local = True)
88
 
        self.assertEqual([rev1, rev2], checkout.branch.revision_history())
89
 
        self.assertEqual([rev1], master_tree.branch.revision_history())
 
88
        self.assertEqual(rev2, checkout.branch.last_revision())
 
89
        self.assertEqual(rev1, master_tree.branch.last_revision())
90
90
 
91
91
    def test_pull_local_raises_LocalRequiresBoundBranch_on_unbound(self):
92
92
        """Pulling --local into a branch that is not bound should fail."""
98
98
        # now pull --local, which should raise LocalRequiresBoundBranch error.
99
99
        self.assertRaises(errors.LocalRequiresBoundBranch,
100
100
                          master_tree.branch.pull, other.branch, local = True)
101
 
        self.assertEqual([rev1], master_tree.branch.revision_history())
 
101
        self.assertEqual(rev1, master_tree.branch.last_revision())
102
102
 
103
103
    def test_pull_returns_result(self):
104
104
        parent = self.make_branch_and_tree('parent')
128
128
                          tree_a.branch.pull, tree_b.branch,
129
129
                          overwrite=False, stop_revision='rev2b')
130
130
        # It should not have updated the branch tip, but it should have fetched
131
 
        # the revision
 
131
        # the revision if the repository supports "invisible" revisions
132
132
        self.assertEqual('rev2a', tree_a.branch.last_revision())
133
 
        self.assertTrue(tree_a.branch.repository.has_revision('rev2b'))
 
133
        if tree_a.branch.repository._format.supports_unreferenced_revisions:
 
134
            self.assertTrue(tree_a.branch.repository.has_revision('rev2b'))
134
135
        tree_a.branch.pull(tree_b.branch, overwrite=True,
135
136
                           stop_revision='rev2b')
136
137
        self.assertEqual('rev2b', tree_a.branch.last_revision())
137
 
        self.assertEqual(tree_b.branch.revision_history(),
138
 
                         tree_a.branch.revision_history())
 
138
        self.assertEqual(tree_b.branch.last_revision(),
 
139
                         tree_a.branch.last_revision())
139
140
 
140
141
    def test_pull_merges_and_fetches_tags(self):
141
142
        """Tags are updated by br.pull(source), and revisions named in those
154
155
        except errors.TagsNotSupported:
155
156
            raise TestNotApplicable('format does not support tags.')
156
157
        source.tags.set_tag('tag-a', 'rev-2')
157
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
158
        source.get_config_stack().set('branch.fetch_tags', True)
158
159
        target.pull(source)
159
160
        # The tag is present, and so is its revision.
160
161
        self.assertEqual('rev-2', target.tags.lookup_tag('tag-a'))
176
177
            source.tags.set_tag('tag-a', 'rev-2')
177
178
        except errors.TagsNotSupported:
178
179
            raise TestNotApplicable('format does not support tags.')
179
 
        source.get_config().set_user_option('branch.fetch_tags', 'True')
 
180
        source.get_config_stack().set('branch.fetch_tags', True)
180
181
        target.pull(source, 'rev-2-again')
181
182
        # The tag is present, and so is its revision.
182
183
        self.assertEqual('rev-2', target.tags.lookup_tag('tag-a'))
237
238
            # remotebranches can't be bound.  Let's instead make a new local
238
239
            # branch of the default type, which does allow binding.
239
240
            # See https://bugs.launchpad.net/bzr/+bug/112020
240
 
            local = bzrdir.BzrDir.create_branch_convenience('local2')
 
241
            local = controldir.ControlDir.create_branch_convenience('local2')
241
242
            local.bind(target)
242
243
        source = self.make_branch('source')
243
244
        branch.Branch.hooks.install_named_hook(