Commit76f9c62

committed

Squashed the last remaining bugs in the tests.

1 parent064e63f commit76f9c62Copy full SHA for 76f9c62

File tree

+15

-6

lines changed

+15

-6

lines changed

Lines changed: 15 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`#!/usr/bin/env python`
`2`	`2`	`from __future__importwith_statement`
`3`	`3`	`importos`
	`4`	`+importre`
`4`	`5`	`importsys`
`5`	`6`	`importsubprocess`
`6`	`7`	`importunittest`
`@@ -162,13 +163,21 @@ def test_format_revision(self, string='%r'):`
`162`	`163`	`classGit(Base,BaseTest):`
`163`	`164`
`164`	`165`	`def_hash_or_branch(self,get='hash'):`
`165`		`-withopen(os.path.join(self.repository,'.git/packed-refs'),'r')asf:`
	`166`	`+branch=hash=self.unknown()`
	`167`	`+# get the branch name`
	`168`	`+withopen(os.path.join(self.repository,'.git/HEAD'),'r')asf:`
`166`	`169`	`forlineinf:`
`167`		`-ifnotline.startswith('#'):`
`168`		`-hash,branch=line.split()`
`169`		`-hash=hash[:7]`
`170`		`-branch=branch.rsplit('/')[-1]`
`171`		`-returnlocals()[get]`
	`170`	`+ifre.match('^ref',line):`
	`171`	`+branch=line.strip().split('/')[-1]`
	`172`	`+break`
	`173`	`+`
	`174`	`+# open the branch file, grab the hash`
	`175`	`+ifbranch!=self.unknown():`
	`176`	`+withopen(self.file('.git/refs/heads/%s'%branch),'r')asbf:`
	`177`	`+forbflineinbf:`
	`178`	`+hash=bfline.strip()[:7]`
	`179`	`+break`
	`180`	`+returnlocals()[get]`
`172`	`181`
`173`	`182`	`defbranch(self):`
`174`	`183`	`returnself._hash_or_branch('branch')`

Comments

(0)