lp:egit

Created by VCS imports on 2010-10-26 and last modified on 2019-08-20
Get this branch:
bzr branch lp:egit

Related bugs

Related blueprints

Branch information

Owner:
VCS imports
Project:
egit
Status:
Development

Import details

Import Status: Reviewed

This branch is an import of the HEAD branch of the Git repository at https://git.eclipse.org/r/p/egit/egit.git.

The next import is scheduled to run as soon as possible.

Last successful import was 6 hours ago.

Import started 6 hours ago on alnitak and finished 6 hours ago taking 40 seconds — see the log
Import started 13 hours ago on alnitak and finished 13 hours ago taking 40 seconds — see the log
Import started 19 hours ago on alnitak and finished 19 hours ago taking 40 seconds — see the log
Import started on 2019-08-19 on alnitak and finished on 2019-08-19 taking 40 seconds — see the log
Import started on 2019-08-19 on alnitak and finished on 2019-08-19 taking 30 seconds — see the log
Import started on 2019-08-19 on alnitak and finished on 2019-08-19 taking 2 minutes — see the log
Import started on 2019-08-18 on alnitak and finished on 2019-08-18 taking 40 seconds — see the log
Import started on 2019-08-18 on alnitak and finished on 2019-08-18 taking 30 seconds — see the log
Import started on 2019-08-18 on alnitak and finished on 2019-08-18 taking 30 seconds — see the log
Import started on 2019-08-18 on alnitak and finished on 2019-08-18 taking 40 seconds — see the log

Recent revisions

4340. By Michael Keppler <email address hidden> 9 hours ago

Remove duplicate configure fetch/push commands

The commands "configure fetch" and "configure upstream fetch" use the
same handler and the same label, therefore one of them is superfluous.
Remove the one without ".team" in the command id, since ".team" is a
convention in the list of command ids in the egit API. Redirect menus
and command images to the remaining command id.

Bug: 549997
Change-Id: I5f8129670566e2f41051f0f533dcf36947d4dd68

4339. By Michael Keppler <email address hidden> 9 hours ago

Suppress history for structural RepositoryTreeNodes

Don't adapt the structural tree nodes of the repository view to history
input. This avoids unwantedly showing the full repository history when
clicking on any of those nodes just for expanding/navigating the tree,
therefore not loosing the history of the previously selected
branch/tag/ref.

Bug:549034
Change-Id: I7761b29f6a33d9fa7b992ec296afba8a60016a70
Signed-off-by: Michael Keppler <email address hidden>

4338. By Thomas Wolf <email address hidden> 17 hours ago

[releng] Update target platform & SystemReader to JGit changes

During the fixes in JGit 5.1.9 the JGit target platform was changed,
and SystemReader got two new abstract methods.

EGit doesn't build anymore after these changes. Update the target
platform to match the one in JGit to enable building both EGit and
JGit in the same workspace, and add implementations for the two new
methods in the EclipseSystemReader.

Change-Id: Ic1392b8e140d2be118226567a71be62ba833477d
Signed-off-by: Thomas Wolf <email address hidden>

4337. By Thomas Wolf <email address hidden> on 2019-08-15

History: show diffs for merges in first-parent mode

When the history is filtered to show only first parents of merges,
use a simple file diff against that single first merge parent to
show the list of changes files, and make sure the diff is shown when
a file is selected.

Change-Id: If2f5f2a7cdd86515190b7d1619c58bd6883520b4
Signed-off-by: Thomas Wolf <email address hidden>

4336. By Michael Keppler <email address hidden> on 2019-08-15

Show standard message box on paste to repo view error

When pasting invalid content to the git repositories view, it shows the
"Problem occurred" message box due to using the status handler of
eclipse. Since this is bad user input, we should only show a message
box, and not handle this situation like an internal error.

Changed message texts to be sentence style.

Bug: 549618
Change-Id: Id6e2b4facff5deb945275e89a85d74442aa1462a
Signed-off-by: Michael Keppler <email address hidden>

4335. By Thomas Wolf <email address hidden> on 2019-08-15

Don't decorate ResourceMappings mapping only unshared resources

If a ResourceMapping has no shared resources, its state will be
untracked, which would make EGit show the "?" overlay.

Bug: 550082
Change-Id: I2bf6c1b7261907d8d49188317fc4a7768bc0f046
Signed-off-by: Thomas Wolf <email address hidden>

4334. By Michael Keppler <email address hidden> on 2019-08-15

Handle Java templates initialization error silently

If the additional variable for the Java templates cannot be registered,
only log this error to the platform log, but do not show an error
dialog.

Depending on the (currently unknown) root cause of the error, this might
happen on every start of eclipse, and users will be annoyed by an error
message that is shown on every eclipse start.

Bug: 549206
Change-Id: Ife0bf013c9f5666218447426f03002b87687f83c
Signed-off-by: Michael Keppler <email address hidden>

4333. By Michael Keppler <email address hidden> on 2019-08-15

Log exception in create branch wizard

Since we currently can only guess what causes the linked bug, we should
log the exception that causes the remote to be empty in the wizard.

Bug:548996
Change-Id: I868fd98772c275698e1ea29bb8522f8347554926
Signed-off-by: Michael Keppler <email address hidden>

4332. By Michael Keppler <email address hidden> on 2019-08-15

Always check for merge commit when opening file diff

The 2-way file diff is invoked from 3 different places in the code, but
only one of them checked whether the diff was a merge commit. Move that
check into the file diff method itself to have all 3 invocations
checked.

It might be possible that the other 2 invocations cannot be called for
merge commits due to other external logic, but let's be fault tolerant
here by always forbidding this.

Change-Id: Ieaacc0c0ddf0bdbc273891cd557ab55ff5560133
Signed-off-by: Michael Keppler <email address hidden>

4331. By Michael Keppler <email address hidden> on 2019-08-15

Bind F2 on repo node to rename of current branch

Add the ability to use F2 directly on the repository node to rename the
current branch instead of first having to expand all nodes to the
current branch.

It would have been possible to use the existing eclipse.ui.edit.rename
command (and just to add to the existing activeWhen expression), but
that has the bad side effect of the command still being labeled "Rename"
in Ctrl-3, when invoked on the repository. Therefore the old rename
handler has been attached to the rename branch command instead and a
separate key binding has been added to the repositry view, to override
the generic F2 rename binding there.

Bug: 545290
Change-Id: Idf7fd3fd6f9fba00954d6b7318b11182dcd4cb69
Signed-off-by: Michael Keppler <email address hidden>

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.

Subscribers

No subscribers.