Skip to content

Remove control character stripping. #926

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 3 commits into from
Sep 30, 2019
Merged

Remove control character stripping. #926

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1fe5bd0
Remove control character stripping.
uri-canva Sep 28, 2019
b43a3ed
Update util.py
uri-canva Sep 30, 2019
7a5de47
Update util.py
uri-canva Sep 30, 2019
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
12 changes: 2 additions & 10 deletions git/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,6 +364,7 @@ class RemoteProgress(object):
'_seen_ops',
'error_lines', # Lines that started with 'error:' or 'fatal:'.
'other_lines') # Lines not denoting progress (i.e.g. push-infos).
re_ansi_escape = re.compile(r'\x1B[@-_][0-?]*[ -/]*[@-~]')
re_op_absolute = re.compile(r"(remote: )?([\w\s]+):\s+()(\d+)()(.*)")
re_op_relative = re.compile(r"(remote: )?([\w\s]+):\s+(\d+)% \((\d+)/(\d+)\)(.*)")

Expand Down Expand Up @@ -392,16 +393,7 @@ def _parse_progress_line(self, line):

# find escape characters and cut them away - regex will not work with
# them as they are non-ascii. As git might expect a tty, it will send them
last_valid_index = None
for i, c in enumerate(reversed(line)):
if ord(c) < 32:
# its a slice index
last_valid_index = -i - 1
# END character was non-ascii
# END for each character in line
if last_valid_index is not None:
line = line[:last_valid_index]
# END cut away invalid part
line = self.re_ansi_escape.sub('', line)
line = line.rstrip()

cur_count, max_count = None, None
Expand Down