Show a rebase result dialog if cherry-picking fails.

This will show a rebase result dialog if cherry-picking a commit fails.
This is the same dialog used for regular rebasing.

Bug: 443016
Change-Id: I0a88289f74913ccb47ace8ad9d59e9214ae2314a
Signed-off-by: Maik Schreiber <blizzy@blizzy.de>
Add "Show Annotations" to ruler menu of revision editor

For a file editor that was opened e.g. from the history view using "Open
This Version", the ruler menu now also includes "Show Annotations". It
opens the annotations in a new editor, I couldn't figure out how to
reuse the same editor. But better than not having it.

Bug: 401395
Change-Id: Ida587098137f68110f0885e834c37d3208b85dc5
Signed-off-by: Robin Stocker <robin@nibor.org>
Simple push wizard links to Advanced push wizard

Filed bug 443320 to track further improvements.

Bug: 436726
Change-Id: Iccdecd8eb3f70326a3af99b1fb2a11669f8027b2
Signed-off-by: Mickael Istria <mistria@redhat.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Prepare 3.6.0-SNAPSHOT builds

Change-Id: Iacf8d0b9fbc75727cd6073957a954b9e8b38b771
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Extract GitLabelProvider utility methods into separate class

Moved GitLabelProvider static methods for Git elements (repository,
refs, commits, etc.) label calculation to the separate class.

Bug: 416132
Change-Id: Iafb3e745cf372e81d6f0ac1253e1c516387bb91d
Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru>
Show branch name and status besides repository in Git Staging view

Bug: 416132
Change-Id: Icafa9d55e1316a3e48c34cad5487ff4535ecc195
Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru>
Save local history prior to replace or hard reset

Prior to discarding changes (Replace With or hard reset), save the
changes to local history.

Bug: 361442
Change-Id: Id43d9e3bc995f3fe5b174904f4e737e4cfc1e66c
Signed-off-by: Stephen Elsemore <selsemore@collab.net>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
EGit 3.5.0.201409071800-rc1

Change-Id: Ie2c16a527110f0aefe7012950bec6e1830e3695f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Prepare post 3.5.0-rc1 builds

Change-Id: I3ac0cfa41bbbfd754a5140edb8b3dd39c7cd0055
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Add Team > "Show in History/Repositories View" for working sets

"Show in History" will focus history on all the projects that are
contained in the working set. For Show in Repositories View, it selects
the repository, as I felt that having all projects selected was a bit
confusing.

Bug: 311299
Change-Id: I81ed28ddcfac0174721d07d8cbea9540e36333e2
Signed-off-by: Robin Stocker <robin@nibor.org>
Add Team > "Create Patch..." for working sets

Note that the tooltip attribute only works for toolbar items, that's why
it was removed.

Change-Id: I9355f43ca8077e73934fe6c6f7bbef80ee19d06e
Signed-off-by: Robin Stocker <robin@nibor.org>
Fix Team > Advanced not being available in editor context menu

Change-Id: Idce172241ef51796f40dd4a323d366470b5d57ff
Signed-off-by: Robin Stocker <robin@nibor.org>
Add "Repository" submenu in Team menu of files and folders

Allows to access repository-wide actions such as Push, Pull, Fetch and
Switch To in the context menu of files and folders.

Hopefully, having these actions be in a submenu named "Repository"
should make it clear that they don't only act on the selected resource,
but the whole repository.

Bug: 302078
Change-Id: I0045efde5832ad94bbfe0f7b43f654640040ba54
Signed-off-by: Robin Stocker <robin@nibor.org>
[stagingView] Fix context menu for modified+added file

For a file that is not in HEAD, but added to index and modified in the
working tree, the context menu was wrong. It was handled just as
"modified". Now it's also handled specially like modified+changed.

Renamed the PARTIALLY_MODIFIED value to make it clearer.

Bug: 443969
Change-Id: I340cf705c5fe78e6796a9a0846f0d00e5c7b4cd1
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Fix deadlock caused by GitProjectData.logAndUnmapGoneMappedResource

Deadlock could occur as follows:

Thread 1: In GitProjectData.get/load, the class object is locked. In
case a mapped resource is gone, RepositoryProvider.unmap is called,
which waits for job run.

Thread 2: In a job run, GitProvider.getData is called, which waits to
lock the GitProjectData class.

There are also other situations, all of which are caused by
logAndUnmapGoneMappedResource calling RepositoryProvider.unmap. By doing
that in a job where the GitProjectData class is no longer locked, this
should be solved.

Bug: 425973
Change-Id: I74ecc26d696057896ac2790974e9c2e9687c783e
Signed-off-by: Robin Stocker <robin@nibor.org>
Remove use of alternating row colors in some more places

See change I50b7c8c66cf391cf5c08b2a29e6bfd14896f17f6 for why.

The tables/trees in this change either have no colums or are very
simple, so the alternating row colors just add noise.

Change-Id: I7aea8910b68d14fc45f7d7c5b58f2596186ad7ac
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Improve icons for interactive rebase fixup and squash actions

- use better icons provided by Vadim Dmitriev
- flip direction of the icons when reversing direction of interactive
  rebase view

Bug: 443930
Change-Id: I2d1b99d64d68a1f2d20f0519a375449d83fdd24b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Also-By: Vadim Dmitriev <dmgloss@mail.ru>
Extended squash_down.png icon to 16x16 pixels

Original icon was made 16x15 by mistake.

Bug: 443930
Change-Id: I7a38fc113575149d9b5a4df1b523ebbd372feef0
Signed-off-by: Vadim Dmitriev <dmgloss@mail.ru>
Include word "Edit" in tooltip of "Amend" toolbar button

Maybe that will make more clear what it does, for people that don't yet
know what "amend" means.

Bug: 443782
Change-Id: I932c65ad37f0b097c32898f58f2b21dd991541c7
Signed-off-by: Robin Stocker <robin@nibor.org>
New EGit project logo

The voting for the new logo was held here
https://wiki.eclipse.org/EGit/Logo

Bug: 441460
Change-Id: Ie3317f6ab6d5e7913b790268f89656f6c806d64d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Also-by: Robin Stocker <robin@nibor.org>