4 years agoMerge branch 'stable-0.8'master
Shawn O. Pearce [Mon, 14 Jun 2010 15:30:07 +0000]
Merge branch 'stable-0.8'

* stable-0.8:
  Qualify post-0.8.4 builds
  EGit 0.8.4
  EGit 0.8.3

Change-Id: I8e48edb8ead2e2ef2c6d3e304e638c52c76b0c72

4 years agoQualify post-0.8.4 buildsstable-0.8
Shawn O. Pearce [Mon, 14 Jun 2010 15:29:21 +0000]
Qualify post-0.8.4 builds

Change-Id: Ie2d1ab2a4a481652e46050269806161b894fddb5
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

4 years agoStart 0.9 development
Shawn O. Pearce [Mon, 14 Jun 2010 15:28:47 +0000]
Start 0.9 development

Change-Id: Ic3885ffb4ee460415fe5eb956616a3ac7a1f3fcb
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

4 years agoEGit 0.8.4v0.8.4
Matthias Sohn [Mon, 14 Jun 2010 13:51:27 +0000]
EGit 0.8.4

Created wrong tags for 0.8.3 hence creating another version.

Change-Id: Ib850faa0f145bc01a50871921bba0a926b0a871e
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoNullPointerException in Git History View
Mathias Kinzler [Mon, 14 Jun 2010 06:58:32 +0000]
NullPointerException in Git History View

This occurs because these menu actions are implemented
using a preference change listener. When the page is disposed,
the corresponding actions are not disposed by the history framework,
so the registered actions keep listening for the preference changes.
To reproduce, open a Git History, then open "History" on some non-
Git controlled object in order to dispose the page. Open again a Git
History page, then click on the view menu -> Wrap comments (or any
other action there).
The fix actively disposes the registered actions when the page is disposed.

Bug: 316277

Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoEGit 0.8.3
Matthias Sohn [Mon, 14 Jun 2010 00:06:16 +0000]
EGit 0.8.3

Change-Id: I3bfc5e4396f10a3db6d138f8265e7ba79c0d1073
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoHonor workbench setting for Dialog font
Mathias Kinzler [Fri, 11 Jun 2010 11:32:59 +0000]
Honor workbench setting for Dialog font

If a (non-standard) dialog font has been select in the workspace prefrences,
it must be set in all dialogs and wizard pages.
Note that this does not include the RepositorySearchDialog, since
there is an outstanding fix for this which will take dialog font
setting into account.

Bug: 309581
Change-Id: I2ebbcd983fa10e2077893658dc02b64a70d1a41e
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoThe "Add Repositories" dialog should not scan automatically
Mathias Kinzler [Fri, 11 Jun 2010 10:07:27 +0000]
The "Add Repositories" dialog should not scan automatically

The "Search" button was added back since automatically scanning
the "last used" directory was considered harmful. In order to
better guide the user, suitable message texts are now used
in the title area of the dialog.

Bug: 315285
Change-Id: I16bfa8190acecebc192df9be92d8268f44a005fc
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoWrong warning message in SourceBranchPage
Mathias Kinzler [Fri, 11 Jun 2010 06:26:04 +0000]
Wrong warning message in SourceBranchPage

Symptom:
In the clone wizard (Git Repositories -> Clone a Git repository) paste a
local folder which does not contain a repo and press next. Now there is a
message "Source Git Repository is empty".
Now go back, correct the path and press next again. The message is still
there.

Bug: 314616
Change-Id: I487872818e02486880f29946c4eb7367f1740fab
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoCheck for unsaved changes before Commit
Mathias Kinzler [Thu, 10 Jun 2010 08:29:09 +0000]
Check for unsaved changes before Commit

Before the commit dialog is opened, the
user should be warned of unsaved changes and
have the option to save the changes or abort the
commit action.

Bug: 315702
Change-Id: I61014d008159951e73bbc7fdc24334f2ae75eb2e
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoBranch Selection Dialog: mark checked out branch
Mathias Kinzler [Mon, 7 Jun 2010 07:56:13 +0000]
Branch Selection Dialog: mark checked out branch

On the BranchSelectionDialog, the checked out branch or
tag should be marked and made visible. Currently this is
only working if the curerntly checked out branch is a local
branch. The fix makes this work also for remote branches
and tags.

Bug: 315167 (only first part)
Change-Id: I414277654c47f32d95f048f21fc7637e3a88cd4d
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoFix build
Jens Baumgart [Tue, 8 Jun 2010 16:25:25 +0000]
Fix build

Adapt EGit to JGit change Ifc4278078b298781d55cf5421e9647a21fa5db24
"Repository can be configured with FS"

