Commit86fa577

committed

tree: renamed content_from_string to _from_string to make it private. Removed tests that were testing that method

1 parenta58a60a commit86fa577Copy full SHA for 86fa577

File tree

3 files changed

-29

lines changed

CHANGES
lib/git/objects
- tree.py
test/git
- test_tree.py

3 files changed

-29

lines changed

`‎CHANGES`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ Tree`
`52`	`52`	`* added blobs and trees properties allowing to query the respective items in the`
`53`	`53`	`tree`
`54`	`54`	`* now mimics behaviour of a read-only list instead of a dict to maintain order.`
	`55`	`+* content_from_string method is now private and not part of the public API anymore`
`55`	`56`
`56`	`57`	`0.1.6`
`57`	`58`	`=====`

`‎lib/git/objects/tree.py`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ def _get_tree_cache(cls, repo, treeish):`
`50`	`50`	`"""`
`51`	`51`	`out=list()`
`52`	`52`	`forlineinrepo.git.ls_tree(treeish).splitlines():`
`53`		`-obj=cls.content_from_string(repo,line)`
	`53`	`+obj=cls._from_string(repo,line)`
`54`	`54`	`ifobjisnotNone:`
`55`	`55`	`out.append(obj)`
`56`	`56`	`# END if object was handled`
`@@ -59,7 +59,7 @@ def _get_tree_cache(cls, repo, treeish):`
`59`	`59`
`60`	`60`
`61`	`61`	`@classmethod`
`62`		`-defcontent_from_string(cls,repo,text):`
	`62`	`+def_from_string(cls,repo,text):`
`63`	`63`	`"""`
`64`	`64`	`Parse a content item and create the appropriate object`
`65`	`65`

`‎test/git/test_tree.py`

Lines changed: 2 additions & 27 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,35 +25,10 @@ def test_contents_should_cache(self, git):`
`25`	`25`	`assert_true(git.called)`
`26`	`26`	`assert_equal(2,git.call_count)`
`27`	`27`	`assert_equal(git.call_args, (('ls_tree','34868e6e7384cb5ee51c543a8187fdff2675b5a7'), {}))`
`28`		`-`
`29`		`-deftest_content_from_string_tree_should_return_tree(self):`
`30`		`-text=fixture('ls_tree_a').splitlines()[-1]`
`31`		`-tree=Tree.content_from_string(None,text)`
`32`		`-`
`33`		`-assert_equal(Tree,tree.__class__)`
`34`		`-assert_equal("650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44",tree.id)`
`35`		`-assert_equal(0,tree.mode)# git tree objects always use this mode`
`36`		`-assert_equal("test",tree.path)`
`37`		`-`
`38`		`-deftest_content_from_string_tree_should_return_blob(self):`
`39`		`-text=fixture('ls_tree_b').split("\n")[0]`
`40`		`-`
`41`		`-tree=Tree.content_from_string(None,text)`
`42`		`-`
`43`		`-assert_equal(Blob,tree.__class__)`
`44`		`-assert_equal("aa94e396335d2957ca92606f909e53e7beaf3fbb",tree.id)`
`45`		`-assert_mode_644(tree.mode)`
`46`		`-assert_equal("grit.rb",tree.path)`
`47`		`-`
`48`		`-deftest_content_from_string_tree_should_return_commit(self):`
`49`		`-text=fixture('ls_tree_commit').split("\n")[1]`
`50`		`-`
`51`		`-tree=Tree.content_from_string(None,text)`
`52`		`-assert_none(tree)`
`53`	`28`
`54`	`29`	`@raises(TypeError)`
`55`		`-deftest_content_from_string_invalid_type_should_raise(self):`
`56`		`-Tree.content_from_string(None,"040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44test")`
	`30`	`+deftest__from_string_invalid_type_should_raise(self):`
	`31`	`+Tree._from_string(None,"040000 bogus 650fa3f0c17f1edb4ae53d8dcca4ac59d86e6c44test")`
`57`	`32`
`58`	`33`	`@patch_object(Blob,'size')`
`59`	`34`	`@patch_object(Git,'_call_process')`

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!

Commit86fa577

File tree

3 files changed

3 files changed

`‎CHANGES`

`‎lib/git/objects/tree.py`

`‎test/git/test_tree.py`

0 commit comments