def _parse(self, diff, encoding):
current_file = None
diff = enumerate(diff, 1)
for unused_diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
# check for source file header
is_source_filename = RE_SOURCE_FILENAME.match(line)
if is_source_filename:
source_file = is_source_filename.group('filename')
source_timestamp = is_source_filename.group('timestamp')
# reset current file
current_file = None
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
if current_file is not None:
raise UnidiffParseError('Target without source: %s' % line)
target_file = is_target_filename.group('filename')
target_timestamp = is_target_filename.group('timestamp')
# add current file to PatchSet
current_file = PatchedFile(source_file, target_file,
source_timestamp, target_timestamp)
self.append(current_file)
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding)
def _parse(self, diff, encoding):
current_file = None
for line in diff:
if encoding is not None:
line = line.decode(encoding)
# check for source file header
is_source_filename = RE_SOURCE_FILENAME.match(line)
if is_source_filename:
source_file = is_source_filename.group('filename')
source_timestamp = is_source_filename.group('timestamp')
# reset current file
current_file = None
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
if current_file is not None:
raise UnidiffParseError('Target without source: %s' % line)
target_file = is_target_filename.group('filename')
target_timestamp = is_target_filename.group('timestamp')
# add current file to PatchSet
current_file = PatchedFile(source_file, target_file,
source_timestamp, target_timestamp)
self.append(current_file)
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding)
def _parse(self, diff, encoding):
current_file = None
diff = enumerate(diff, 1)
for unused_diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
# check for source file header
is_source_filename = RE_SOURCE_FILENAME.match(line)
if is_source_filename:
source_file = is_source_filename.group('filename')
source_timestamp = is_source_filename.group('timestamp')
if source_file is None:
source_file = is_source_filename.group('renamefile')
# reset current file
current_file = None
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
is_renamed = False
if current_file is not None:
raise UnidiffParseError('Target without source: %s' % line)
target_file = is_target_filename.group('filename')
if target_file is None:
target_file = is_target_filename.group('renamefile')
is_renamed = True
target_timestamp = is_target_filename.group('timestamp')
# add current file to PatchSet
current_file = PatchedFile(source_file, target_file,
source_timestamp, target_timestamp,
is_renamed)
self.append(current_file)
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding)
# detect moved files
for patched_file in self:
if patched_file.is_added_file:
file_name = os.path.basename(patched_file.path)
compared_files = [compared_file for compared_file in self.removed_files \
if os.path.basename(compared_file.path) == file_name and \
patched_file.added_lines_content.strip() == compared_file.removed_lines_content.strip()]
if compared_files:
compared_files[0].is_moved_file = True
patched_file.is_moved_file = True
patched_file.moved_from_path = compared_files[0].path
patched_file.moved_to_path = patched_file.path
compared_files[0].moved_from_path = compared_files[0].path
compared_files[0].moved_to_path = patched_file.path
def _parse(self, diff, encoding):
current_file = None
patch_info = None
diff = enumerate(diff, 1)
for unused_diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
# check for source file header
is_source_filename = RE_SOURCE_FILENAME.match(line)
if is_source_filename:
source_file = is_source_filename.group('filename')
source_timestamp = is_source_filename.group('timestamp')
# reset current file
current_file = None
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
if current_file is not None:
raise UnidiffParseError('Target without source: %s' % line)
target_file = is_target_filename.group('filename')
target_timestamp = is_target_filename.group('timestamp')
# add current file to PatchSet
current_file = PatchedFile(patch_info, source_file,
target_file, source_timestamp,
target_timestamp)
self.append(current_file)
patch_info = None
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding)
continue
# check for no newline marker
is_no_newline = RE_NO_NEWLINE_MARKER.match(line)
if is_no_newline:
if current_file is None:
raise UnidiffParseError('Unexpected marker: %s' % line)
current_file._add_no_newline_marker_to_last_hunk()
continue
# sometimes hunks can be followed by empty lines
if line == '\n' and current_file is not None:
current_file._append_trailing_empty_line()
continue
# if nothing has matched above then this line is a patch info
if patch_info is None:
current_file = None
patch_info = PatchInfo()
patch_info.append(line)
def _parse(self, diff, encoding):
current_file = None
patch_info = None
diff = enumerate(diff, 1)
for unused_diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
# check for source file header
is_source_filename = RE_SOURCE_FILENAME.match(line)
if is_source_filename:
source_file = is_source_filename.group('filename')
source_timestamp = is_source_filename.group('timestamp')
# reset current file
current_file = None
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
if current_file is not None:
raise UnidiffParseError('Target without source: %s' % line)
target_file = is_target_filename.group('filename')
target_timestamp = is_target_filename.group('timestamp')
# add current file to PatchSet
current_file = PatchedFile(
patch_info, source_file, target_file,
source_timestamp, target_timestamp)
self.append(current_file)
patch_info = None
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding)
continue
# check for no newline marker
is_no_newline = RE_NO_NEWLINE_MARKER.match(line)
if is_no_newline:
if current_file is None:
raise UnidiffParseError('Unexpected marker: %s' % line)
current_file._add_no_newline_marker_to_last_hunk()
continue
# sometimes hunks can be followed by empty lines
if line == '\n' and current_file is not None:
current_file._append_trailing_empty_line()
continue
# if nothing has matched above then this line is a patch info
if patch_info is None:
current_file = None
patch_info = PatchInfo()
patch_info.append(line)
def _parse(self, diff, encoding):
current_file = None
diff = enumerate(diff, 1)
for unused_diff_line_no, line in diff:
if encoding is not None:#don't care - stuff about non utf-8 files
line = line.decode(encoding)
# check for source file header
is_source_filename = RE_SOURCE_FILENAME.match(line)
if is_source_filename:
source_file = is_source_filename.group('filename')
source_timestamp = is_source_filename.group('timestamp')
if source_file is None:#must be the other side of regex triggered
source_file = is_source_filename.group('renamefile')
# reset current file
current_file = None
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
is_renamed = False
if current_file is not None:
raise UnidiffParseError('Target without source: %s' % line)
target_file = is_target_filename.group('filename')
if target_file is None:
target_file = is_target_filename.group('renamefile')
is_renamed = True
target_timestamp = is_target_filename.group('timestamp')
# add current file to PatchSet
current_file = PatchedFile(source_file, target_file,
source_timestamp, target_timestamp, is_renamed)
self.append(current_file)
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding)
# check for no newline marker
is_no_newline = RE_NO_NEWLINE_MARKER.match(line)
if is_no_newline:
if current_file is None:
raise UnidiffParseError('Unexpected marker: %s' % line)
current_file._add_no_newline_marker_to_last_hunk()
def _parse(self, diff, encoding):
current_file = None
diff = enumerate(diff, 1)
for unused_diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
# check for source file header
is_source_filename = RE_SOURCE_FILENAME.match(line)
if is_source_filename:
source_file = is_source_filename.group('filename')
source_timestamp = is_source_filename.group('timestamp')
# reset current file
current_file = None
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
if current_file is not None:
raise UnidiffParseError('Target without source: %s' % line)
target_file = is_target_filename.group('filename')
target_timestamp = is_target_filename.group('timestamp')
# add current file to PatchSet
current_file = PatchedFile(source_file, target_file,
source_timestamp, target_timestamp)
self.append(current_file)
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding)
# check for no newline marker
is_no_newline = RE_NO_NEWLINE_MARKER.match(line)
if is_no_newline:
if current_file is None:
raise UnidiffParseError('Unexpected marker: %s' % line)
current_file._add_no_newline_marker_to_last_hunk()
def _parse(self, diff, encoding, metadata_only):
current_file = None
patch_info = None
diff = enumerate(diff, 1)
for unused_diff_line_no, line in diff:
if encoding is not None:
line = line.decode(encoding)
# check for a git rename, source file
is_rename_source_filename = RE_RENAME_SOURCE_FILENAME.match(line)
if is_rename_source_filename:
# prefix with 'a/' to match expected git source format
source_file = ('a/' +
is_rename_source_filename.group('filename'))
# keep line as patch_info
patch_info.append(line)
# reset current file
current_file = None
continue
# check for a git rename, target file
is_rename_target_filename = RE_RENAME_TARGET_FILENAME.match(line)
if is_rename_target_filename:
if current_file is not None:
raise UnidiffParseError('Target without source: %s' % line)
# prefix with 'b/' to match expected git source format
target_file = ('b/' +
is_rename_target_filename.group('filename'))
# keep line as patch_info
patch_info.append(line)
# add current file to PatchSet
current_file = PatchedFile(patch_info,
source_file,
target_file,
None,
None,
is_rename=True)
self.append(current_file)
continue
# check for source file header
is_source_filename = RE_SOURCE_FILENAME.match(line)
if is_source_filename:
source_file = is_source_filename.group('filename')
source_timestamp = is_source_filename.group('timestamp')
# reset current file, unless we are processing a rename
# (in that case, source files should match)
if current_file is not None and not (
current_file.is_rename
and current_file.source_file == source_file):
current_file = None
continue
# check for target file header
is_target_filename = RE_TARGET_FILENAME.match(line)
if is_target_filename:
if current_file is not None and not current_file.is_rename:
raise UnidiffParseError('Target without source: %s' % line)
target_file = is_target_filename.group('filename')
target_timestamp = is_target_filename.group('timestamp')
if current_file is None:
# add current file to PatchSet
current_file = PatchedFile(patch_info, source_file,
target_file, source_timestamp,
target_timestamp)
self.append(current_file)
patch_info = None
continue
# check for hunk header
is_hunk_header = RE_HUNK_HEADER.match(line)
if is_hunk_header:
if current_file is None:
raise UnidiffParseError('Unexpected hunk found: %s' % line)
current_file._parse_hunk(line, diff, encoding, metadata_only)
continue
# check for no newline marker
is_no_newline = RE_NO_NEWLINE_MARKER.match(line)
if is_no_newline:
if current_file is None:
raise UnidiffParseError('Unexpected marker: %s' % line)
current_file._add_no_newline_marker_to_last_hunk()
continue
# sometimes hunks can be followed by empty lines
if line == '\n' and current_file is not None:
current_file._append_trailing_empty_line()
continue
is_binary_diff = RE_BINARY_DIFF.match(line)
if is_binary_diff:
source_file = is_binary_diff.group('source_filename')
target_file = is_binary_diff.group('target_filename')
patch_info.append(line)
current_file = PatchedFile(patch_info,
source_file,
target_file,
is_binary_file=True)
self.append(current_file)
patch_info = None
current_file = None
continue
# if nothing has matched above then this line is a patch info
if patch_info is None:
current_file = None
patch_info = PatchInfo()
patch_info.append(line)