News from EGitMatthias Sohn (SAP)Mikaël Barbero (Obeo)EclipseCon Europe 2014

 JGit / EGit 3.2 Dec 2013

  JGit EGit

git describe

rebase.autostash

interactive rebase

push branch wizard

push tag wizard

improved blame

interactive rebase

 jgit describe

$ jgit checkout v3.5.1.201410131835-r$ jgit describev3.5.1.201410131835-r

$ jgit checkout master$ jgit describev3.5.1.201410131835-r-17-g5c85d5d

nearest tag

no of commits

since tag

commit-id

 [rebase]autostash = true

Rebase with dirty working tree:

● stash● rebase● stash pop (may conflict)

 Push branch / push tag wizards

 Improved blame

 JGit / EGit 3.3 Feb 2014

  JGit EGit

symlinks on Java 7

support Apache HttpClient

basic symlink support

squash commits in

history

Symlinks on Java 7

$ cd b$ ln -s ../a a$ ls –l-rw-r--r-- B.txtlrwxr-xr-x a -> ../a

Squash commits in history view

 JGit / EGit 3.4 June 2014 (Luna)

  JGit EGit

new layout of commit graph

kerberos authentication

archive command

multi cherry-pick & revert

edit / reword commit in history

init in non-empty directory

warn on checkout if launch is running

New layout of commit graph JGit

 gitk

ArchiveCommand:Creating source archives

Multi cherry-pick / revert

Modify history

Warn on checkout if launch is running

 JGit / EGit 3.5 Sept 2014

  JGit EGit

.netrc

rebase --preserve-merges

cherry-pick --no-commit

improved interactive rebase

new stash menustash viewer

improved push wizards

team menu on working setrepo menu on resource

new logo

Improved interactive rebase

Stash support

Improved push wizards

Team menu on working set

Repository menu on resource

 in progress for 3.6 

  JGit EGit

new ignore implementation

improved submodule support

git attributes

merge driver (text, binary)

model merge

symlink support

Oomph setup of dev workspace

 Working with Models in EGit

 What if EGit… prevents you from committing non compiling code?

 Version 1

 Version 2

 What if EGit… prevents you from committing non compiling code?

 Version 1

 Version 2

 What if EGit… could detect semantic conflicts?

C1

C2

C3

C4

C5

C3

C4

 What if EGit… understood the files it is working with?

(cc by-sa) Massimo Barbieri

 Eclipse Team

Eclipse Team

EGit Subversive Eclipse CVS

 Eclipse Team Logical Model Support

Eclipse Team

EGit

Logical model ext. point

Logical model merger ext. point

 Eclipse Team Logical Model Support

Eclipse Team

EGit

Logical model ext. point

Logical model merger ext. point

?

 Eclipse Team Logical Model Support

Eclipse Team

EGit

Logical model ext. point

Logical model merger ext. point

Provider(EMF Compare)

 Eclipse Team Logical Model Support

Eclipse Team

EGit

Logical model ext. point

Logical model merger ext. point

Provider(EMF Compare)

Ongoing Work

 Eclipse Team Logical Model Support

Eclipse Team

EGit

Logical model ext. point

Logical model merger ext. point

Provider(EMF Compare)

OK for EMF models

 Logical Model Compare & Merge Support for EMF Models with EMF Compare

 Logical Model Compare & Merge Support for EMF Models with EMF Compare

 Working with Models in EGit Demos

 https://www.eclipse.org/emf/compare/ http://download.eclipse.org/modeling/emf/compare/updates/egit-logical/nightly/

Questions ??