fix local var hiding a field from ContainerTreeIterator.ResourceEntry

Change-Id: Ib60b972adb5a55b1c2c3b9fa2d6cc3d85e56f635
Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
EGit v3.4.1.201406201815-r

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

Change-Id: I4e4731e0ca00b6eb41642404a27758b59e500870
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Merge "fix local var hiding a field from ContainerTreeIterator.ResourceEntry"
Merge branch 'stable-3.4'

* stable-3.4:
  Prepare 3.4.2-SNAPSHOT builds
  EGit v3.4.1.201406201815-r

Change-Id: I7020b7182511d1e57d2a6e33bbb2e81293458beb
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Add support for cherry-picking multiple commits at once.

This modifies the Cherry Pick menu item in the History view such that
multiple selected commits may be cherry-picked at once, instead of
one-by-one.

Cherry-picking now uses the mechanics of interactive rebase. If a
conflict occurs during merging one of the commits, it needs to be
resolved manually, and then the interactive rebase may be resumed
(just like with a regular interactive rebase.)

Cherry-picking a single commit uses the same mechanics just mentioned.

Change-Id: I23d1339072c9557af530c9e3f8d6636cf24fbac1
Signed-off-by: Maik Schreiber <blizzy@blizzy.de>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Add stash commit viewer

Stash commits have different characteristics than regular commits:
- Up to 3 parents for index, working directory and untracked files
- Branches and tags do not apply
- Actions: apply, delete

CQ: 8397
Bug: 436224
Change-Id: Idca9918d83702172b8aeff9e08e3b401242d0109
Signed-off-by: Andreas Hermann <a.v.hermann@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
CommitMessageViewer is leaked after closing History view

Bug: 438330
Change-Id: Id15eaddfe3311f50b1cf5a15738e77277f5ef89d
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Fix extra "'" in stashCommitNotFound message

Bug: 436224
Change-Id: Ie13dc94c5251dbb5598cc307e72e53d0087757c1
Signed-off-by: Robin Stocker <robin@nibor.org>
Accessing configure fetch/push commands from quick access causes AIOOBE

Bug: 406121
Change-Id: Ia248e948a90d68f05a9b20170863c42a9174c406
Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
"Identify yourself" should tell, where it stores the data

Bug: 436240
Change-Id: Ibed4a48adaa4ed3a302b298d6c1937437232a173
Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
Fix RepositoriesViewCopyPath being enabled incorrectly

It should only be enabled when one of the repo nodes is selected. To
reproduce the problem, set the focus to something other than the
repositories view and invoke "Copy Path to Clipboard" via Quick Access.

Bug: 345351
Change-Id: I1635763b9e227ded33667ebc69972c567363d665
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Mark dependency to  org.eclipse.e4.ui.css.swt.theme optional

This enables installing EGit 3.5 on Eclipse platform 3.8 which some
users still use.

Bug: 438601
Change-Id: I349a05e8a9c0ab8c2bd8ec111d2a2d71dc38cf95
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Improve labels of "Identify Yourself" dialog

"User name" sounds too much like a username, when it is a Full Name
instead. Also make the message a bit less mechanic.

Change-Id: Ib5c972220303b9c23c316428710ea61824032f94
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Optimize layouts of Commit and Stash Viewer

- For short commit messages, lay out message area to preferred size
- Collapse diff sections in case of 0 diffs (common for stashes)
- Don't show "Tags: " when there are no tags

Change-Id: I336e311c5dec954de2687804201843c0640480df
Signed-off-by: Robin Stocker <robin@nibor.org>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Tab key skips 'store in Secure Store'

Bug: 391576
Change-Id: I9fa949f6d9c377e738ba1c7ecf8690435248ab95
Signed-off-by: Tomasz Zarna <tomasz.zarna@tasktop.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
RevCommit is referenced after hiding blame annotations, wasting memory

Bug: 438503
Change-Id: Ia453d0e47ad5690984ab391c24d6ced56c393acf
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Reverse src/dest order of push result dialog

Bug: 438639
Change-Id: Id2dcaa592745368f4f8e1e86217d9878e4afcdd2
Signed-off-by: Mickael Istria <mistria@redhat.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Fix grey text in push result dialog

It made sense when the text was at the end. With the reversed order, it
no longer does.

Bug: 438639
Change-Id: If87e0a4153dd028e51849a557fb2d436c669e03d
Move revision classes into new package

This unclutters the org.eclipse.egit.ui.internal package a bit.

Change-Id: I4ef31c07221e80048cc31e4d73269ddab7fbd51a