Commit8c6d952

committed

Merge branch 'matt-jordan-remote_source'

2 parentse129846 +abd23a3 commit8c6d952Copy full SHA for 8c6d952

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -94,7 +94,7 @@ def test_init_repo_object(self, rw_dir):`
`94`	`94`	`# [11-test_init_repo_object]`
`95`	`95`	`assertnow.commit.message!=past.commit.message`
`96`	`96`	`# You can read objects directly through binary streams, no working tree required`
`97`		`-assert (now.commit.tree/'VERSION').data_stream.read().decode('ascii').startswith('0')`
	`97`	`+assert (now.commit.tree/'VERSION').data_stream.read().decode('ascii').startswith('1')`
`98`	`98`
`99`	`99`	`# You can traverse trees as well to handle all contained files of a particular commit`
`100`	`100`	`file_count=0`

Lines changed: 5 additions & 2 deletions

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

Comments

(0)