def test_mergePreviewFromBranches(self):
# mergePreviewFromBranches generates the correct diff.
bmp, source_rev_id, target_rev_id = self.createExampleMerge()
source_branch = bmp.source_branch.getBzrBranch()
target_branch = bmp.target_branch.getBzrBranch()
diff, conflicts = Diff.mergePreviewFromBranches(
source_branch, source_rev_id, target_branch)
transaction.commit()
self.checkExampleMerge(diff.text)
def test_mergePreviewWithPrerequisite(self):
# Changes introduced in the prerequisite branch are ignored.
(source_bzr, source_rev_id, target_bzr, prerequisite_bzr,
prerequisite) = self.preparePrerequisiteMerge()
diff, conflicts = Diff.mergePreviewFromBranches(
source_bzr, source_rev_id, target_bzr, prerequisite_bzr)
transaction.commit()
self.assertIn('+source text\n', diff.text)
self.assertNotIn('+prerequisite text\n', diff.text)
def test_mergePreviewWithNewerPrerequisite(self):
# If the prerequisite branch has unmerged revisions, they do not
# affect the diff.
(source_bzr, source_rev_id, target_bzr, prerequisite_bzr,
prerequisite) = self.preparePrerequisiteMerge()
commit_file(prerequisite, 'file', b'prerequisite text2\n')
diff, conflicts = Diff.mergePreviewFromBranches(
source_bzr, source_rev_id, target_bzr, prerequisite_bzr)
transaction.commit()
self.assertNotIn('-prerequisite text2\n', diff.text)
self.assertIn('+source text\n', diff.text)
self.assertNotIn('+prerequisite text\n', diff.text)
def test_mergePreviewWithNewerPrerequisite(self):
# If the prerequisite branch has unmerged revisions, they do not
# affect the diff.
(source_bzr, source_rev_id, target_bzr, prerequisite_bzr,
prerequisite) = self.preparePrerequisiteMerge()
commit_file(
prerequisite, 'file', 'prerequisite text2\n')
diff, conflicts = Diff.mergePreviewFromBranches(
source_bzr, source_rev_id, target_bzr, prerequisite_bzr)
transaction.commit()
self.assertNotIn('-prerequisite text2\n', diff.text)
self.assertIn('+source text\n', diff.text)
self.assertNotIn('+prerequisite text\n', diff.text)
