Commit73ab287

committed

Split lines by new line characters

Opt to split lines by the new line character instead of letting`splitlines()` do this. This helps catch the issue when there arespecial characters in the line, particular the commit summary section.

1 parent7a8f96c commit73ab287Copy full SHA for 73ab287

File tree

2 files changed

-3

lines changed

git
- repo
  - base.py
- test/fixtures
  - blame_incremental

2 files changed

-3

lines changed

`‎git/repo/base.py`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -682,10 +682,12 @@ 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=iter(data.split(b'\n'))`
`686`	`686`	`whileTrue:`
`687`	`687`	`line=next(stream)# when exhausted, casues a StopIteration, terminating this function`
`688`		`-`
	`688`	`+ifline.strip()=='':`
	`689`	`+# Skip over empty lines`
	`690`	`+continue`
`689`	`691`	`hexsha,orig_lineno,lineno,num_lines=line.split()`
`690`	`692`	`lineno=int(lineno)`
`691`	`693`	`num_lines=int(num_lines)`

`‎git/test/fixtures/blame_incremental`

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`

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!

Commit73ab287

File tree

2 files changed

2 files changed

`‎git/repo/base.py`

`‎git/test/fixtures/blame_incremental`

0 commit comments