##// END OF EJS Templates
diff parser: match the header order of hg diff --git patches...
Mads Kiilerich -
r3817:631e8000 beta
parent child Browse files
Show More
@@ -172,11 +172,11 b' class DiffProcessor(object):'
172 _hg_header_re = re.compile(r"""
172 _hg_header_re = re.compile(r"""
173 #^diff[ ]--git
173 #^diff[ ]--git
174 [ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
174 [ ]a/(?P<a_path>.+?)[ ]b/(?P<b_path>.+?)\n
175 (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
176 ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
175 (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%(?:\n|$))?
177 (?:^similarity[ ]index[ ](?P<similarity_index>\d+)%(?:\n|$))?
176 (?:^rename[ ]from[ ](?P<rename_from>\S+)\n
178 (?:^rename[ ]from[ ](?P<rename_from>\S+)\n
177 ^rename[ ]to[ ](?P<rename_to>\S+)(?:\n|$))?
179 ^rename[ ]to[ ](?P<rename_to>\S+)(?:\n|$))?
178 (?:^old[ ]mode[ ](?P<old_mode>\d+)\n
179 ^new[ ]mode[ ](?P<new_mode>\d+)(?:\n|$))?
180 (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
180 (?:^new[ ]file[ ]mode[ ](?P<new_file_mode>.+)(?:\n|$))?
181 (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
181 (?:^deleted[ ]file[ ]mode[ ](?P<deleted_file_mode>.+)(?:\n|$))?
182 (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
182 (?:^index[ ](?P<a_blob_id>[0-9A-Fa-f]+)
General Comments 0
You need to be logged in to leave comments. Login now