Change-Id: Icdb60dda0477021a4be6f1032cb6fffbab983ab2
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

4 years agoConvert EGit UI Tests Plug-in into a fragment.
Mathias Kinzler [Mon, 7 Jun 2010 13:33:23 +0000]
Convert EGit UI Tests Plug-in into a fragment.

This simplifies access to the internals of the tested plug-in
and reduces the number of plug-ins.

Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoRemember to dispose the clipboard after use
Alex Blewitt [Fri, 4 Jun 2010 18:49:05 +0000]
Remember to dispose the clipboard after use

Once the clipboard is acquired, we should dispose of it afterwards to
prevent memory and resource leaks.

Not all the text on the clipboard will be text; if it isn't, then we'll
get a null back. Handle that case specifically.

If the text begins (or ends) with whitespace, trim it before checking.

Bug: 315589
Change-Id: I1b8eeae47b880b6eef689ca359f9c67e93e7e999
Signed-off-by: Alex Blewitt <Alex.Blewitt@gmail.com>

4 years agoAllow Git repository to be pre-filled from clipboard
Alex Blewitt [Fri, 4 Jun 2010 00:15:50 +0000]
Allow Git repository to be pre-filled from clipboard

If the user has copied a clipboard already, then we can access that
from the SWT clipboard. If it looks like a transport we know about
(as reported by Transport.canHandleProtocol) then we pre-fill the
connection dialog with that as the URI.

Since we need to fill in the user/port combinations, refactor out
the code which does this on keypress and instead call that function,
but only once, and only after all the fields have been created.

Bug: 315589
Change-Id: I2fd6f0d68b4908f938eb5b2df8cd4f99e674e74d
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoGit Import Projects: always show directories
Mathias Kinzler [Wed, 2 Jun 2010 16:15:55 +0000]
Git Import Projects: always show directories

Currently, the import projects wizard only shows the working
directory tree if it is started from the clone wizard. The
working directory tree should also be shown when the wizard
is started from the Git Repositories view in order to improve
usability. If a subfolder of the working directory is selected
for starting this wizard, the selected folder should be marked
in the wizard's tree. The user can still change the selected
folder before hitting "Next".

Bug: 315169
Change-Id: Ifc3411ddf41f56567ab7aaebb3b0398ca7899655
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoFix push dialog title
Alex Blewitt [Thu, 3 Jun 2010 23:30:44 +0000]
Fix push dialog title

When right-clicking on a git project, and doing 'push', the dialog is titled
'Push to another repositories' However, not only is this ungrammatical, you
can't push to more than one in this dialog box anyway.

It should be Push to Another Repository

Bug: 315594
Change-Id: I5fc139ff52508e38e6678c9547ca7f82b3287206
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoUse informational icon for 'hidden repositories'
Alex Blewitt [Thu, 3 Jun 2010 23:17:42 +0000]
Use informational icon for 'hidden repositories'

When one or more git repositories have been added in the Git Repositories view,
a warning message is shown in the dialog area with 'n directories are hidden as
they have already been added'.

This shouldn't be a warning message with a warning icon; it should be
informational, at best.

Bug: 315558
Change-Id: Ia0fe21228c52fad72977fabeb2bb38960dd06eb8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoAvoid Error in Import Wizard after clone
Mathias Kinzler [Wed, 2 Jun 2010 06:02:48 +0000]
Avoid Error in Import Wizard after clone

The fix selects the freshly cloned Repository in the
Repository selection page.

Bug: 315174

Change-Id: I4ff59335783c6e4fa912431bd2e20ef4990a8812
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoImplement CommitFileRevision.equals() and hashCode() so editors can be reused
Remy Suen [Fri, 23 Apr 2010 00:40:00 +0000]
Implement CommitFileRevision.equals() and hashCode() so editors can be reused

When editors are asked to be opened in the Eclipse workbench, the
default behaviour is to simply activate an existing editor if an
existing editor shares the input with the input that is to be
opened. The contract for comparing editor inputs is via the
equals(Object) method. For a FileRevisionEditorInput, this
is implemented by checking the equality between the two inputs'
underlying file revisions. As such, CommitFileRevision should
implement equals(Object) (and hashCode() for consistency) so that
the same editor can be reused instead of having multiple editors
open on a given revision.

Change-Id: I2abeef934b21986979f84f9836e0bf2b44eff41f
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoMerge branch 'stable-0.8'
Shawn O. Pearce [Wed, 2 Jun 2010 23:19:44 +0000]
Merge branch 'stable-0.8'

* stable-0.8:
  Qualify post 0.8.1 builds
  EGit 0.8.1

4 years agoQualify post 0.8.1 builds
Shawn O. Pearce [Wed, 2 Jun 2010 23:10:46 +0000]
Qualify post 0.8.1 builds

