Commit 5da34fd
add support for parsing rename info to the diff parser
Currently the parsed headers are just ignored but I'll add them to the Diff object in a future commit
(cherry picked from commit 711b655f29b42821c51be8e592143c7db31ed140)1 parent 753e908 commit 5da34fd
1 file changed
Lines changed: 7 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -39,8 +39,11 @@ def list_from_string(cls, repo, text): | |||
| 39 | 39 | diff_header = re.compile(r""" | |
| 40 | 40 | #^diff[ ]--git | |
| 41 | 41 | [ ]a/(?P<a_path>\S+)[ ]b/(?P<b_path>\S+)\n | |
| 42 | - (?:^old[ ]mode[ ](?P<old_mode>\d+)(?:\n|$))? | ||
| 43 | - (?:^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))? | ||
| 42 | + (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%\n | ||
| 43 | + ^rename[ ]from[ ](?P<rename_from>\S+)\n | ||
| 44 | + ^rename[ ]to[ ](?P<rename_to>\S+)(?:\n|$))? | ||
| 45 | + (?:^old[ ]mode[ ](?P<old_mode>\d+)\n | ||
| 46 | + ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))? | ||
| 44 | 47 | (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))? | |
| 45 | 48 | (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))? | |
| 46 | 49 | (?:^index[ ](?P<a_commit>[0-9A-Fa-f]+) | |
@@ -50,7 +53,8 @@ def list_from_string(cls, repo, text): | |||
| 50 | 53 | for diff in ('\n' + text).split('\ndiff --git')[1:]: | |
| 51 | 54 | header = diff_header(diff) | |
| 52 | 55 | ||
| 53 | - a_path, b_path, old_mode, new_mode, new_file_mode, deleted_file_mode, \ | ||
| 56 | + a_path, b_path, similarity_index, rename_from, rename_to, \ | ||
| 57 | + old_mode, new_mode, new_file_mode, deleted_file_mode, \ | ||
| 54 | 58 | a_commit, b_commit, b_mode = header.groups() | |
| 55 | 59 | new_file, deleted_file = bool(new_file_mode), bool(deleted_file_mode) | |
| 56 | 60 | ||
0 commit comments