Commit963bbd7

committed

Made remote line parsing more stable. On windows it can be that we encounter partial or intermixed lines from the pipe. This really shouldn't be, but its windows so it happens

1 parent4bf372d commit963bbd7Copy full SHA for 963bbd7

File tree

1 file changed

+12

-1

lines changed

git/db/cmd
- base.py

1 file changed

+12

-1

lines changed

`‎git/db/cmd/base.py`

Lines changed: 12 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,18 @@ def _parse_progress_line(self, line):`
`226`	`226`	`elifop_name=="Resolving deltas":`
`227`	`227`	`op_code\|=self.RESOLVING`
`228`	`228`	`else:`
`229`		`-raiseValueError("Operation name %r unknown"%op_name)`
	`229`	`+# Note: On windows it can happen that partial lines are sent`
	`230`	`+# Hence we get something like "CompreReceiving objects", which is`
	`231`	`+# a blend of "Compressing objects" and "Receiving objects".`
	`232`	`+# This can't really be prevented, so we drop the line verbosely`
	`233`	`+# to make sure we get informed in case the process spits out new`
	`234`	`+# commands at some point.`
	`235`	`+self.line_dropped(sline)`
	`236`	`+sys.stderr.write("Operation name %r unknown - skipping line '%s'"% (op_name,sline))`
	`237`	`+# Note: Don't add this line to the failed lines, as we have to silently`
	`238`	`+# drop it`
	`239`	`+returnfailed_lines`
	`240`	`+#END handle opcode`
`230`	`241`
`231`	`242`	`# figure out stage`
`232`	`243`	`ifop_codenotinself._seen_ops:`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit963bbd7

File tree

1 file changed

1 file changed

`‎git/db/cmd/base.py`

0 commit comments