Change-Id: Ia99ef4fc864396a3369e0e99a6d3d0c62c00bbaf
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

4 years agoEGit 0.8.1v0.8.1
Shawn O. Pearce [Wed, 2 Jun 2010 22:09:17 +0000]
EGit 0.8.1

Change-Id: I3901b45d428dbf09427cb6c4abb1ad848474905e
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

4 years agoMerge branch 'stable-0.8'
Shawn O. Pearce [Wed, 2 Jun 2010 21:19:15 +0000]
Merge branch 'stable-0.8'

* stable-0.8:
  Update egit help for 0.8.0 from wiki
  Show untracked files per default and remember last selection
  Import wizard does not remember last wizard
  Missing Push URI

4 years agoUpdate egit help for 0.8.0 from wiki
Matthias Sohn [Wed, 2 Jun 2010 00:56:48 +0000]
Update egit help for 0.8.0 from wiki

Change-Id: I1bee00fc75f619e35dc64ccead61a507f58855a8
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoShow untracked files per default and remember last selection
Stefan Lay [Tue, 1 Jun 2010 15:13:02 +0000]
Show untracked files per default and remember last selection

The old behaviour was not intuitive. Additionally many users
want to see the untracked files.

Bug: 314997
Change-Id: I87813befb7288f24d4144e09522bda2de5b38e97
Signed-off-by: Stefan Lay <stefan.lay@sap.com>

4 years agoImport wizard does not remember last wizard
Mathias Kinzler [Tue, 1 Jun 2010 14:11:25 +0000]
Import wizard does not remember last wizard

The page asking for the wizard to use does not
remember the "last used" wizard if it was the
"New Project" wizard. After fixing this, another
issue was found: when the "New Project" wizard
is selected initially, the tree should be disabled.

Change-Id: I366d177908d90a7f26c46805bc84b00b4cdad2dd
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoMissing Push URI
Mathias Kinzler [Mon, 31 May 2010 15:52:42 +0000]
Missing Push URI

A "Remote" configuration should be usable for "Push" even
if only a "Fetch" URI has been configured.

Bug: 314573
Change-Id: I97e2d4c5991320fb8817cf27778b64e1496943ef
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoImprove RepositoriesView performance part 2
Jens Baumgart [Wed, 2 Jun 2010 08:58:25 +0000]
Improve RepositoriesView performance part 2

Fix the remaining issues:
1. unregister listeners in dispose
2. implement listerner using private member

Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

4 years agoMerge "Improve Repositories View performance"
Chris Aniszczyk [Tue, 1 Jun 2010 17:44:33 +0000]
Merge "Improve Repositories View performance"

4 years agoMerge "Show untracked files per default and remember last selection"
Chris Aniszczyk [Tue, 1 Jun 2010 15:50:37 +0000]
Merge "Show untracked files per default and remember last selection"

4 years agoMerge "Import wizard does not remember last wizard"
Chris Aniszczyk [Tue, 1 Jun 2010 15:48:30 +0000]
Merge "Import wizard does not remember last wizard"

4 years agoImprove Repositories View performance
Jens Baumgart [Tue, 1 Jun 2010 15:27:41 +0000]
Improve Repositories View performance

RepositoriesView now uses the shared Repository instances provided by
RepositoryCache instead of creating own instances.
This enables RepositoriesView to listen to repository change events.
The auto refresh job of RepositoriesView is no longer needed.
Activator.RCS was enhanced to scan all repositories contained in
RepositoryCache. This was required because RepositoriesView is the first
client of RepositoryCache that uses Repository instances which might
not have a project in the workspace.

Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

4 years agoShow untracked files per default and remember last selection
Stefan Lay [Tue, 1 Jun 2010 15:13:02 +0000]
Show untracked files per default and remember last selection

The old behaviour was not intuitive. Additionally many users
want to see the untracked files.

Bug: 314997

Signed-off-by: Stefan Lay <stefan.lay@sap.com>

4 years agoImport wizard does not remember last wizard
Mathias Kinzler [Tue, 1 Jun 2010 14:11:25 +0000]
Import wizard does not remember last wizard

The page asking for the wizard to use does not
remember the "last used" wizard if it was the
"New Project" wizard. After fixing this, another
issue was found: when the "New Project" wizard
is selected initially, the tree should be disabled.

Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoGit Repositories View: fix label provider
Mathias Kinzler [Tue, 1 Jun 2010 07:12:29 +0000]
Git Repositories View: fix label provider

