← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_missing.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
134
134
class TestFindUnmerged(tests.TestCaseWithTransport):
135
135
 
136
136
    def assertUnmerged(self, local, remote, local_branch, remote_branch,
137
 
            restrict='all', include_merges=False, backward=False,
 
137
            restrict='all', include_merged=False, backward=False,
138
138
            local_revid_range=None, remote_revid_range=None):
139
139
        """Check the output of find_unmerged_mainline_revisions"""
140
140
        local_extra, remote_extra = missing.find_unmerged(
141
141
            local_branch, remote_branch, restrict,
142
 
            include_merges=include_merges, backward=backward,
 
142
            include_merged=include_merged, backward=backward,
143
143
            local_revid_range=local_revid_range,
144
144
            remote_revid_range=remote_revid_range)
145
145
        self.assertEqual(local, local_extra)
187
187
        self.assertUnmerged([], [], tree.branch, tree2.branch,
188
188
            local_revid_range=(rev1, rev1))
189
189
 
190
 
    def test_include_merges(self):
 
190
    def test_include_merged(self):
191
191
        tree = self.make_branch_and_tree('tree')
192
192
        rev1 = tree.commit('one', rev_id='rev1')
193
193
 
207
207
                                 ('3.1.1', 'rev4', 1), ('3.1.2', 'rev5', 1),
208
208
                                 ],
209
209
                            tree.branch, tree2.branch,
210
 
                            include_merges=True)
 
210
                            include_merged=True)
211
211
 
212
212
        self.assertUnmerged([], [('4', 'rev6', 0),
213
213
                                 ('3.1.2', 'rev5', 1), ('3.1.1', 'rev4', 1),
214
214
                                 ('3', 'rev3', 0), ('2', 'rev2', 0),
215
215
                                 ],
216
216
                            tree.branch, tree2.branch,
217
 
                            include_merges=True,
 
217
                            include_merged=True,
218
218
                            backward=True)
219
219
 
220
220
        self.assertUnmerged([], [('4', 'rev6', 0)],
221
221
            tree.branch, tree2.branch,
222
 
            include_merges=True, remote_revid_range=(rev6, rev6))
 
222
            include_merged=True, remote_revid_range=(rev6, rev6))
223
223
 
224
224
        self.assertUnmerged([], [('3', 'rev3', 0), ('3.1.1', 'rev4', 1)],
225
225
                    tree.branch, tree2.branch,
226
 
                    include_merges=True, remote_revid_range=(rev3, rev4))
 
226
                    include_merged=True, remote_revid_range=(rev3, rev4))
227
227
 
228
228
        self.assertUnmerged([], [('4', 'rev6', 0), ('3.1.2', 'rev5', 1)],
229
229
                    tree.branch, tree2.branch,
230
 
                    include_merges=True, remote_revid_range=(rev5, rev6))
 
230
                    include_merged=True, remote_revid_range=(rev5, rev6))
231
231
 
232
232
    def test_revision_range(self):
233
233
        local = self.make_branch_and_tree('local')