Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 344891

Summary:	[sync] Improve user experience with launching sync from 'Team' menu
Product:	[Technology] EGit	Reporter:	Dariusz Luksza <dariusz.luksza>
Component:	UI	Assignee:	Project Inbox <egit.ui-inbox>
Status:	CLOSED FIXED	QA Contact:
Severity:	enhancement
Priority:	P3	CC:	kevin, matthias.sohn, robin
Version:	0.12
Target Milestone:	1.0.0
Hardware:	PC
OS:	Linux
Whiteboard:

Description Dariusz Luksza

2011-05-05 15:38:00 EDT

Currently launching synchronization from 'Team' menu is quite painful because it requires lots of clicks in sync-dialog where we need to fill in what branches we want to synchronize. Even when the default selected options fits our needs we need to click 'OK' button or hit enter to close this dialog and start synchronization.

My current idea is to add additional option (or options) for most common synchronization configuration. IMHO apart from 'Synchronize...' option we should also have 'Synchronize Working Tree' or 'Synchronize Workspace' with will be only showing local uncommitted changes.

Another such predefined action should be something like 'Synchronize with remote tracking branch' (if current branch tracks one of remote branches). Here we should show all commits that was made locally and all incoming commits (maybe we should by default activate git change set model ?)

Comment 1 Dariusz Luksza

2011-05-05 15:38:57 EDT

I've already implement 'Synchronize Workspace' action, the changeset can be found here: http://egit.eclipse.org/r/#change,3237

Comment 2 Dariusz Luksza

2011-05-09 15:52:56 EDT

I think that Matthias Sohn in his comment (#4) on bug 344888 suggest almost perfect solution for launching synchronization from Team menu.

From my side I would like to add an extra option 'Synchronize Workspace' so that the most common use case have the shortest path. I this case user don't need to wait for nested menu and then select current branch or HEAD.

So the 'synchronize section' in Team menu would look like this:

Synchronize Workspace
Synchronize Workspace with
          |
          --- master
          --- foo
          --- bar
          --- origin/master
          --- origin/stable-0.12
          --- origin/stable-0.11
          --- tags/v0.12.1
          --- tags/v0.12.0
          --- tags/v0.10.1
          --- Other...

Where 'Other...' option will show 'synchronization wizard'.

Additionally I think that we should launch 'Fetch from Upstream' action just before synchronization. This behavior could be disabled in preferences (but by default it should be enabled IMHO) also we need inform user that such configuration option exists when fetch action fails.

I think that we also need to inform user that he didn't configure default upstream repository and therefore we cannot fetch changes before synchronization.

Comment 3 Dariusz Luksza

2011-05-09 15:54:42 EDT

What do you think about idea described in above comment Kevin?

Comment 4 Kevin Sawicki

2011-05-09 16:13:21 EDT

My preference is to have a Synchronize Workspace and a Synchronize with... menu option in the Team sub-menu.

The Synchronize with... would bring up the wizard pre-filled in with the selected elements checked and HEAD
set as the source.

I think the menu options for synchronize with other branches/tags should go under the Compare With
menu (similar to CVS).

Comment 5 Dariusz Luksza

2011-05-11 18:31:45 EDT

This change[1] adds 'Synchronize Workspace' action. I'll add synchronize-wizard based custom synchronization in separate change

[1] http://egit.eclipse.org/r/#change,3237

Comment 6 Dariusz Luksza

2011-05-14 15:22:59 EDT

I've pushed a draft commit presenting how 'Synchronize...' submenu entry can look like:
http://egit.eclipse.org/r/#change,3421

Any thoughts and feedback are welcome!

Comment 7 Matthias Sohn

2011-05-19 17:43:48 EDT

(In reply to comment #6)
> I've pushed a draft commit presenting how 'Synchronize...' submenu entry can
> look like:
> http://egit.eclipse.org/r/#change,3421
> 
> Any thoughts and feedback are welcome!

http://egit.eclipse.org/r/#change,3421 has been merged as
42569d92e96175f191719c276982f66e8fc7f7bc

Comment 8 Dariusz Luksza

2011-06-14 15:53:24 EDT

Can we close it?

Comment 9 Robin Stocker

2013-07-29 10:43:08 EDT

(In reply to comment #8)
> Can we close it?

Let's close it. Please open new requests for any changes.