EGit Synchornize ChnageSet – implemented!

Finally! I’ve implemented ChangeSet support in EGit! It looks almost the same as I was imagine it before I’ve started coding. The reality and Team API turn out much more complicated then I was thinking of it before Summer Of Code. But hours days of debugging and analyzing code of Team Framework, CVS integration plugin and “Example FileSystem” project finally give me some reasonable results. Apart from code analysis I’ve implemented four or five (I’ve published only two of them 1, 2) different approaches for this problem, all of them had some weakens and issues that latest implementation seams to solve. But now it is unimportant, the most important thing right now is to get this feature merged into EGit as fast as it is possible, another important thing is … the feature list! 😉

Current implementation shows Git Change Set next to “normal change set”. In my humble opinion this should be changed in the feature; Git Change Set view should be set as default view for synchronization for git, because in git we track changes on repository level and cannot import only part of commit. Above Git Change Set we have node that represent repository, if we launch synchronization for more then one repository there would be more nodes on this level. Inside repository node we have list of commits that occurs between two selected points (branches of versions). Every commit is described by text label with contains first 6 characters from commit SHA-1 and first line of commit message. Commits are sorted chronologically, most recent commits are on the top. Inside commit we have list of changes that are associated with this commit. Double click action on file element will launch ChangeEditor window with will display changes that were made between two most recent commits (this one and it parent).

Here is a screenshot how it looks in real world:

It shows list of changes between current HEAD and tag v0.8.4 … from height of scrollbar in Synchronize window we can guess that upcoming 0.9.0 release will contain lots of cool new features and bug fixes 😉 ;>

Currently I didn’t manage display change direction (does it is incoming, outgoing or conflicting) I’ll work on that in nearest feature. Another think that I was unable to achieve is “proper resource handling” eg. displaying java packages as this JDT does, to be honest I don’t know that this is achievable but I’ll try … dome day ;). Next think is context menu and merge/commit/overwrite actions, for now didn’t even think about it, but it also should be done in nearest feature.

What is your opinion about this new feature? Maybe you see something that should be changed, removed or improved? Please, let me know … feedback is strongly appreciated! 😉

7 Comments EGit Synchornize ChnageSet – implemented!

  1. Pingback: Tweets that mention Dariusz [LocK] Łuksza » EGit Synchornize ChnageSet – implemented! --

  2. Krzysztof Kazmierczyk

    Dariusz, have your changes been pushed into egit repository? Or is there any other repo or update site to test your changes?

  3. Dariusz Łuksza

    Co chcesz przez to powiedzieć? Sprawdziłem i wygląda na to, że wszystko działa dobrze. Mógłbyś bardziej specyzować co “nie działa”

    @Krzysztof Kazmierczyk
    No yet. Currently this change set awaits for EGit developer approver’s in Gerrit. It also available for any other other people, but this require compilation. You can download it from Gerrit (it generates command for checkout, pull, cherry-pick and patch) then build it and have fun with it ;).

  4. Carsten Pfeiffer

    I think that the java model representation is achieved by the implementation of IPipelinedContentProvider in org.eclipse.jdt.internal.ui.navigatorJavaNavigatorContentProvider.

  5. Dariusz Łuksza

    @Carsten Pfeiffer
    Thank you Carsten for this information. In nearest feature I’ll investigate how we can include various content providers in change set.

    BTW. A few minutes ago change set support were merged into EGit main repository, so it should be included in next nightly build release 😉


Leave a Reply

Your email address will not be published. Required fields are marked *