The label for "Push" nodes is currently wrong and
displays the "Fetch" URI instead of the "Push" URI.

Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoMerge "Missing Push URI"
Chris Aniszczyk [Mon, 31 May 2010 17:05:53 +0000]
Merge "Missing Push URI"

4 years agoMissing Push URI
Mathias Kinzler [Mon, 31 May 2010 15:52:42 +0000]
Missing Push URI

A "Remote" configuration should be usable for "Push" even
if only a "Fetch" URI has been configured.

Bug: 314573

Change-Id: Idcc17b123892aa97022be2235be0ec38abf02457
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoGit Repositories View: Refactoring first part
Mathias Kinzler [Mon, 31 May 2010 06:43:33 +0000]
Git Repositories View: Refactoring first part

The Git Repositories View should be refactored to use
the Object Contribution extension point for building
the context menus instead of doing this programmatically
in the View class itself.
This is the first part of this refractoring. It does not
refactor the menu contribution yet, just makes makes the previous
tree node class abstract and creates a new concrete subclass
for each tree node type in order to being able to use those
classes in the extension.

Change-Id: I33f7f343847069efdd1d211db8ca6bea5e16339a
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoFix occasional failure of UI Test GitCloneWizardTest.alteringSomeParametersDuringClone
Robin Rosenberg [Sat, 29 May 2010 23:05:43 +0000]
Fix occasional failure of UI Test GitCloneWizardTest.alteringSomeParametersDuringClone

The test created a repo one level "up" and was not cleaned between runs when
run from maven.

Bug: 314988

Change-Id: I490ea33d29ae4c16b40a22319f9c707b8742a5f3
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

4 years agoFix failing SharingWizardTest.shareProjectWithNewlyCreatedRepo
Robin Rosenberg [Sat, 29 May 2010 22:40:07 +0000]
Fix failing SharingWizardTest.shareProjectWithNewlyCreatedRepo

This test failed when run from maven because the page where the team
provider selection would occur was short circuited by Eclipse, since
only one provider exists. We could skip that part and the test would
run in maven, but not using the default options from Eclipse, or as
this patch does, add another team provider, e.g. CVS to the running
test.

Bug: 314571
Change-Id: Ia88953e6d4d4160aede97b5f0c76c9cccc08a839
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

4 years agoSpecify the Gerrit Code Review URL in our IP log
Shawn O. Pearce [Fri, 28 May 2010 22:07:54 +0000]
Specify the Gerrit Code Review URL in our IP log

This way the IP log record can link back to the actual change in
Gerrit Code Review, improving the cross-linking.

Change-Id: I05df1d9ba6f9d0411cf9e0c568a57fd3a54032a1
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

4 years agoDenote EGit consumes JGit in the project IP log
Shawn O. Pearce [Fri, 28 May 2010 21:54:35 +0000]
Denote EGit consumes JGit in the project IP log

Change-Id: I4eae7d73e01a4b94f6789af7c27d15595da733ba
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

4 years agoUpdate cache of IPzilla CQ 3905
Shawn O. Pearce [Fri, 28 May 2010 21:32:13 +0000]
Update cache of IPzilla CQ 3905

Change-Id: Iad57647a71410aeb78bc864a56109d4d67138581
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

4 years agoRepositorySearchDialog: String Externalization
Mathias Kinzler [Fri, 28 May 2010 11:14:44 +0000]
RepositorySearchDialog: String Externalization

Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoMerge "Extract public class RepositoryCache from GitProjectData"
Mathias Kinzler [Fri, 28 May 2010 10:25:40 +0000]
Merge "Extract public class RepositoryCache from GitProjectData"

4 years agoMerge "Project org.eclipse.egit.doc does not need Java nature"
Mathias Kinzler [Fri, 28 May 2010 10:22:14 +0000]
Merge "Project org.eclipse.egit.doc does not need Java nature"

4 years agoUpdate EGit eclipse help from wiki
Matthias Sohn [Fri, 28 May 2010 08:34:37 +0000]
Update EGit eclipse help from wiki

- Update "EGit user guide" from
     http://wiki.eclipse.org/EGit/User_Guide

Also include additional git documentation:
- "Git for Eclipse Users" from
     http://wiki.eclipse.org/EGit/Git_For_Eclipse_Users

Remove the following wiki pages since they are specific to Eclipse foundation
and not interesting for other Eclipse users:
- "Git at Eclipse" from
     http://wiki.eclipse.org/Git
- "Migrating to Git at Eclipse" from
     http://wiki.eclipse.org/Git/Migrating_to_Git

Change-Id: I9a664f93910f1bd983786c57223296bceaee1c1a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoProject org.eclipse.egit.doc does not need Java nature
Matthias Sohn [Fri, 28 May 2010 08:16:20 +0000]
Project org.eclipse.egit.doc does not need Java nature

