Commit8dd51f1

committed

Improved refparse error handling in case of out-of-bound indices

1 parent7029773 commit8dd51f1Copy full SHA for 8dd51f1

File tree

+14

-2

lines changed

+14

-2

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,12 @@ def rev_parse(repo, rev):`
`190`	`190`	`raiseNotImplementedError("Support for additional @{...} modes not implemented")`
`191`	`191`	`#END handle revlog index`
`192`	`192`
`193`		`-entry=ref.log()[revlog_index]`
	`193`	`+try:`
	`194`	`+entry=ref.log()[revlog_index]`
	`195`	`+exceptIndexError:`
	`196`	`+raiseBadObject("Invalid revlog index: %i"%revlog_index)`
	`197`	`+#END handle index out of bound`
	`198`	`+`
`194`	`199`	`obj=Object.new_from_sha(repo,hex_to_bin(entry.newhexsha))`
`195`	`200`
`196`	`201`	`# make it pass the following checks`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -557,12 +557,19 @@ def test_rev_parse(self):`
`557`	`557`	`# uses HEAD.ref by default`
`558`	`558`	`assertrev_parse('@{0}')==head.commit`
`559`	`559`	`ifnothead.is_detached:`
`560`		`-assertrev_parse('%s@{0}'%head.ref.name)==head.ref.commit`
	`560`	`+refspec='%s@{0}'%head.ref.name`
	`561`	`+assertrev_parse(refspec)==head.ref.commit`
	`562`	`+# all additional specs work as well`
	`563`	`+assertrev_parse(refspec+"^{tree}")==head.commit.tree`
	`564`	`+assertrev_parse(refspec+":CHANGES").type=='blob'`
`561`	`565`	`#END operate on non-detached head`
`562`	`566`
`563`	`567`	`# the last position`
`564`	`568`	`assertrev_parse('@{1}')!=head.commit`
`565`	`569`
	`570`	`+# position doesn't exist`
	`571`	`+self.failUnlessRaises(BadObject,rev_parse,'@{10000}')`
	`572`	`+`
`566`	`573`	`# currently, nothing more is supported`
`567`	`574`	`self.failUnlessRaises(NotImplementedError,rev_parse,"@{1 week ago}")`
`568`	`575`

Comments

(0)