(mergerepo: Repository)
| 51 | |
| 52 | |
| 53 | def test_merge_analysis_uptodate(mergerepo: Repository) -> None: |
| 54 | branch_head_hex = '5ebeeebb320790caf276b9fc8b24546d63316533' |
| 55 | branch_id = mergerepo[branch_head_hex].id |
| 56 | |
| 57 | analysis, preference = mergerepo.merge_analysis(branch_id) |
| 58 | assert analysis & MergeAnalysis.UP_TO_DATE |
| 59 | assert not analysis & MergeAnalysis.FASTFORWARD |
| 60 | assert {} == mergerepo.status() |
| 61 | |
| 62 | analysis, preference = mergerepo.merge_analysis(branch_id, 'refs/heads/ff-branch') |
| 63 | assert analysis & MergeAnalysis.UP_TO_DATE |
| 64 | assert not analysis & MergeAnalysis.FASTFORWARD |
| 65 | assert {} == mergerepo.status() |
| 66 | |
| 67 | |
| 68 | def test_merge_analysis_fastforward(mergerepo: Repository) -> None: |
nothing calls this directly
no test coverage detected
searching dependent graphs…