Commit d85574e

thetwojByron

authored and

committed

Fix #820

1 parent 6244c55 commit d85574eCopy full SHA for d85574e

File tree

-3

lines changed

-3

lines changed

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -717,7 +717,7 @@ def _get_push_info(self, proc, progress):`
`717`	`717`	`# read the lines manually as it will use carriage returns between the messages`
`718`	`718`	`# to override the previous one. This is why we read the bytes manually`
`719`	`719`	`progress_handler = progress.new_message_handler()`
`720`		`- output = IterableList('name')`
	`720`	`+ output = []`
`721`	`721`
`722`	`722`	`def stdout_handler(line):`
`723`	`723`	`try:`
`@@ -833,7 +833,7 @@ def push(self, refspec=None, progress=None, **kwargs):`
`833`	`833`	`:note: No further progress information is returned after push returns.`
`834`	`834`	`:param kwargs: Additional arguments to be passed to git-push`
`835`	`835`	`:return:`
`836`		`- IterableList(PushInfo, ...) iterable list of PushInfo instances, each`
	`836`	`+ list(PushInfo, ...) list of PushInfo instances, each`
`837`	`837`	`one informing about an individual head which had been updated on the remote`
`838`	`838`	`side.`
`839`	`839`	`If the push contains rejected heads, these will have the PushInfo.ERROR bit set`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ def _assert_push_and_pull(self, remote, rw_repo, remote_repo):`
`325`	`325`	`self._commit_random_file(rw_repo)`
`326`	`326`	`progress = TestRemoteProgress()`
`327`	`327`	`res = remote.push(lhead.reference, progress)`
`328`		`- self.assertIsInstance(res, IterableList)`
	`328`	`+ self.assertIsInstance(res, list)`
`329`	`329`	`self._do_test_push_result(res, remote)`
`330`	`330`	`progress.make_assertion()`
`331`	`331`

Comments

(0)