This bundle only contains help content and no Java sources so far.

Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoFix SWTBot test: Use ceiling directory
Stefan Lay [Fri, 28 May 2010 07:17:19 +0000]
Fix SWTBot test: Use ceiling directory

The SharingWizardTest did not work in the maven build.
The test assumes that no git repository is found above
the test project. When the junit-workspace was located
inside a git repository this condition was not fulfilled.

This is fixed using a MockSystemReader and a
ceiling directory.

Change-Id: I25913a2709512e25c211a31d431514561259bf80
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoExtract public class RepositoryCache from GitProjectData
Jens Baumgart [Thu, 27 May 2010 16:30:19 +0000]
Extract public class RepositoryCache from GitProjectData

GitProjectData contains a cache for Repository instances.
This cache is used for Reposiotry instances related to
projects. Since there are also Repository instances with no
related project (e.g. in RepositoriesView) the cache was moved
to a public class RepositoryCache to enable sharing Repository
instances even if there is no related project.

Change-Id: I5526362279d87fd6f2651ee991bb08ea4cd65c2b
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

4 years agoMake dependency on wikitext bundles optional
Matthias Sohn [Thu, 27 May 2010 16:10:55 +0000]
Make dependency on wikitext bundles optional

We only need the wikitext jars during maven build when updating the help
content from the egit wiki. If these dependencies are not optional the
installation of egit fails on Eclipse installations that do not have
wikitext.

Bug: 314707
Change-Id: Ic340f8ee268fea70c50be34c0072444734911290
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoFix RepositorySearchDialog
Matthias Sohn [Thu, 27 May 2010 11:06:01 +0000]
Fix RepositorySearchDialog

This fixes the following problems:

1) the filtered tree was rendered twice on the dialog
2) the search result was empty, even if the directory
input field was prefilled with an existing directory

Change-Id: I1df69ee15209f6a565bcdc8d553fe20f9ea159da
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoLabel texts should use sentence case
Matthias Sohn [Wed, 26 May 2010 23:51:20 +0000]
Label texts should use sentence case

Bug: 312100
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoAdd mnemonics to menus
Stefan Lay [Wed, 26 May 2010 16:22:39 +0000]
Add mnemonics to menus

Eclipse menus should be easily accessible by keyboard.
Mnemonics help the user to directly access the desired
menu item.

Signed-off-by: Stefan Lay <stefan.lay@sap.com>

4 years agoMerge "Fix missing support for monitor == null"
Chris Aniszczyk [Wed, 26 May 2010 14:20:11 +0000]
Merge "Fix missing support for monitor == null"

4 years agoFix missing support for monitor == null
Jens Baumgart [Wed, 26 May 2010 13:53:18 +0000]
Fix missing support for monitor == null

Fix implementors of IEGitOperation.execute:
monitor == null is supported now.

Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

4 years agoMerge "Use latest wikitext for help generation and add additional wikis"
Chris Aniszczyk [Wed, 26 May 2010 13:52:42 +0000]
Merge "Use latest wikitext for help generation and add additional wikis"

4 years agoMerge "Retrieve wikitext jars via OSGi dependencies and maven"
Chris Aniszczyk [Wed, 26 May 2010 13:40:41 +0000]
Merge "Retrieve wikitext jars via OSGi dependencies and maven"

4 years agoFix JavaDoc in IEGitOperation
Jens Baumgart [Wed, 26 May 2010 12:54:15 +0000]
Fix JavaDoc in IEGitOperation

Fix JavaDoc of method execute.

Bug: 312768
Change-Id: I1f5f329881ce1951dedb566e9e0de01ff1f0973f
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

4 years agoUse latest wikitext for help generation and add additional wikis
Matthias Sohn [Wed, 26 May 2010 00:54:46 +0000]
Use latest wikitext for help generation and add additional wikis

With wikitext 1.3 the ant script can be simplified heavily. Also add
additional wikis to be included in the EGit documentation.

Change-Id: I3b9fb4bb65fe45d51fdd77e2356c0e722e10377c
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoRetrieve wikitext jars via OSGi dependencies and maven
Matthias Sohn [Tue, 25 May 2010 12:00:17 +0000]
Retrieve wikitext jars via OSGi dependencies and maven

Previously the required wikitext binaries were committed into the repository.
Instead we are now downloading them from the wikitext p2-repository during
the build.

Change-Id: I92fb710ad2e7c4d1099686176bdfe6845abd632a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoSilence a javadoc diagnostic with Eclipse 3.4
Robin Rosenberg [Tue, 25 May 2010 22:08:34 +0000]
Silence a javadoc diagnostic with Eclipse 3.4

