Commit123302c

committed

Merge branch 'jonathanchu-master'

2 parents7228ca9 +187fe11 commit123302cCopy full SHA for 123302c

File tree

-3

lines changed

-3

lines changed

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -682,10 +682,9 @@ def blame_incremental(self, rev, file, **kwargs):`
`682`	`682`	`data=self.git.blame(rev,'--',file,p=True,incremental=True,stdout_as_string=False,**kwargs)`
`683`	`683`	`commits=dict()`
`684`	`684`
`685`		`-stream=iter(data.splitlines())`
	`685`	`+stream=(lineforlineindata.split(b'\n')ifline)`
`686`	`686`	`whileTrue:`
`687`	`687`	`line=next(stream)# when exhausted, casues a StopIteration, terminating this function`
`688`		`-`
`689`	`688`	`hexsha,orig_lineno,lineno,num_lines=line.split()`
`690`	`689`	`lineno=int(lineno)`
`691`	`690`	`num_lines=int(num_lines)`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ committer Sebastian Thiel`
`7`	`7`	`committer-mail <byronimo@gmail.com>`
`8`	`8`	`committer-time 1270634931`
`9`	`9`	`committer-tz +0200`
`10`		`-summary Used this release for a first beta of the 0.2 branch of development`
	`10`	`+summary Used this release for a first beta of the 0.2 branch of development`
`11`	`11`	`previous 501bf602abea7d21c3dbb409b435976e92033145 AUTHORS`
`12`	`12`	`filename AUTHORS`
`13`	`13`	`82b8902e033430000481eb355733cd7065342037 14 14 1`

Comments

(0)