Permalink
Switch branches/tags
v4.8.0.201706111038-r v4.8.0.201705170830-rc1 v4.7.1.201706071930-r v4.7.0.201704051617-r v4.6.1.201703071140-r v4.6.0.201612231935-r v4.5.0.201609210915-r v4.4.1.201607150455-r v4.4.0.201606070830-r v4.4.0.201606011500-rc2 v4.4.0.201605250940-rc1 v4.4.0.201605041135-m1 v4.3.1.201605051710-r v4.3.0.201604071810-r v4.3.0.201603230630-rc1 v4.2.0.201601211800-r v4.2.0.201511101648-m1 v4.1.1.201511131810-r v4.1.0.201509280440-r v4.0.1.201506240215-r v4.0.0.201506090130-r v4.0.0.201506020755-rc3 v4.0.0.201505260635-rc2 v4.0.0.201505191015-rc1 v4.0.0.201505050340-m2 v4.0.0.201503231230-m1 v3.7.1.201504261725-r v3.7.0.201502260915-r v3.7.0.201502031740-rc1 v3.6.2.201501210735-r v3.6.1.201501031845-r v3.6.0.201412230720-r v3.6.0.201411121045-m1 v3.5.3.201412180710-r v3.5.2.201411120430-r v3.5.1.201410131835-r v3.5.0.201409260305-r v3.5.0.201409071800-rc1 v3.4.2.201412180340-r v3.4.1.201406201815-r v3.4.0.201406110918-r v3.4.0.201406041058-rc3 v3.4.0.201405281120-rc2 v3.4.0.201405211411-rc1 v3.4.0.201405051725-m7 v3.3.2.201404171909-r v3.3.1.201403241930-r v3.3.0.201403021825-r v3.3.0.201402191814-rc1 v3.2.0.201312181205-r v3.2.0.201311130903-m3 v3.1.0.201310021548-r v3.1.0.201309270735-rc1 v3.0.3.201309161630-r v3.0.2.201311090911-r v3.0.2.201309041250-rc2 v3.0.1.201307141637-r v3.0.0.201306101825-r v3.0.0.201306040240-rc3 v3.0.0.201305282000-rc2 v3.0.0.201305080800-m7 v2.3.1.201302201838-r v2.3.0.201302130906 v2.2.0.201212191850-r v2.1.0.201209190230-r v2.0.0.201206130900-r v2.0.0.201206060730-rc3 v2.0.0.201205301645-rc2 v1.3.0.201202151440-r v1.3.0.201202121842-rc4 v1.2.0.201112221803-r v1.1.0.201109151100-r v1.1.0.201109071825-rc3 v1.1.0.201109011030-rc2 v1.0.0.201106090707-r v1.0.0.201106081625-r v1.0.0.201106071701-r v1.0.0.201106051725-r v1.0.0.201106011211-rc3 v0.12.1 v0.11.3 v0.11.1 v0.10.1 v0.9.3 v0.9.1 v0.8.4 v0.8.1 v0.7.1 v0.7.0 spearce-gpg-pub
Nothing to show
Commits on Jun 21, 2017
  1. Removes the usage of StringBuffer in GitCloneWizardTestBase

    Last occurrence of this StringBuffer in EGit code
    
    Change-Id: Ieca626eb0053597f46d1e8e714e4c1c07afe196d
    Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
    vogella committed Jun 21, 2017
  2. Removes the unnecessary StringBuffer creation in CreatePatchOperation

    Change-Id: Id9de1235e607ca7e79bd9456675dae2e61c642c3
    Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
    vogella committed with Thomas Wolf Jun 20, 2017