The FilteredCheckboxTree.getRefreshJobDelay method overrides
a method in Eclipse 3.5, which means it does not require
a javadoc. The project settings reflects and enforces this,
which does not work with Eclipse 3.4 since getRefreshJobDelay
is a new method there and the compiler flags this as an error.

Since this is the only place where this is a problem we create
a javadoc comment instead of relaxing the rules.

Change-Id: I9861336bb7b81d398119d4355e0fe3d303c38b55
Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>

4 years agoMake FilteredCheckboxTree compatible with Eclipse 3.4
Chris Aniszczyk [Tue, 25 May 2010 17:45:35 +0000]
Make FilteredCheckboxTree compatible with Eclipse 3.4

When we added FilteredCheckboxTree support to EGit, we broke
compatibility with Eclipse 3.4 by calling a 3.5+ constructor
on FilteredTree. The fix is to call the older constructor.

Change-Id: I1d4ee2fcbf9863b4957f7369843c5a292a8dee93
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

4 years agoMerge "Improve JavaDoc of IEGitOperation"
Chris Aniszczyk [Tue, 25 May 2010 16:48:50 +0000]
Merge "Improve JavaDoc of IEGitOperation"

4 years agoImprove JavaDoc of IEGitOperation
Jens Baumgart [Tue, 25 May 2010 15:44:29 +0000]
Improve JavaDoc of IEGitOperation

JavaDoc of method getSchedulingRule was extended.

Bug: 312768
Signed-off-by: Jens Baumgart <jens.baumgart@sap.com>

4 years agoMerge "Improve layout of tagging dialog"
Chris Aniszczyk [Tue, 25 May 2010 13:56:34 +0000]
Merge "Improve layout of tagging dialog"

4 years agoFix compare error by checking if blob is contained in commit
Stefan Lay [Tue, 25 May 2010 10:41:30 +0000]
Fix compare error by checking if blob is contained in commit

Opening compare editor on a deleted file in the file list
of the History View caused a message to be logged. The
reason was that the blob was not found in the commit.

This patch makes use of code that was already available
for other compare actions. To allow for reuse, a new
class CompareUtils is introduced.

Bug: 312852
Signed-off-by: Stefan Lay <stefan.lay@sap.com>

4 years agoImprove layout of tagging dialog
Matthias Sohn [Mon, 24 May 2010 22:32:48 +0000]
Improve layout of tagging dialog

Width of commit selection combo and consequently also the tagging dialog
grew too large if there were commit messages with a long header line.
Also commit selection combo didn't get enough vertical space when opened
initially.

Bug: 314053
Change-Id: Icd65e211968ed87acc3c0e936ac29239a994743a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoDialog improvements with TitleAreaDialog
Chris Aniszczyk [Mon, 24 May 2010 16:48:54 +0000]
Dialog improvements with TitleAreaDialog

A few of the dialogs were improved by extending TitleAreaDialog
instead of the vanilla JFace Dialog class.

Change-Id: Iec1cf7668e687c0e0e86072bc2eb933d06709667
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

4 years agoUse a FilteredTree in BranchSelectionDialog
Chris Aniszczyk [Mon, 24 May 2010 16:09:15 +0000]
Use a FilteredTree in BranchSelectionDialog

To improve the usability of the branch selection dialog, we will
add a filtered tree to help users navigate things.

Bug: 314132
Change-Id: If1b9e2ab3a69c1d47d212eb089b644b4af269715
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

4 years agoHandle InvalidMergeHeadsException
Chris Aniszczyk [Mon, 24 May 2010 15:09:21 +0000]
Handle InvalidMergeHeadsException

Change-Id: Idfbaca9dd585dd837478c39ffd385c53980bf9f1
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

4 years ago'Label Decorations' preference page has conflicting mnemonics
Chris Aniszczyk [Mon, 24 May 2010 13:57:02 +0000]
'Label Decorations' preference page has conflicting mnemonics

Bug: 309609
Change-Id: I003fa85ecf1934a02e4b14ff6f788dd69cb11d24
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

4 years agoAdd action to trigger (fast-forward) merge
Stefan Lay [Thu, 20 May 2010 13:33:33 +0000]
Add action to trigger (fast-forward) merge

Add a new action to the team menu which opens
a merge dialog where a branch can be selected.

Currently jgit supports only fast-forward merges,
therefore the action label is "Fast-forward merge..."

In order to achieve better reuse the BranchSelectionDialog
is refactored.

Change-Id:  I3a97d262fd4032d8cc045e94429608b49a937c0f
Signed-off-by: Stefan Lay <stefan.lay@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

4 years agoRepositorySearchDialog improvements
Chris Aniszczyk [Mon, 24 May 2010 02:00:53 +0000]
RepositorySearchDialog improvements

