Skip to content

Add option to prepend line numbers to Line #8

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

Open
darkdread wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add option to prepend line numbers to Line #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 22 additions & 6 deletions unidiff/patch.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,11 @@ def is_removed(self) -> bool:
def is_context(self) -> bool:
return self.line_type == LINE_TYPE_CONTEXT

def prepend_line_number(self) -> str:
if self.target_line_no or self.source_line_no:
return "%d %s%s" % (self.target_line_no or self.source_line_no, self.line_type, self.value)
return str(self)


class PatchInfo(list):
"""Lines with extended patch info.
Expand Down Expand Up @@ -151,13 +156,19 @@ def __repr__(self) -> str:
return str(value)

def __str__(self) -> str:
content = ''.join(str(line) for line in self)
return self.head + content

@property
def head(self) -> str:
# section header is optional and thus we output it only if it's present
head = "@@ -%d,%d +%d,%d @@%s\n" % (
return "@@ -%d,%d +%d,%d @@%s\n" % (
self.source_start, self.source_length,
self.target_start, self.target_length,
' ' + self.section_header if self.section_header else '')
content = ''.join(str(line) for line in self)
return head + content

def prepend_line_number(self) -> str:
return self.head + ''.join(line.prepend_line_number() for line in self)

def append(self, line: Line) -> None:
"""Append the line to hunk, and keep track of source/target lines."""
Expand Down Expand Up @@ -215,6 +226,7 @@ def __init__(
source_timestamp: Optional[str] = None,
target_timestamp: Optional[str] = None,
is_binary_file: bool = False,
prepend_line_number: bool = False
) -> None:
super(PatchedFile, self).__init__()
self.patch_info = patch_info
Expand All @@ -223,6 +235,7 @@ def __init__(
self.target_file = target
self.target_timestamp = target_timestamp
self.is_binary_file = is_binary_file
self.prepend_line_number = prepend_line_number

def __repr__(self) -> str:
return str("<PatchedFile: %s>") % str(self.path)
Expand All @@ -239,7 +252,7 @@ def __str__(self) -> str:
target = "+++ %s%s\n" % (
self.target_file,
'\t' + self.target_timestamp if self.target_timestamp else '')
hunks = ''.join(str(hunk) for hunk in self)
hunks = ''.join(hunk.prepend_line_number() if self.prepend_line_number else str(hunk) for hunk in self)
return info + source + target + hunks

def _parse_hunk(
Expand Down Expand Up @@ -435,7 +448,8 @@ def __init__(
self,
f: Union[StringIO, str],
encoding: Optional[str] = None,
metadata_only: bool = False
metadata_only: bool = False,
prepend_line_number: bool = False
) -> None:
super(PatchSet, self).__init__()

Expand All @@ -453,6 +467,7 @@ def __init__(
data, # type: ignore
encoding=encoding,
metadata_only=metadata_only,
prepend_line_number=prepend_line_number
)

def __repr__(self) -> str:
Expand All @@ -466,6 +481,7 @@ def _parse(
diff: Iterator[str],
encoding: Optional[str],
metadata_only: bool,
prepend_line_number: bool,
) -> None:
current_file = None
patch_info = None
Expand All @@ -484,7 +500,7 @@ def _parse(
source_file = is_diff_git_header.group('source')
target_file = is_diff_git_header.group('target')
current_file = PatchedFile(
patch_info, source_file, target_file, None, None)
patch_info, source_file, target_file, None, None, prepend_line_number=prepend_line_number)
self.append(current_file)
patch_info.append(line)
continue
Expand Down