Commit5e6827e

committed

remote,#525: FIX BUG push-cmd misses error messages

+ Bug discovered after enabling TC in prev commit and rework of fetch.+ remote_tc: unitestize assertions.+ util: DEL unused `_mktemp()`.

1 parent85f38a1 commit5e6827eCopy full SHA for 5e6827e

File tree

5 files changed

+91

-83

lines changed

git
- cmd.py
- remote.py
- test
  - lib
    - helper.py
  - test_remote.py
- util.py

5 files changed

+91

-83

lines changed

`‎git/cmd.py‎`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -247,7 +247,7 @@ def __del__(self):`
`247`	`247`	`def__getattr__(self,attr):`
`248`	`248`	`returngetattr(self.proc,attr)`
`249`	`249`
`250`		`-defwait(self,stderr=b''):`
	`250`	+defwait(self,stderr=b''):# TODO: Bad choice to mimic `proc.wait()` but with different args.
`251`	`251`	`"""Wait for the process and return its status code.`
`252`	`252`
`253`	`253`	`:param stderr: Previously read value of stderr, in case stderr is already closed.`

`‎git/remote.py‎`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,6 @@`
`27`	`27`	`)`
`28`	`28`	`fromgit.utilimport (`
`29`	`29`	`join_path,`
`30`		`-finalize_process`
`31`	`30`	`)`
`32`	`31`	`fromgit.cmdimporthandle_process_output,Git`
`33`	`32`	`fromgitdb.utilimportjoin`
`@@ -681,16 +680,19 @@ def stdout_handler(line):`
`681`	`680`	`try:`
`682`	`681`	`output.append(PushInfo._from_line(self,line))`
`683`	`682`	`exceptValueError:`
`684`		`-#if an error happens, additional info is given which wecannotparse`
	`683`	`+#If an error happens, additional info is given which we parse below.`
`685`	`684`	`pass`
`686`		`-# END exception handling`
`687`		`-# END for each line`
`688`	`685`
	`686`	`+handle_process_output(proc,stdout_handler,progress_handler,finalizer=None,decode_streams=False)`
	`687`	`+stderr_text=progress.error_linesand'\n'.join(progress.error_lines)or''`
`689`	`688`	`try:`
`690`		`-handle_process_output(proc,stdout_handler,progress_handler,finalize_process,decode_streams=False)`
	`689`	`+proc.wait(stderr=stderr_text)`
`691`	`690`	`exceptException:`
`692`		`-iflen(output)==0:`
	`691`	`+ifnotoutput:`
`693`	`692`	`raise`
	`693`	`+elifstderr_text:`
	`694`	`+log.warning("Error lines received while fetching: %s",stderr_text)`
	`695`	`+`
`694`	`696`	`returnoutput`
`695`	`697`
`696`	`698`	`def_assert_refspec(self):`

`‎git/test/lib/helper.py‎`

Lines changed: 8 additions & 16 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,8 +13,9 @@`
`13`	`13`	`importtextwrap`
`14`	`14`	`importtime`
`15`	`15`	`fromunittestimportTestCase`
	`16`	`+importunittest`
`16`	`17`
`17`		`-fromgit.compatimportstring_types,is_win`
	`18`	`+fromgit.compatimportstring_types,is_win,PY3`
`18`	`19`	`fromgit.utilimportrmtree`
`19`	`20`
`20`	`21`	`importos.pathasosp`
`@@ -68,18 +69,6 @@ def wait(self):`
`68`	`69`	`#{ Decorators`
`69`	`70`
`70`	`71`
`71`		`-def_mktemp(*args):`
`72`		`-"""Wrapper around default tempfile.mktemp to fix an osx issue`
`73`		`- :note: the OSX special case was removed as it was unclear why that was needed in the first place. It seems`
`74`		`- to be just fine without it. However, if we leave this special case, and if TMPDIR is set to something custom,`
`75`		`- prefixing /private/ will lead to incorrect paths on OSX."""`
`76`		`-tdir=tempfile.mktemp(*args)`
`77`		`-# See :note: above to learn why this is comented out.`
`78`		`-# if is_darwin:`
`79`		`-# tdir = '/private' + tdir`
`80`		`-returntdir`
`81`		`-`
`82`		`-`
`83`	`72`	`defwith_rw_directory(func):`
`84`	`73`	`"""Create a temporary directory which can be written to, remove it if the`
`85`	`74`	`test succeeds, but leave it otherwise to aid additional debugging"""`
`@@ -129,7 +118,7 @@ def repo_creator(self):`
`129`	`118`	`ifbare:`
`130`	`119`	`prefix=''`
`131`	`120`	`# END handle prefix`
`132`		`-repo_dir=_mktemp("%sbare_%s"% (prefix,func.__name__))`
	`121`	`+repo_dir=tempfile.mktemp("%sbare_%s"% (prefix,func.__name__))`
`133`	`122`	`rw_repo=self.rorepo.clone(repo_dir,shared=True,bare=bare,n=True)`
`134`	`123`
`135`	`124`	`rw_repo.head.commit=rw_repo.commit(working_tree_ref)`
`@@ -222,8 +211,8 @@ def argument_passer(func):`
`222`	`211`
`223`	`212`	`@wraps(func)`
`224`	`213`	`defremote_repo_creator(self):`
`225`		`-remote_repo_dir=_mktemp("remote_repo_%s"%func.__name__)`
`226`		`-repo_dir=_mktemp("remote_clone_non_bare_repo")`
	`214`	`+remote_repo_dir=tempfile.mktemp("remote_repo_%s"%func.__name__)`
	`215`	`+repo_dir=tempfile.mktemp("remote_clone_non_bare_repo")`
`227`	`216`
`228`	`217`	`rw_remote_repo=self.rorepo.clone(remote_repo_dir,shared=True,bare=True)`
`229`	`218`	`# recursive alternates info ?`
`@@ -340,6 +329,9 @@ class TestBase(TestCase):`
`340`	`329`	`of the project history ( to assure tests don't fail for others ).`
`341`	`330`	`"""`
`342`	`331`
	`332`	`+ifnotPY3:`
	`333`	`+assertRaisesRegex=unittest.TestCase.assertRaisesRegexp`
	`334`	`+`
`343`	`335`	`def_small_repo_url(self):`
`344`	`336`	`""":return" a path to a small, clonable repository"""`
`345`	`337`	`fromgit.cmdimportGit`

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!

Uh oh!

Commit5e6827e

File tree

5 files changed

5 files changed

`‎git/cmd.py‎`

`‎git/remote.py‎`

`‎git/test/lib/helper.py‎`

0 commit comments