The repository search dialog was improved to take advantage of
a new FilteredCheckboxTree. The layout of the dialog itself
was also improved.

Change-Id: Icd3b3e5d5c6ae136c44b9e70c53d73e10759a0a4

4 years agoAdd tag icon for tags in tag list in CrateTagDialog
Dariusz Luksza [Sat, 22 May 2010 12:18:03 +0000]
Add tag icon for tags in tag list in CrateTagDialog

Adds tag icon for each tag that is in 'Existing tags' list in
CreateTagDialog.

Change-Id: Ib11cdcc7df976368fa64d6d26a5de339864cb57e
Signed-off-by: Dariusz Luksza <dariusz@luksza.org>

4 years agoGit Repostiories View: add context menu for fetch and push wizards
Mathias Kinzler [Fri, 21 May 2010 08:08:41 +0000]
Git Repostiories View: add context menu for fetch and push wizards

This makes the fetch and push wizards available from the Git Repositories View.

Change-Id: If8fb891ca4d4a79c00e4774ba0ef0382fee58654
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoPerform commit in a Job
Stefan Lay [Fri, 21 May 2010 15:27:13 +0000]
Perform commit in a Job

Put the commit logic into a new CommitOperation.
Run the CommitOperation in a Job and report
progress. Allow for canceling before the index is
written to disk.

Bug: 313858
Signed-off-by: Stefan Lay <stefan.lay@sap.com>

4 years agoAdd new icons for track and untracking changes.
Chris Aniszczyk [Fri, 21 May 2010 00:58:32 +0000]
Add new icons for track and untracking changes.

The old icons weren't representative enough of tracking. The
icons were updated to use glasses to represent tracking.

Change-Id: Ib6125cb9f3d730d08b5b2a2cb043a909675b1f8d
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

4 years agoMerge "Better icon for assume unchanged action"
Chris Aniszczyk [Fri, 21 May 2010 00:55:56 +0000]
Merge "Better icon for assume unchanged action"

4 years agoBetter icon for assume unchanged action
Matthias Sohn [Thu, 20 May 2010 15:38:58 +0000]
Better icon for assume unchanged action

A green plus doesn't imply that changes will not be considered.
Also already provide the icon for the no-assume-unchanged action
which isn't available yet.

Change-Id: I61a3bcd8e77b375dc6a1cc7a85847527895c0167
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoMerge "Git Label Decorations of "detached" HEAD"
Chris Aniszczyk [Thu, 20 May 2010 15:21:19 +0000]
Merge "Git Label Decorations of "detached" HEAD"

4 years agoMerge "Git Repositories View: avoid parallel scheduling of auto-update job"
Matthias Sohn [Thu, 20 May 2010 12:02:17 +0000]
Merge "Git Repositories View: avoid parallel scheduling of auto-update job"

4 years agoGit Repositories View: use the new, cool icons
Mathias Kinzler [Thu, 20 May 2010 06:49:51 +0000]
Git Repositories View: use the new, cool icons

This does away with the ugly import/export icons for visualizing
push/fetch specifications by replacing them with the new ones. It also
adds a new icon for the "Remote specification" node.

Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoRemove Unused Texts from UIText.java and corresponding properties
Mathias Kinzler [Wed, 19 May 2010 18:36:39 +0000]
Remove Unused Texts from UIText.java and corresponding properties

Bug: 309552
Change-Id: Ib8153b55c5479a37dd2dc617e7f0a287671e56c4
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

4 years agoGit Repositories View: avoid parallel scheduling of auto-update job
Mathias Kinzler [Wed, 19 May 2010 18:40:13 +0000]
Git Repositories View: avoid parallel scheduling of auto-update job

If the update takes longer than the auto-update refresh rate, the current
implementation will schedule the update job even if the last one is still running.
This checks if an auto-update job is already running and simply skips this
auto-update.

Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoIcon and menu cleanup
Chris Aniszczyk [Wed, 19 May 2010 17:47:56 +0000]
Icon and menu cleanup

The current set of menu entries lack icons and aren't
organized in a coherent manner. This commit restructures
the order of the team menu entries and adds icons.

Bug: 313588
Change-Id: Iab813336f66328f5a3b7b2e3dbfffc1e79c1d094
Signed-off-by: Chris Aniszczyk <caniszczyk@gmail.com>

4 years agoGit Repositories View: Simple fetch and push
Mathias Kinzler [Wed, 19 May 2010 09:41:19 +0000]
Git Repositories View: Simple fetch and push

This allows to execute fetch and push by a simple context menu on the
fetch/push specification in the Git Repositories View.

