Commitf9e7a3d

committed

fix(util): Handle 'Finding sources' messages in RemoteProgress

When running a long running operation (such as a clone on a large repo),Git may return a message indicating that it is 'Finding sources'. Sincethere is no bit field value for this message, this causes a large amountof error messages to be emitted to stderr.This patch fixes this by adding another bit field value for thismessage, FINDING_SOURCES. Derived classes can look for this op_code andhandle it appropriately.

1 parente129846 commitf9e7a3dCopy full SHA for f9e7a3d

File tree

1 file changed

-1

lines changed

git
- util.py

1 file changed

-1

lines changed

`‎git/util.py‎`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ class RemoteProgress(object):`
`165`	`165`	`and git-fetch and to dispatch callbacks allowing subclasses to react to the progress.`
`166`	`166`	`"""`
`167`	`167`	`_num_op_codes=7`
`168`		`-BEGIN,END,COUNTING,COMPRESSING,WRITING,RECEIVING,RESOLVING= [1<<xforxinrange(_num_op_codes)]`
	`168`	`+BEGIN,END,COUNTING,COMPRESSING,WRITING,RECEIVING,RESOLVING,FINDING_SOURCES= [1<<xforxinrange(_num_op_codes)]`
`169`	`169`	`STAGE_MASK=BEGIN\|END`
`170`	`170`	`OP_MASK=~STAGE_MASK`
`171`	`171`
`@@ -227,6 +227,8 @@ def _parse_progress_line(self, line):`
`227`	`227`	`op_code\|=self.RECEIVING`
`228`	`228`	`elifop_name=='Resolving deltas':`
`229`	`229`	`op_code\|=self.RESOLVING`
	`230`	`+elifop_name=='Finding sources':`
	`231`	`+op_code\|=self.FINDING_SOURCES`
`230`	`232`	`else:`
`231`	`233`	`# Note: On windows it can happen that partial lines are sent`
`232`	`234`	`# Hence we get something like "CompreReceiving objects", which is`

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!

Commitf9e7a3d

File tree

1 file changed

1 file changed

`‎git/util.py‎`

0 commit comments