DESCRIPTION

Bug 485124: A wizard to configure pull operation

This is accessible on project's context menu, as "Pull..." just below
"Pull"

Change-Id: I88122d3fedf10de35a0c1c233b7dd9920bb8c0c7
Signed-off-by: Isis Velasquez xxx@xxx.xxx
Also-By: Alayna Houston xxx@xxx.xxx

COMMENTS

author: Isis Velasquez
date: 2016-01-15 10:36:19.000000000

Uploaded patch set 6.

-------------------------------------
author: Helena Henry
date: 2016-01-15 10:36:23.000000000

Patch Set 6:

This contribution is over 1000 lines of code and a CQ may be needed[1].
Project committers, please confirm if a CQ is needed by replying to this comment (in Gerrit), leaving the quote intact, and Genie will automagically create a CQ.

[1] https://eclipse.org/legal/EclipseLegalProcessPoster.pdf.
-genie:cq

-------------------------------------
author: Brenden Conley
date: 2016-01-15 10:36:25.000000000

Patch Set 6:

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/8020/

-------------------------------------
author: Brenden Conley
date: 2016-01-15 11:02:58.000000000

Patch Set 6: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/8020/ : SUCCESS

-------------------------------------
author: Brenden Conley
date: 2016-01-15 23:37:03.000000000

Patch Set 6: -Verified

Build Started https://hudson.eclipse.org/egit/job/egit.gerrit/8021/

-------------------------------------
author: Brenden Conley
date: 2016-01-16 00:06:00.000000000

Patch Set 6: Verified+1

Build Successful 

https://hudson.eclipse.org/egit/job/egit.gerrit/8021/ : SUCCESS

-------------------------------------
author: Alayna Houston
date: 2016-01-16 12:03:53.000000000

Patch Set 6: Code-Review-1

(5 comments)

Line:330, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java -> Dead store. Since you want to allow pulling from non-advertised refs, can't this whole if-branch be removed?

Line:379, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java -> fullBranch is known to be non-null here.

Line:44, org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/pull/PullWizardTest.java -> Could be static.

Line:15, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullWithOptionsActionHandler.java -> Unused import. Please remove.

There's a problem with our tycho setup. org.eclipse.egit.ui/.settings/org.eclipse.jdt.core.prefs specifies this should be an error, so the tycho build should fail. See https://git.eclipse.org/r/#/c/64507/

Line:19, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullWithOptionsActionHandler.java -> Ditto: unused import.

-------------------------------------
author: Alayna Houston
date: 2016-01-16 12:41:46.000000000

Patch Set 6:

(2 comments)

Line:96, org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/pull/PullWizardTest.java -> This fails on my machine with my DE_CH keyboard. Besides, why CR-LF?

Anyway, you don't need to go through the UI to add a repository to the view in setup. Just doing

  deleteAllProjects();
  clearView();
  repositoryFile = createProjectAndCommitToRepository();
  createRemoteRepository(repositoryFile);
  Activator.getDefault().getRepositoryUtil().addConfiguredRepository(repositoryFile);
  refreshAndWait();
  assertHasRepo(repositoryFile);

should be good enough. Also, then you don't need to add new imported packages in the MANIFEST.MF.

Line:122, org.eclipse.egit.ui.test/src/org/eclipse/egit/ui/wizards/pull/PullWizardTest.java -> And then use getOrOpenView() here.

-------------------------------------
author: Gerrit Johnathan Pham
date: 2016-02-13 12:59:54.000000000

Change has been successfully merged into the git repository by Alayna Houston

-------------------------------------