The actions provided here might also be helpful for
Bug: 312586

Change-Id: I275a0c01c0fcec3e7e9a9d4e5c1b3d3a03df940d
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoChange UIText.java so that "Find Broken Externalized Strings" works
Mathias Kinzler [Wed, 19 May 2010 05:40:23 +0000]
Change UIText.java so that "Find Broken Externalized Strings" works

The current implementation of UIText.java has the bundle name
inlined. Unfortunately, this results in the "Source->Find Broken Externalized
String" workbench action to not find any unused or otherwise inconsistent
keys (an info dialog is displayed saying "No NLS properties files found...".
This fix does not actually fix inconsistencies in the externalized Strings, just
enables the tool to find such inconsistencies (there are currently 42 unused keys
in the UIText.java).

Bug: 309552 (not completed, just as preparation)

Change-Id: I59d831cf1bce49cdc4043232277ec1c862fbce02
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoGit Repositories View: auto-refresh
Mathias Kinzler [Tue, 18 May 2010 16:52:48 +0000]
Git Repositories View: auto-refresh

This addresses the bug below, but in a more general manner:
a periodic (every 10 seconds) job will look for Repository changes
and refresh the tree if such changes are found.

Bug: 312993
Change-Id: Iee00e1ca7fbf865e4fd59acc904803ded933b3df
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoGit Label Decorations of "detached" HEAD
Mathias Kinzler [Tue, 18 May 2010 17:27:39 +0000]
Git Label Decorations of "detached" HEAD

In the case of "detached" HEAD, currently, there is only
the commit ID (truncated) shown in the Project label decoration.
This fix implements the suggestions collected in a mail thread
on the egit-dev mailing list by adding the information which
tag or remote branch is pointing to the currently checked out
branch.

Change-Id:  I70c791f9552c6201b1c66488ab45f8186ec4c28d
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoGit Repositories View: fix Branch Creation page
Mathias Kinzler [Tue, 18 May 2010 06:31:00 +0000]
Git Repositories View: fix Branch Creation page

Only local branches can be created directly. This fix
adjusts the BranchCreation page accordingly which
wrongly suggest to the end user they can create
remote branches.

Change-Id: I7cfc69d9fbae9299c7c2f5f3e86f4ae587503340
Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>

4 years agoMerge "BranchSelectionDialog: allow check-out of tags"
Matthias Sohn [Tue, 18 May 2010 14:44:18 +0000]
Merge "BranchSelectionDialog: allow check-out of tags"

4 years agoMerge "Add a SWTBot test case for the sharing wizard"
Mathias Kinzler [Tue, 18 May 2010 09:16:22 +0000]
Merge "Add a SWTBot test case for the sharing wizard"

4 years agoMerge "Prevent NPE when comparing an untracked file with the index"
Stefan Lay [Tue, 18 May 2010 08:50:49 +0000]
Merge "Prevent NPE when comparing an untracked file with the index"

4 years agoAdd a SWTBot test case for the sharing wizard
Stefan Lay [Tue, 18 May 2010 08:42:39 +0000]
Add a SWTBot test case for the sharing wizard

Add a UI test for the simplest scenario: create a
repository and share a project from the wizard.

Change-Id: I7827ed6f5987a8d4a97ff0ca414ee56b92e1c5b4
Signed-off-by: Stefan Lay <stefan.lay@sap.com>

4 years agoBranchSelectionDialog: allow check-out of tags
Mathias Kinzler [Tue, 18 May 2010 06:53:56 +0000]
BranchSelectionDialog: allow check-out of tags

Since tags can now be checked out properly, this offers the checkout for tags on the Branch Selection dialog.

Signed-off-by: Mathias Kinzler <mathias.kinzler@sap.com>

4 years agoMerge "Git Repositories View: allow tag check-out"
Chris Aniszczyk [Mon, 17 May 2010 17:22:47 +0000]
Merge "Git Repositories View: allow tag check-out"

4 years agoPrevent NPE when comparing an untracked file with the index
Remy Suen [Mon, 17 May 2010 10:13:02 +0000]
Prevent NPE when comparing an untracked file with the index

The compare request does not currently check whether a file is in
the index before displaying the compare editor. This causes
problems when the editor tries to ask the revision for its content
and JGit is unable to return something meaningful here because a
blob cannot actually be found. The fix is to check if an entry
actually exists in the index before trying to create a compare
editor input from it.

Change-Id: I9a1b8bd39aded3dcdeaf523b735f5fcf66f8d152

4 years agoMerge "Precheck selected files in the commit dialog"
Stefan Lay [Mon, 17 May 2010 09:24:54 +0000]
Merge "Precheck selected files in the commit dialog"