Commits on Jun 20, 2017
  1. Merge "Merge branch 'stable-4.8'"

    msohn committed with Gerrit Code Review @ Eclipse.org Jun 20, 2017
  2. Use StringBuilder in org.eclipse.egit.ui

    StringBuilder is a drop-in replacement for StringBuffer and faster, as
    it avoids the (unnecessary) synchronization. org.eclipse.egit.ui uses in
    two places still StringBuffer, all other places are already
    StringBuilder. Usage should be consistent.
    
    Change-Id: I3615f2d2a36571f501283a974b2d370385a8bfc4
    Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
    vogella committed with Thomas Wolf Jun 20, 2017
  3. Use verbs in PushResultDialog instead of OK

    Uses IDialogConstants.Close as OK button label in PushResultDialog.
    Changes mnemonic of Configure button.
    Fixes test
    
    Bug: 518044
    Change-Id: If059d133648e809bbe0b72d8cd0835be55d73229
    Signed-off-by: David Weiser <david.weiser@vogella.com>
    daweiser committed Jun 19, 2017
Commits on Jun 19, 2017
  1. Merge branch 'stable-4.8'

    * stable-4.8:
      Prepare 4.8.1-SNAPSHOT builds
      EGit v4.8.0.201706111038-r
      Remove dependency of smartimport fragment to org.eclipse.jgit bundle
      Update documentation for 4.8.0
    
    Change-Id: I6ce9db86149e79e8468c22641052cb0fe6be8990
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Jun 19, 2017
Commits on Jun 18, 2017
  1. Staging view: add toolbar buttons to stage/unstage all files

    The buttons do not appear in the contextual action tooltip. The
    contextual actions operate on a selection, whereas the new
    "stage/unstage all" actions also operate on unselected files.
    Including it in the tooltip would give a confusing UI.
    
    Also, if this action were in the tooltip, a slight mis-click would
    stage/unstage not only the selected files but all of them. Although
    that would not be a severe problem (the changed files are selected
    after the operation in the target viewer, so undoing a "stage all"
    is as easy as using "unstage seleted files"), let's try to avoid this.
    
    Bug: 518213
    Change-Id: I127dae880c28f851b078736a7940dc698ab42faa
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed Jun 14, 2017
Commits on Jun 17, 2017
  1. Staging View tooltips: work around bug 330384 on GTK

    On GTK at least, the artificial inset of 5 pixels used in the
    tooltip's internal TooltipHideListener closes the tooltip before
    the mouse ever can move over the tooltip. It appears that on GTK
    the tooltip's shell gets an SWT.MouseExit event with coordinates
    inside the tooltip, but not within the smaller inset area.
    
    It's utterly unclear to me why this inset was ever programmed anyway.
    Removing it and always testing against the true bounds of the tooltip
    resolves the problem and makes it possible to move the mouse cursor
    over the tooltip, also on GTK.
    
    The behavior on MacOS is unchanged.
    
    Bug: 516969
    Change-Id: I009be811e0fee9483ed7a0827b5dfe15c4d4490f
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed with msohn Jun 14, 2017
Commits on Jun 16, 2017
  1. Oomph setup: include TPD and AnyEditTools

    TPD is needed to work with our target platforms. AnyEditTools is
    generally useful for a variety of things, including avoiding
    trailing whitespace.
    
    The only downside of this I see is that both TPD and AnyEditTools
    are unsigned and thus the user will be presented with a dialog
    during installation.
    
    Change-Id: I37a333c28a7905d5c312b336a43b8d19d4c13094
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed with msohn Jun 14, 2017
  2. Fix the icon for the PullWithOptions command

    It was using the "pull" icon instead of "pull_with_options".
    
    Change-Id: Ia0ce56f4f04aec0b6ca4dc35114ed555d6a234b8
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed Jun 16, 2017
Commits on Jun 14, 2017
  1. Update Oomph setup

    * Update API baseline to 4.8.0.201706111038-r
    * Add second API baseline 4.7.1.201706071930-r for working on
      stable-4.8
    * remove the "Modular Target"; re-use the target as defined in the
      EGit repository. We use TPD to define our target platforms; it
      makes no sense to define them again in the Oomph setup.
    * add a step to import the projects into the workspace (was somehow
      missing for me using the Neon installer and our Egit.setup) Note
      that this must come _before_ the target platform setup, otherwise
      the target platform will not be known yet.
    
    We might consider making Oomph also install TPD as it is needed to
    work with our target platforms, and maybe Andrey's AnyEditTools,
    which I personally always install; if only to get rid of trailing
    whitespace in plugin.xml files automatically :-)
    
    Tested by using the Neon Installer, "Eclipse IDE for Eclipse
    Committers", then adding this file as "project" on the next screen
    (green plus sign top right), then installing and launching a brand-new
    Eclipse instance through the Installer.
    
    Change-Id: I4f9ffa3216fde1ae415b7177b2a1eab3d8500bb8
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed with msohn Jun 13, 2017
Commits on Jun 13, 2017
  1. Contextual actions in tooltips in staging view

    If there are selected elements in the staged/unstaged viewers,
    provide quick access to the "Add to index"/"Remove from index"
    actions via a toolbar shown in a tooltip when the mouse pointer
    hovers over a selected element.
    
    Also add those actions to the toolbars of the viewers, properly
    enabled/disabled depending on whether there is a selection in
    the viewer.
    
    Change the unstage icon: "stage" is a green plus sign, but "unstage"
    was an inverted "reset" icon. A red minus sign seems to be more
    appropriate and less confusing.
    
    Finally, add tooltips to the section headers of the staged and
    unstaged viewers with explanations that should make it easier
    for people new to git to get what this whole view is about.
    (The notion of being able to compose a commit in the git way is
    a novelty for many people new to git.)
    
    Bug: 516969
    Change-Id: I53f7d460aee079db25b78afd5a818bc7075547ce
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed with msohn May 23, 2017
  2. Change the icons for clone, add, and create repositories

    Those icons in the repositories view's toolbar were just too
    cluttered, and the small text didn't work well. Simplify the
    graphics re-using the cloud metaphor as suggested on bugzilla.
    
    Since both the folder symbol and our cloud are yellow, add a
    green arrow to the "clone" icon to distinguish it better from
    the "add" icon.
    
    The "create" icon has a yellow repository symbol and a yellow
    plus, as before. A little green plus might make that plus more
    noticeable, but I have decided against that because:
    
    * in other places in Eclipse, a _yellow_ plus signifies "add
      something new", and I didn't want to deviate from that visual
      language, and
    * the old "add" icon had a green plus, so users might get
      confused.
    
    Bug: 347081
    Change-Id: I6857cc62ed567fae368e86939a12ecf96d98698e
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed with msohn Jun 3, 2017
  3. Icon clean-up: use PNG, provide HiDPI versions, include SVG sources

    SVG source are included in the repository under the ./icons top-level
    directory.
    
    * Copy SVG source files from eclipse.platform.images where applicable
    * Replace GIFs by PNGs
    * Provide HiDPI icons
    
    Adapt references where needed (plugin.xml and UIIcons.java). Copied
    SVGs include a comment where they come from.
    
    All EGit icons have been re-done in SVG. Differences in the generated
    pixel maps are minimal.
    
    Some basic components are under ./icons/components.
    
    The old GIF and PNG icons have all been replaced by newly generated
    PNGs and all have HiDPI ("@2x") versions.
    
    Wherever possible use components from existing platform icons
    already available; this not only simplifies icon creation but
    also makes it easier to conform to the color scheme used in
    platform. This has resulted in a few minor changes where the old
    gif icons did not match the new SVGs from platform. An example are
    icons containing a "file" object, for instance the reflog view icon:
    the old gif showed a dog-ear in the bottom-right corner of the "page",
    while current platform SVGs show a dog-ear top-right. The wizard
    banner images, being larger, show more pixel-level differences. That
    was to be expected since they were all re-done from scratch using
    the current platform wizard banner styles.
    
    Icon etool16/annotate.png should be changed. It's the icon for the
    "Show Revision Information" command, which was formerly named "Show
    Annotations". With the new name, an icon symbolizing a note doesn't
    make sense anymore.
    
    Due to bug 465456 we have to keep around all GIFs used as editor
    or view icons, otherwise users may experience FileNotFoundExceptions
    when starting on an old workspace because E4 stores icon URIs in
    workbench.xmi. This concerns:
    
    * eview16/rebase_interactive.gif
    * eview16/reflog.gif
    * eview16/repo_rep.gif
    * obj16/changelog_obj.gif
    * obj16/gitrepository.gif
    
    These GIF files have been re-created; they are identical to the
    new PNGs created from the SVG sources. Otherwise users might wonder
    why they sometimes get different icons for the same thing.
    
    Bug: 517169
    Bug: 517171
    Change-Id: I9bcf9ae8d8e0473e5cd9183488d37a3d268709b0
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed with msohn May 23, 2017
  4. More fitting Decoration Support for ResourceMappings in general

    The decoration support for ResourceMappings and WorkingSets is split up
    to provide a more fitting decoration for ResourceMappings which are not
    WorkingSets.
    
    Includes tests.
    
    Bug: 498546
    Signed-off-by: Martin Fleck <mfleck@eclipsesource.com>
    Also-by: Stefan Dirix <sdirix@eclipsesource.com>
    Change-Id: I6e6306d7f00a3a26ef86178f5261a00e1804db64
    martin-fleck-at committed with Thomas Wolf Jul 27, 2016
  5. Prepare 4.8.1-SNAPSHOT builds

    Change-Id: Icdf0afe9e21e6fda56e4a6602faa4e65ac208dca
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Jun 13, 2017
Commits on Jun 11, 2017
  1. EGit v4.8.0.201706111038-r

    Change-Id: Ib6da73a29018a2581254aa085bf25b085e275931
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Jun 11, 2017
  2. Remove dependency of smartimport fragment to org.eclipse.jgit bundle

    The SmartImportGitWizard doesn't directly depend on org.eclipse.jgit.
    Its fragment host bundle org.eclipse.egit.ui already declares the
    necessary dependencies to jgit packages.
    
    Change-Id: I9b9a1a960f6e84f2778f86f13aee8eaf3ee4ce6d
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Apr 21, 2017
  3. Merge "Update documentation for 4.8.0" into stable-4.8

    msohn committed with Gerrit Code Review @ Eclipse.org Jun 11, 2017
  4. Update documentation for 4.8.0

    Change-Id: I217867b9cef53e077ef90341b189f1fcdcecfb86
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Jun 11, 2017
  5. Merge branch 'stable-4.8'

    * stable-4.8:
      Fix visibleWhen for Team->Advanced->Clean
      Prepare 4.7.2-SNAPSHOT builds
      EGit v4.7.1.201706071930-r
      Disable running autoGC in the background for EGit tests
      Backwards compatibility with Eclipse Luna & Mars
      Update Orbit to the Oxygen version R20170516192513
    
    Change-Id: Ibc574b6b95321ebbf206c81c85e42000a9adf576
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Jun 11, 2017
  6. Fix visibleWhen for Team->Advanced->Clean

    The handler introduced in commit 23ffce5 is active when either a
    RepositoryNode _or_ a Project from a git repository is selected.
    The command in the Team menu thus needs to have an explicit
    visibleWhen clause to show it only when projects are selected,
    otherwise it also appears in the Repositories View.
    
    Bug: 518098
    Change-Id: I82e658af24438a6507c7bcb1957d0d37e5d71576
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed Jun 11, 2017
Commits on Jun 8, 2017
  1. Merge branch 'stable-4.7' into stable-4.8

    * stable-4.7:
      Prepare 4.7.2-SNAPSHOT builds
      EGit v4.7.1.201706071930-r
      Disable running autoGC in the background for EGit tests
    
    Change-Id: Ia2fea92792b262083a7bd4ff9e608f80ec310748
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Jun 8, 2017
  2. Prepare 4.7.2-SNAPSHOT builds

    Change-Id: Ic06cd86d96cbbccf46c002a761d6543df8532938
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Jun 8, 2017
Commits on Jun 7, 2017
  1. EGit v4.7.1.201706071930-r

    Change-Id: Iea67d8ec4e4db9d339576cafd58f5bdaab69bda0
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Jun 7, 2017
  2. Disable running autoGC in the background for EGit tests

    If autoGC runs in the background this may lead to cleanup issues when
    tests are teared down.
    
    Change-Id: Ib6b6b6b9f8b70abf7ea3defa7b4fe6854b31e9cb
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed Jun 7, 2017
Commits on Jun 5, 2017
  1. Backwards compatibility with Eclipse Luna & Mars

    The MessageDialog varargs constructor exists only since
    org.eclipse.jface 3.12 (Eclipse Neon). Use the older constructor
    so that EGit also works on Eclipse Luna and Mars.
    
    Bug: 517806
    Change-Id: I9418db8fc726c895e9a86a64afad7674e07b5889
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed Jun 5, 2017
Commits on May 30, 2017
  1. Update Orbit to the Oxygen version R20170516192513

    Change-Id: I518e64953984ce67012e3da3eebf530305671766
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed May 28, 2017
  2. Prepare 4.9.0-SNAPSHOT builds

    Change-Id: I9d727e1cd79572167ecb05372b1583bb71cdb7db
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed May 30, 2017
  3. Merge branch 'master' into stable-4.8

    * master:
      Change confirm hard reset dialog Yes- and No-button label
      Don't auto-share for closed projects or for bare repositories
      Prevent NoWorkTreeException in GitProjectData
      Fix NPE in RepositorySelectionPage
      Fix NPE in RepositorySelectionPage
      Set focus when context menu in staging view appears
      Adds mnemonics to the buttons in the git staging view
      Remove defaultHandlers for CommitEditor commands
      CommitEditor: fix check-out button display
      Change discard local changes dialog OK-button label
    
    Change-Id: Iba126b875689381b1214c826f816fe61d08cd574
    Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
    msohn committed May 30, 2017
