Commit14cef2b

authored and

committed

Avoid stripping newlines in blob data.

(cherry picked from commit ccca12ee26e40fb4c4df2d77154ed496144569b9)

1 parentd3ce120 commit14cef2bCopy full SHA for 14cef2b

File tree

+13

-4

lines changed

+13

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ def data(self):`
`57`	`57`	`Returns`
`58`	`58`	`str`
`59`	`59`	`"""`
`60`		`-self.data_stored=self.data_storedorself.repo.git.cat_file(self.id,**{'p':True})`
	`60`	`+self.data_stored=self.data_storedorself.repo.git.cat_file(self.id,**{'p':True,'with_raw_output':True})`
`61`	`61`	`returnself.data_stored`
`62`	`62`
`63`	`63`	`@property`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+Hello world`

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,15 @@ def test_should_return_blob_contents(self, git):`
`18`	`18`	`blob=Blob(self.repo,**{'id':'abc'})`
`19`	`19`	`assert_equal("Hello world",blob.data)`
`20`	`20`	`assert_true(git.called)`
`21`		`-assert_equal(git.call_args, (('cat_file','abc'), {'p':True}))`
	`21`	`+assert_equal(git.call_args, (('cat_file','abc'), {'p':True,'with_raw_output':True}))`
	`22`	`+`
	`23`	`+@patch(Git,'_call_process')`
	`24`	`+deftest_should_return_blob_contents_with_newline(self,git):`
	`25`	`+git.return_value=fixture('cat_file_blob_nl')`
	`26`	`+blob=Blob(self.repo,**{'id':'abc'})`
	`27`	`+assert_equal("Hello world\n",blob.data)`
	`28`	`+assert_true(git.called)`
	`29`	`+assert_equal(git.call_args, (('cat_file','abc'), {'p':True,'with_raw_output':True}))`
`22`	`30`
`23`	`31`	`@patch(Git,'_call_process')`
`24`	`32`	`deftest_should_cache_data(self,git):`
`@@ -28,7 +36,7 @@ def test_should_cache_data(self, git):`
`28`	`36`	`blob.data`
`29`	`37`	`assert_true(git.called)`
`30`	`38`	`assert_equal(git.call_count,1)`
`31`		`-assert_equal(git.call_args, (('cat_file','abc'), {'p':True}))`
	`39`	`+assert_equal(git.call_args, (('cat_file','abc'), {'p':True,'with_raw_output':True}))`
`32`	`40`
`33`	`41`	`@patch(Git,'_call_process')`
`34`	`42`	`deftest_should_return_file_size(self,git):`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ def test_blob(self, git):`
`107`	`107`	`assert_equal("Hello world",blob.data)`
`108`	`108`
`109`	`109`	`assert_true(git.called)`
`110`		`-assert_equal(git.call_args, (('cat_file','abc'), {'p':True}))`
	`110`	`+assert_equal(git.call_args, (('cat_file','abc'), {'p':True,'with_raw_output':True}))`
`111`	`111`
`112`	`112`	`@patch(Repo,'__init__')`
`113`	`113`	`@patch(Git,'_call_process')`

Comments

(0)