Commit0d7a40f

committed

Merge pull request#411 from nvie/enrich-incremental-blame-output

Enrich incremental blame output

2 parents4adafc5 +8da7852 commit0d7a40fCopy full SHA for 0d7a40f

File tree

2 files changed

+25

-8

lines changed

git
- repo
  - base.py
- test
  - test_repo.py

2 files changed

+25

-8

lines changed

`‎git/repo/base.py`

Lines changed: 16 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -60,12 +60,15 @@`
`60`	`60`	`importos`
`61`	`61`	`importsys`
`62`	`62`	`importre`
	`63`	`+fromcollectionsimportnamedtuple`
`63`	`64`
`64`	`65`	`DefaultDBType=GitCmdObjectDB`
`65`	`66`	`ifsys.version_info[:2]< (2,5):# python 2.4 compatiblity`
`66`	`67`	`DefaultDBType=GitCmdObjectDB`
`67`	`68`	`# END handle python 2.4`
`68`	`69`
	`70`	`+BlameEntry=namedtuple('BlameEntry', ['commit','linenos','orig_path','orig_linenos'])`
	`71`	`+`
`69`	`72`
`70`	`73`	`__all__= ('Repo', )`
`71`	`74`
`@@ -661,10 +664,10 @@ def blame_incremental(self, rev, file, **kwargs):`
`661`	`664`	`"""Iterator for blame information for the given file at the given revision.`
`662`	`665`
`663`	`666`	`Unlike .blame(), this does not return the actual file's contents, only`
`664`		`- a stream of(commit, range) tuples.`
	`667`	`+ a stream ofBlameEntry tuples.`
`665`	`668`
`666`	`669`	`:parm rev: revision specifier, see git-rev-parse for viable options.`
`667`		`- :return: lazy iterator of(git.Commit, range) tuples, where the commit`
	`670`	`+ :return: lazy iterator ofBlameEntry tuples, where the commit`
`668`	`671`	`indicates the commit to blame for the line, and range`
`669`	`672`	`indicates a span of line numbers in the resulting file.`
`670`	`673`
`@@ -678,9 +681,10 @@ def blame_incremental(self, rev, file, **kwargs):`
`678`	`681`	`whileTrue:`
`679`	`682`	`line=next(stream)# when exhausted, casues a StopIteration, terminating this function`
`680`	`683`
`681`		`-hexsha,_,lineno,num_lines=line.split()`
	`684`	`+hexsha,orig_lineno,lineno,num_lines=line.split()`
`682`	`685`	`lineno=int(lineno)`
`683`	`686`	`num_lines=int(num_lines)`
	`687`	`+orig_lineno=int(orig_lineno)`
`684`	`688`	`ifhexshanotincommits:`
`685`	`689`	`# Now read the next few lines and build up a dict of properties`
`686`	`690`	`# for this commit`
`@@ -696,6 +700,7 @@ def blame_incremental(self, rev, file, **kwargs):`
`696`	`700`	`props[tag]=value`
`697`	`701`	`iftag==b'filename':`
`698`	`702`	`# "filename" formally terminates the entry for --incremental`
	`703`	`+orig_filename=value`
`699`	`704`	`break`
`700`	`705`
`701`	`706`	`c=Commit(self,hex_to_bin(hexsha),`
`@@ -710,9 +715,14 @@ def blame_incremental(self, rev, file, **kwargs):`
`710`	`715`	`else:`
`711`	`716`	`# Discard the next line (it's a filename end tag)`
`712`	`717`	`line=next(stream)`
`713`		`-assertline.startswith(b'filename'),'Unexpected git blame output'`
`714`		`-`
`715`		`-yieldcommits[hexsha],range(lineno,lineno+num_lines)`
	`718`	`+tag,value=line.split(b' ',1)`
	`719`	`+asserttag==b'filename','Unexpected git blame output'`
	`720`	`+orig_filename=value`
	`721`	`+`
	`722`	`+yieldBlameEntry(commits[hexsha],`
	`723`	`+range(lineno,lineno+num_lines),`
	`724`	`+safe_decode(orig_filename),`
	`725`	`+range(orig_lineno,orig_lineno+num_lines))`
`716`	`726`
`717`	`727`	`defblame(self,rev,file,incremental=False,**kwargs):`
`718`	`728`	`"""The blame information for the given file at the given revision.`

`‎git/test/test_repo.py`

Lines changed: 9 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -341,12 +341,19 @@ def test_blame_incremental(self, git):`
`341`	`341`	`assertlen(blame_output)==5`
`342`	`342`
`343`	`343`	`# Check all outputted line numbers`
`344`		`-ranges=flatten([line_numbersfor_,line_numbersinblame_output])`
	`344`	`+ranges=flatten([entry.linenosforentryinblame_output])`
`345`	`345`	`assertranges==flatten([range(2,3),range(14,15),range(1,2),range(3,14),range(15,17)]),str(ranges)`
`346`	`346`
`347`		`-commits= [c.hexsha[:7]forc,_inblame_output]`
	`347`	`+commits= [entry.commit.hexsha[:7]forentryinblame_output]`
`348`	`348`	`assertcommits== ['82b8902','82b8902','c76852d','c76852d','c76852d'],str(commits)`
`349`	`349`
	`350`	`+# Original filenames`
	`351`	`+assertall([entry.orig_path==u'AUTHORS'forentryinblame_output])`
	`352`	`+`
	`353`	`+# Original line numbers`
	`354`	`+orig_ranges=flatten([entry.orig_linenosforentryinblame_output])`
	`355`	`+assertorig_ranges==flatten([range(2,3),range(14,15),range(1,2),range(2,13),range(13,15)]),str(orig_ranges)# noqa`
	`356`	`+`
`350`	`357`	`@patch.object(Git,'_call_process')`
`351`	`358`	`deftest_blame_complex_revision(self,git):`
`352`	`359`	`git.return_value=fixture('blame_complex_revision')`

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!

Uh oh!

Commit0d7a40f

File tree

2 files changed

2 files changed

`‎git/repo/base.py`

`‎git/test/test_repo.py`

0 commit comments