Commits on May 22, 2017
  1. Change confirm hard reset dialog Yes- and No-button label

    Adds new String ("&Reset") and uses it as Yes-button label for the
    confirm hard reset dialog.
    
    Changes No-Button label to "Cancel"
    
    Changes creation of MessageDialog in CommandConfirmation.
    
    Bug: 514470
    Change-Id: I7da9a33cc64b84200aed8529fbd51ed8121b18e3
    Signed-off-by: David Weiser <david.weiser@vogella.com>
    daweiser committed with Thomas Wolf May 15, 2017
  2. Don't auto-share for closed projects or for bare repositories

    For bare repositories, there's no working directory, and thus there
    cannot be anything to share. And closed projects cannot be auto-shared
    since one cannot get or set session properties. 
    
    Change-Id: Id3e054fc2bda94df03e1243093a8a5c250be2190
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed May 22, 2017
  3. Prevent NoWorkTreeException in GitProjectData

    Don't try to get the working directory of a bare repository.
    
    Bug: 517056
    Change-Id: I1f84142e1ea2aae1c2ae7ef062d7201afa382a2f
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed May 22, 2017
  4. Fix NPE in RepositorySelectionPage

    Use the correct URI, too. Somehow this change got not included in
    commit ffd9cb6 :-(
    
    Bug: 517044
    Change-Id: Ibd6600b55129a3832b412d2d73128eea09158a60
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed May 22, 2017
  5. Fix NPE in RepositorySelectionPage

    testUri.getScheme() can be null. 
    
    Bug: 517044
    Change-Id: Ia7f0d3831de22a3189634fb7df0f02bb6a87767a
    Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>
    Thomas Wolf committed May 22, 2017