/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 bzrlib/tests/test_missing.py

  • Committer: Marius Kruger
  • Date: 2009-01-01 23:21:07 UTC
  • mto: (3969.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3970.
  • Revision ID: amanic@gmail.com-20090101232107-poye5hxejqgqq0sg
* _filter_revs can now handle None and len=3 revs
* fix up the rest of the white box tests

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_missing.py
156
156
        self.addCleanup(tree.unlock)
157
157
        self.assertUnmerged([], [], tree.branch, tree.branch)
158
158
        self.assertUnmerged([], [], tree.branch, tree.branch,
159
 
            revid_range=(rev1, rev1))
 
159
            local_revid_range=(rev1, rev1))
160
160
 
161
161
    def test_one_ahead(self):
162
162
        tree = self.make_branch_and_tree('tree')
187
187
 
188
188
        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch)
189
189
        self.assertUnmerged([('2', rev4)], [], tree.branch, tree2.branch,
190
 
            revid_range=(rev4, rev4))
 
190
            local_revid_range=(rev4, rev4))
191
191
        self.assertUnmerged([], [], tree.branch, tree2.branch,
192
 
            revid_range=(rev1, rev1))
 
192
            local_revid_range=(rev1, rev1))
193
193
 
194
194
    def test_include_merges(self):
195
195
        tree = self.make_branch_and_tree('tree')
221
221
                            include_merges=True,
222
222
                            backward=True)
223
223
 
224
 
        rev7 = tree2.commit('seven', rev_id='rev7')
225
 
        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3',0 ),
226
 
                                 ('4', 'rev6', 0),
227
 
                                 ('3.1.1', 'rev4', 1), ('3.1.2', 'rev5', 1),
228
 
                                 # rev7 is after rev6
229
 
                                 # and is not touched by the merge.
230
 
                                 ],
231
 
                            tree.branch, tree2.branch, 'all',
232
 
                            include_merges=True, revid_range=(rev6, rev6))
 
224
        self.assertUnmerged([], [('4', 'rev6', 0)],
 
225
            tree.branch, tree2.branch, 'all',
 
226
            include_merges=True, remote_revid_range=(rev6, rev6))
 
227
 
 
228
        self.assertUnmerged([], [('3', 'rev3',0 ), ('3.1.1', 'rev4', 1)],
 
229
                    tree.branch, tree2.branch, 'all',
 
230
                    include_merges=True, remote_revid_range=(rev3, rev4))
 
231
 
 
232
        self.assertUnmerged([], [('4', 'rev6', 0),('3.1.2', 'rev5', 1)],
 
233
                    tree.branch, tree2.branch, 'all',
 
234
                    include_merges=True, remote_revid_range=(rev5, rev6))
233
235
 
234
236
    def test_revision_range(self):
235
237
        local = self.make_branch_and_tree('local')