Skip to content

Fix diff patch parsing #412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 19, 2016
Merged

Fix diff patch parsing #412

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e77128e
Make diff patch parsing more reliable
nvie Apr 14, 2016
55d40df
Update changelog
nvie Apr 14, 2016
cdf7c5a
Fix regex
nvie Apr 14, 2016
2090b54
Make test stricter
nvie Apr 15, 2016
1445b59
Fix order of regex parts
nvie Apr 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Fix order of regex parts 
When both old/new mode and rename from/to lines are found, they will
appear in different order.
  • Loading branch information
@nvie
nvie committed Apr 19, 2016
commit 1445b59bb41c4b1a94b7cb0ec6864c98de63814b
7 changes: 4 additions & 3 deletions git/diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,11 +199,11 @@ class Diff(object):
re_header = re.compile(r"""
^diff[ ]--git
[ ](?:a/)?(?P<a_path_fallback>.+?)[ ](?:b/)?(?P<b_path_fallback>.+?)\n
(?:^old[ ]mode[ ](?P<old_mode>\d+)\n
^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
(?:^similarity[ ]index[ ]\d+%\n
^rename[ ]from[ ](?P<rename_from>.*)\n
^rename[ ]to[ ](?P<rename_to>.*)(?:\n|$))?
(?:^old[ ]mode[ ](?P<old_mode>\d+)\n
^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
(?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
(?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
(?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
Expand Down Expand Up @@ -331,8 +331,9 @@ def _index_from_patch_format(cls, repo, stream):
previous_header = None
for header in cls.re_header.finditer(text):
a_path_fallback, b_path_fallback, \
old_mode, new_mode, \
rename_from, rename_to, \
old_mode, new_mode, new_file_mode, deleted_file_mode, \
new_file_mode, deleted_file_mode, \
a_blob_id, b_blob_id, b_mode, \
a_path, b_path = header.groups()
new_file, deleted_file = bool(new_file_mode), bool(deleted_file_mode)
Expand Down