()
| 249 | |
| 250 | |
| 251 | def test_merge_options() -> None: |
| 252 | favor = MergeFavor.OURS |
| 253 | flags: int | MergeFlag = MergeFlag.FIND_RENAMES | MergeFlag.FAIL_ON_CONFLICT |
| 254 | file_flags: int | MergeFileFlag = ( |
| 255 | MergeFileFlag.IGNORE_WHITESPACE | MergeFileFlag.DIFF_PATIENCE |
| 256 | ) |
| 257 | o1 = pygit2.Repository._merge_options( |
| 258 | favor=favor, flags=flags, file_flags=file_flags |
| 259 | ) |
| 260 | assert favor == o1.file_favor |
| 261 | assert flags == o1.flags |
| 262 | assert file_flags == o1.file_flags |
| 263 | |
| 264 | favor = MergeFavor.THEIRS |
| 265 | flags = 0 |
| 266 | file_flags = 0 |
| 267 | o1 = pygit2.Repository._merge_options( |
| 268 | favor=favor, flags=flags, file_flags=file_flags |
| 269 | ) |
| 270 | assert favor == o1.file_favor |
| 271 | assert flags == o1.flags |
| 272 | assert file_flags == o1.file_flags |
| 273 | |
| 274 | favor = MergeFavor.UNION |
| 275 | flags = MergeFlag.FIND_RENAMES | MergeFlag.NO_RECURSIVE |
| 276 | file_flags = ( |
| 277 | MergeFileFlag.STYLE_DIFF3 |
| 278 | | MergeFileFlag.IGNORE_WHITESPACE |
| 279 | | MergeFileFlag.DIFF_PATIENCE |
| 280 | ) |
| 281 | o1 = pygit2.Repository._merge_options( |
| 282 | favor=favor, flags=flags, file_flags=file_flags |
| 283 | ) |
| 284 | assert favor == o1.file_favor |
| 285 | assert flags == o1.flags |
| 286 | assert file_flags == o1.file_flags |
| 287 | |
| 288 | |
| 289 | def test_merge_many(mergerepo: Repository) -> None: |
nothing calls this directly
no test coverage detected
searching dependent graphs…