Workaround for bug in StyledText#addBidiSegmentListener(..)

Due to bug 400727, that listener is only called on Windows when an RTL
input language is installed. The fix is to detect this situation and
resort to a workaround: Restrict the maximum width of the message area
to MAX_LINE_WIDTH.

Bug: 400662
Change-Id: Ic05725cd37230b2ecdac769dfdadb03dacfe7276
Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
EGit v2.3.1.201302201838-r

Change-Id: I4397182fb6297f78bca53d75f39ba12aa0de9d70
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Prepare 2.3.2-SNAPSHOT builds

Change-Id: I60487ad2a84a0302b88b65daa2680461031f824c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Merge branch 'stable-2.3'

* stable-2.3:
  Prepare 2.3.2-SNAPSHOT builds
  EGit v2.3.1.201302201838-r
  Workaround for bug in StyledText#addBidiSegmentListener(..)

Change-Id: I45ceea778ec64a977f1b850820f00228e2532e34
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Place 'Search for nested projects' closer to the projects list

Bug: 400202
Change-Id: Ic276ef9f0c9be52429734ba3eabfebecad3b237e
Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Fix commit keyboard shortcut Ctrl+#

The fix for bug 356647 missed the platform in the deletion marker, so it
effectively deletes the key binding on all platforms.

Bug: 363648
Change-Id: I912d53e4cc0599a6a7f6b6376159553b93b4ac27
Signed-off-by: Markus Keller <markus_keller@ch.ibm.com>
Deploy Maven artifacts to Eclipse Nexus repository

Change-Id: I3e55a03ce7ac89b2eb6023de2a73f72162f3fbde
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Consider the ancestor when comparing with remote revisions

This changes all of the actions where comparing with a common ancestor
makes sense :
1. Compare With > Commit
2. Compare With > Branch, Tag, Reference
3. Double-click a commit in the history view
4. Right-click a commit in the history view > Compare With Workspace
5. Right-click a file in the history view > Compare With Workspace
6. Right-click a file in the commit viewer > Compare With Workspace

The only two actions that were previously ignoring common ancestors
were the comparison with a branch tag or reference, and comparisons
from history/commit viewer "with the workspace". All were modified
in order to factorize common code as much as possible.

Comparisons of files located out of the workspace (java.io.File) was
not functional because of a regression in HistoryPageInput introduced
by 5246f101fed6fe7541aa1ce8f9fec5b778beb788 that made the "singleFile"
input of the history view a Boolean instead of an actual File.
Furthermore, comparing these "local" files, which can be done through
actions numbered 3 to 6 above was incoherent : while 3 and 4 compared
the HEAD revision, actions 5 and 6 compared the working directory,
including local changes. All four now consistently take the local
changes into account.

Bug: 400943
Change-Id: I26bce7a1bde3b944f10f40eacbbdb7c41e486c0b
[stagingView] Improve usability of "Replace with" on modified

The context menu actions "Replace with File in Git Index" and "Replace
with HEAD revision" in the unstaged changes table have the same result
for MODIFIED files. Showing both is redundant and can confuse newcomers.

Therefore remove the replace with index action, as the other is easier
to understand (the mental model of the user may be that the index only
contains changed files).

Both actions are still shown for PARTIALLY_MODIFIED, where they actually
cause different results.

Change-Id: I65601162f7ef506ea270933218601322fde1e929
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Move UIText and UIIcons to the internal package

These are not part of the API and should therefore not be in a public
package and also not checked for API compatibility.

Change-Id: I8439adce61515177d36227c844d6284de700964f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Show fast forward modes in Merge dialog

Bug: 397835
Change-Id: I0a7da9403656bb883ba258c9c0d0a5438e11e10f
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
cleanup FetchGerritChangePage.doFetch()

Change-Id: I43e67dea59da80e3d1875a62d5685dfd98e0c4d6
Update p2f file for installing tools and JGit/EGit dependencies

Update to latest Orbit release and update dependencies.

Change-Id: Ifc92a9c523fd64d7233c890c34686e30f2225145
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Fix unstable DecoratableResourceAdapterTest

It failed in https://hudson.eclipse.org/sandbox/job/egit.gerrit/4256/
because it was using the workspace root as a repository, which can be
pretty unstable due to config files being added/removed.

Convert to a LocalRepositoryTestCase to fix this.

Change-Id: Ic2d0b861f9f069cabb9b0890d1e6c5a92ac67d1c
Add instanceof check to fix unchecked conversion warning

Actually check the elements of the selection to make sure that the cast
is right.

Change-Id: I2ced1ec0ba982eaf6c7be3adf5f06e294e4588d3
Fix warning in ui.test's Eclipse class

WorkbenchContentsFinder is marked @noinstantiate, which results in a
warning by the PDE tooling. The change just inlines the code of
activeWorkbenchWindow, and only executes syncExec once.

Change-Id: Ib2b20a6c1e59d55c82e3fd07a7dd23a08e22d08f
Merge "Update p2f file for installing tools and JGit/EGit dependencies"
Merge "Add instanceof check to fix unchecked conversion warning"
Fix rebase pulldown in toolbar not being accessible during rebase

During rebase, the rebase pulldown menu in the toolbar was always
disabled, resulting in no way to do a "abort" or other actions through
the toolbar.

The problem is that the enabled state of the action handler for the main
action also determines whether the pulldown menu can be opened (the
little arrow besides the icon). So instead of disabling it when rebase
is not possible, also enable it during rebase, and check state again
when executing.

In addition to the above, this fixes RebaseActionHandler's enabled state
to behave the same way as RebaseCurrentRefCommand, in that it's also
enabled with a detached HEAD.

Bug: 387184
JGit-Dependency: I9ec8568fa1100d2e9c8d4ca0e347bf77ec6d8734
Change-Id: Ic69f5c952a49f023c0949f04b3e976be1b267fbe
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Merge "Fix warning in ui.test's Eclipse class"