Commitd86e77e

committed

tree: implemented recursive paths in __div__ and __getitem__ method, allowing the keys to contain slashes; adjusted test to check for this

1 parent1b3fedd commitd86e77eCopy full SHA for d86e77e

File tree

+33

-7

lines changed

+33

-7

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -239,13 +239,15 @@ query entries by name.`
`239`	`239`	`'dir/file'`
`240`	`240`	`>>>blob.abspath`
`241`	`241`	`'/Users/mtrier/Development/git-python/dir/file'`
	`242`	`+>>>tree['dir/file'].sha == blob.sha`
`242`	`243`
`243`	`244`	`There is a convenience method that allows you to get a named sub-object`
`244`	`245`	`from a tree with a syntax similar to how paths are written in an unix`
`245`	`246`	`system.`
`246`	`247`
`247`	`248`	`>>>tree/"lib"`
`248`	`249`	`<git.Tree "c1c7214dde86f76bc3e18806ac1f47c38b2b7a30">`
	`250`	`+ >>>tree/"dir/file"== blob.sha`
`249`	`251`
`250`	`252`	`You can also get a tree directly from the repository if you know its name.`
`251`	`253`

Lines changed: 27 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,32 @@ def __div__(self, file):`
`158`	`158`	`Raise`
`159`	`159`	`KeyError if given file or tree does not exist in tree`
`160`	`160`	`"""`
`161`		`-returnself[file]`
	`161`	`+msg="Blob or Tree named %r not found"`
	`162`	`+if'/'infile:`
	`163`	`+tree=self`
	`164`	`+item=self`
	`165`	`+tokens=file.split('/')`
	`166`	`+fori,tokeninenumerate(tokens):`
	`167`	`+item=tree[token]`
	`168`	`+ifitem.type=='tree':`
	`169`	`+tree=item`
	`170`	`+else:`
	`171`	`+# safety assertion - blobs are at the end of the path`
	`172`	`+ifi!=len(tokens)-1:`
	`173`	`+raiseKeyError(msg%file)`
	`174`	`+returnitem`
	`175`	`+# END handle item type`
	`176`	`+# END for each token of split path`
	`177`	`+ifitem==self:`
	`178`	`+raiseKeyError(msg%file)`
	`179`	`+returnitem`
	`180`	`+else:`
	`181`	`+forobjinself._cache:`
	`182`	`+ifobj.name==file:`
	`183`	`+returnobj`
	`184`	`+# END for each obj`
	`185`	`+raiseKeyError(msg%file )`
	`186`	`+# END handle long paths`
`162`	`187`
`163`	`188`
`164`	`189`	`def__repr__(self):`
`@@ -205,11 +230,7 @@ def __getitem__(self,item):`
`205`	`230`
`206`	`231`	`ifisinstance(item,basestring):`
`207`	`232`	`# compatability`
`208`		`-forobjinself._cache:`
`209`		`-ifobj.name==item:`
`210`		`-returnobj`
`211`		`-# END for each obj`
`212`		`-raiseKeyError("Blob or Tree named %s not found"%item )`
	`233`	`+returnself.__div__(item)`
`213`	`234`	`# END index is basestring`
`214`	`235`
`215`	`236`	`raiseTypeError("Invalid index type: %r"%item )`

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,10 @@ def test_traverse(self):`
`54`	`54`	`assertos.path.isabs(item.abspath)`
`55`	`55`	`if'/'initem.path:`
`56`	`56`	`found_slash=True`
`57`		`-break`
	`57`	`+# END check for slash`
	`58`	`+`
	`59`	`+# slashes in paths are supported as well`
	`60`	`+assertroot[item.path]==item==root/item.path`
`58`	`61`	`# END for each item`
`59`	`62`	`assertfound_slash`
`60`	`63`

Comments

(0)