Commitc3c6c81

committed

Merge branch 'issue-232-reproduction' - keep fetch/pull simplifications

Make sure we keep the improvements made to fetch and pullRelates togitpython-developers#232

2 parents47ac37b +0ed61f7 commitc3c6c81Copy full SHA for c3c6c81

File tree

2 files changed

-2

lines changed

git
- remote.py
- test
  - test_remote.py

2 files changed

-2

lines changed

`‎git/remote.py‎`

Lines changed: 6 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,9 @@ def _get_fetch_info_from_stderr(self, proc, progress):`
`523`	`523`
`524`	`524`	`progress_handler=progress.new_message_handler()`
`525`	`525`
`526`		`-defmy_progress_handler(line):`
	`526`	`+forlineinproc.stderr:`
	`527`	`+line=line.decode(defenc)`
	`528`	`+line=line.rstrip()`
`527`	`529`	`forplineinprogress_handler(line):`
`528`	`530`	`ifline.startswith('fatal:'):`
`529`	`531`	`raiseGitCommandError(("Error when fetching: %s"%line,),2)`
`@@ -538,7 +540,7 @@ def my_progress_handler(line):`
`538`	`540`	`# end`
`539`	`541`
`540`	`542`	`# We are only interested in stderr here ...`
`541`		`-handle_process_output(proc,None,my_progress_handler,finalize_process)`
	`543`	`+finalize_process(proc)`
`542`	`544`
`543`	`545`	`# read head information`
`544`	`546`	`fp=open(join(self.repo.git_dir,'FETCH_HEAD'),'rb')`
`@@ -608,6 +610,7 @@ def fetch(self, refspec=None, progress=None, **kwargs):`
`608`	`610`	`args= [refspec]`
`609`	`611`
`610`	`612`	`proc=self.repo.git.fetch(self,args,with_extended_output=True,as_process=True,v=True,*kwargs)`
	`613`	`+proc.stdout.close()`
`611`	`614`	`res=self._get_fetch_info_from_stderr(proc,progressorRemoteProgress())`
`612`	`615`	`ifhasattr(self.repo.odb,'update_cache'):`
`613`	`616`	`self.repo.odb.update_cache()`
`@@ -623,6 +626,7 @@ def pull(self, refspec=None, progress=None, **kwargs):`
`623`	`626`	`:return: Please see 'fetch' method """`
`624`	`627`	`kwargs=add_progress(kwargs,self.repo.git,progress)`
`625`	`628`	`proc=self.repo.git.pull(self,refspec,with_extended_output=True,as_process=True,v=True,**kwargs)`
	`629`	`+proc.stdout.close()`
`626`	`630`	`res=self._get_fetch_info_from_stderr(proc,progressorRemoteProgress())`
`627`	`631`	`ifhasattr(self.repo.odb,'update_cache'):`
`628`	`632`	`self.repo.odb.update_cache()`

`‎git/test/test_remote.py‎`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -348,6 +348,7 @@ def _assert_push_and_pull(self, remote, rw_repo, remote_repo):`
`348`	`348`	`new_head=Head.create(rw_repo,"my_new_branch")`
`349`	`349`	`progress=TestRemoteProgress()`
`350`	`350`	`res=remote.push(new_head,progress)`
	`351`	`+assertlen(res)>0`
`351`	`352`	`assertres[0].flags&PushInfo.NEW_HEAD`
`352`	`353`	`progress.make_assertion()`
`353`	`354`	`self._do_test_push_result(res,remote)`

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!

Commitc3c6c81

File tree

2 files changed

2 files changed

`‎git/remote.py‎`

`‎git/test/test_remote.py‎`

0 commit comments