def test_from_mergeable(self):
this, other = self.prepare_for_merging()
md = merge_directive.MergeDirective2.from_objects(other.branch.repository, "rev3", 0, 0, "this")
other.lock_read()
self.addCleanup(other.unlock)
merger, verified = Merger.from_mergeable(this, md, None)
md.patch = None
merger, verified = Merger.from_mergeable(this, md, None)
self.assertEqual("inapplicable", verified)
self.assertEqual("rev3", merger.other_rev_id)
self.assertEqual("rev1", merger.base_rev_id)
md.base_revision_id = "rev2b"
merger, verified = Merger.from_mergeable(this, md, None)
self.assertEqual("rev2b", merger.base_rev_id)
def test_from_mergeable(self):
this, other = self.prepare_for_merging()
md = merge_directive.MergeDirective2.from_objects(
other.branch.repository, 'rev3', 0, 0, 'this')
other.lock_read()
self.addCleanup(other.unlock)
merger, verified = Merger.from_mergeable(this, md, None)
md.patch = None
merger, verified = Merger.from_mergeable(this, md, None)
self.assertEqual('inapplicable', verified)
self.assertEqual('rev3', merger.other_rev_id)
self.assertEqual('rev1', merger.base_rev_id)
md.base_revision_id = 'rev2b'
merger, verified = Merger.from_mergeable(this, md, None)
self.assertEqual('rev2b', merger.base_rev_id)
def test_from_mergeable_old_merge_directive(self):
this, other = self.prepare_for_merging()
other.lock_write()
self.addCleanup(other.unlock)
md = merge_directive.MergeDirective.from_objects(other.branch.repository, "rev3", 0, 0, "this")
merger, verified = Merger.from_mergeable(this, md, None)
self.assertEqual("rev3", merger.other_rev_id)
self.assertEqual("rev1", merger.base_rev_id)
def test_from_mergeable_old_merge_directive(self):
this, other = self.prepare_for_merging()
other.lock_write()
self.addCleanup(other.unlock)
md = merge_directive.MergeDirective.from_objects(
other.branch.repository, 'rev3', 0, 0, 'this')
merger, verified = Merger.from_mergeable(this, md, None)
self.assertEqual('rev3', merger.other_rev_id)
self.assertEqual('rev1', merger.base_rev_id)
def test_from_mergeable(self):
this, other = self.prepare_for_merging()
md = merge_directive.MergeDirective2.from_objects(
other.branch.repository, 'rev3', 0, 0, 'this')
other.lock_read()
self.addCleanup(other.unlock)
merger, verified = Merger.from_mergeable(this, md,
progress.DummyProgress())
md.patch = None
merger, verified = Merger.from_mergeable(this, md,
progress.DummyProgress())
self.assertEqual('inapplicable', verified)
self.assertEqual('rev3', merger.other_rev_id)
self.assertEqual('rev1', merger.base_rev_id)
md.base_revision_id = 'rev2b'
merger, verified = Merger.from_mergeable(this, md,
progress.DummyProgress())
self.assertEqual('rev2b', merger.base_rev_id)
def test_from_mergeable_old_merge_directive(self):
this, other = self.prepare_for_merging()
other.lock_write()
self.addCleanup(other.unlock)
md = merge_directive.MergeDirective.from_objects(
other.branch.repository, 'rev3', 0, 0, 'this')
merger, verified = Merger.from_mergeable(this, md,
progress.DummyProgress())
self.assertEqual('rev3', merger.other_rev_id)
self.assertEqual('rev1', merger.base_rev_id)
