(merge_msg: bytes)
| 102 | |
| 103 | |
| 104 | def parse_merge_msg_for_conflicts(merge_msg: bytes) -> list[str]: |
| 105 | # Conflicted files start with tabs |
| 106 | return [ |
| 107 | line.lstrip(b'#').strip().decode() |
| 108 | for line in merge_msg.splitlines() |
| 109 | # '#\t' for git 2.4.1 |
| 110 | if line.startswith((b'\t', b'#\t')) |
| 111 | ] |
| 112 | |
| 113 | |
| 114 | def get_conflicted_files() -> set[str]: |
no outgoing calls
no test coverage detected