Eclipse Community Forums: EGit / JGit » How to JGit blame a file before commit?

Help

Home

Home » Eclipse Projects » EGit / JGit » How to JGit blame a file before commit?

Show: Today's Messages :: Show Polls :: Message Navigator

How to JGit blame a file before commit? [message #1730248]

Fri, 22 April 2016 15:09

Alcemir Santos

Messages: 23
Registered: July 2012

Junior Member

Context: My merge ran into conflicts and I have a file like this example:

Foo.txt (merged)

1
<<<<<< HEAD
2-master
======
2-side
>>>>>> df803849788fde47965b3dc8f07f07d48320ea9c
3

Question: In order to get the developers who actually changed the conflicting lines, how to blame result file (above) prior to the commit? It works for "git blame Foo.txt".

Problem: I tried to do the following, but the blame is null inside the loop.

MergeResult m = runMerge(aScenario);
BlameCommand blamer = new BlameCommand(git.getRepository());
BufferedReader br =  new BufferedReader(new FileReader(new File(mergedfilepath)));
BlameResult blame = blamer.setFilePath(mergedfilepath).call();
for (int i = 0; (line= br.readLine())!=null ; i++) {
    // the blame at this point is null.
    PersonIdent person = blame.getSourceAuthor(i);
    System.out.println(person.getName() + ": "+ line);
}

Report message to a moderator

Previous Topic:	How to define a "In between" JGit RevFilter?
Next Topic:	eGit Install on CF Builder 3

Goto Forum:

-=] Back to Top [=-

[ Syndicate this forum (XML) ] [

]

Current Time: Tue Apr 16 20:44:14 GMT 2024

.:: Contact :: Home ::.

Breadcrumbs

Sign up to our Newsletter