[findBugs] Silence serialization warnings

These classes are not meant to be serializable.

Change-Id: I8e1a4c05014348e4b81e9baadd6c1408c43e70a4
Signed-off-by: Robin Stocker <robin@nibor.org>
Fix NPE when comparing index with HEAD for initial commit

Before the initial commit, HEAD's object ID is null, so use an empty
element in this special case.

Change-Id: Ib99e822c34607ec9cefd825ba94b91fec0c7f331
Signed-off-by: Robin Stocker <robin@nibor.org>
Correct encoding for compare views of Tree Compare

When the Tree Compare was opened for comparing files from two commits,
the default encoding was used for the individual file compare views.

Now it tries to get a better encoding through
CompareCoreUtils.getResourceEncoding, as we do in other places.

Also, to discourage the use of FileRevisionTypedElement without
specifying an encoding, the constructor without encoding is removed, as
the last usages of it were in Tree Compare.

Bug: 388425
Change-Id: I27c5d715905b65534c24bbced88d95403d4434a0
Signed-off-by: Robin Stocker <robin@nibor.org>
Improve layout of decorator preference page

- Move links into general tab, to save vertical space (in the CVS
  decorator preference page, they are also there)
- Only fill lower part vertically (top part doesn't need more space)

The description label had to be moved to createContents because it was
causing layout issues.

Change-Id: Iaa1002d69cb7b2fa3f80e52b8b42b1e07a5eb6d1
Signed-off-by: Robin Stocker <robin@nibor.org>
Merge "Improve layout of decorator preference page"
[historyView] Rebase: Pass a better Ref as upstream

JGit change I1333a8dd170bb0077f491962013485efb6f2a926 is about improving
the ours/theirs conflict markers during rebase. The way the rebase
action worked before, it would always pass the commit ID to rebase,
which is not very helpful during a rebase conflict.

This change makes it use a Ref if there is one. If there are multiple
refs pointing to the selected commit:

- and if the branch being rebased tracks another one, this tracked
  branch should be the one to pick if it's in the list
- otherwise pick a remote tracking branch if it's in the list

Also adds a "does it work at all?" test for rebase in History view.

Bug: 336819
Change-Id: Ib78c3e8965e2f57e2c844a065629511ab1158160
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Merge "Correct encoding for compare views of Tree Compare"
Merge "Fix NPE when comparing index with HEAD for initial commit"
Add context menu to Tree Compare and provide a selection

Bug: 355637
Change-Id: I98d10a4aa3a9b03ec8f46b2b2373c83e2e078192
Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
Signed-off-by: Robin Stocker <robin@nibor.org>
Fix conflicting and add missing mnemonics

Change-Id: I437028cf6db80b6899979a2a679d78009e9b1b91
Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
Don't show context menu if the selection is empty

Change-Id: I690d1c0b36e925891b5f33e8eca7a15caacfa908
Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
Allow users to push to upstream when committing

I added a checkbox to the commit dialog that allows a user to commit
and push to upstream in a single step.

Bug: 330048
Change-Id: Ic5a9c42c2c5ab5e6ba86ee0e0098507f8cd31d9f
Signed-off-by: Andre Dietisheim <adietish@redhat.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Fix NPE in CompareTreeView.reactOnOpen

Bug: 388816
Change-Id: I40b704b61e0abd976bed7c7f5c77b731f18b2d19
Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
Use headline style for 'New Branch...' push button

Change-Id: I299ee4268ef229b7271c19349e07c609777fa9d8
Signed-off-by: Dani Megert <Daniel_Megert@ch.ibm.com>
[sync] Restore configured synchronization after eclipse exit

Now synchronization configuration is persisted between eclipse sessions.
Users can also "pin" configured synchronization.

Bug: 354829
Change-Id: I2f24b557e77e6ed155f206056ca1a24d4827ecd1
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Merge "[findBugs] Silence serialization warnings"
Remove special casing of Tab without modifiers for traversal

The default of Ctrl+Tab already works without this, and there's no
reason for deviating from the default traversal method here.

Bug: 386843
Change-Id: I354875b430e5dbc0802e80115f956aa1655e68c8
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Remove unnecessary handling of Ctrl+Enter in CommitDialog

It already works without this. Maybe it was needed before the widget was
a StyledText.

Bug: 386843
Change-Id: Ia8e4f6ae19a0b58b56b393698a686280805dc858
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
[stagingView] Allow <any modifier>+Enter for commit

This makes it consistent with the Commit dialog and other text fields.

Bug: 386843
Change-Id: I70eea050fc51726f9164a17270e8836c677cc4f4
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
[stagingView] Only show commit shortcut in tooltip when it works

Otherwise the expectation may be that the shortcut always works,
regardless of focus. But it only works when the commit message text
widget has focus.

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