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

COMMENTS

author: Isis Velasquez
date: 2016-01-08 13:30:19.000000000

Uploaded patch set 1.

-------------------------------------
author: Brenden Conley
date: 2016-01-08 13:33:18.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2016-01-08 13:57:07.000000000

Patch Set 1: Verified+1

Build Successful 

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

-------------------------------------
author: Douglas Trujillo
date: 2016-01-09 22:09:37.000000000

Patch Set 1: Code-Review-1

(18 comments)

Line:91, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullOperationUI.java -> in PullOperation you named this "configs"

Line:103, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java -> handle exception

Line:301, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java -> "Choose to which branch in remote 'origin' you want to push." isn't appropriate here

Line:311, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java -> if the current branch already tracks a branch and I change reference to another branch existing in the remote repository and then check the checkbox "Configure upstream for push and pull" I would expect that this warning is displayed. But it is not displayed.

If I first check the checkbox and then change the reference the warning is shown.

Line:347, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizardPage.java -> handle exception

Line:716, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties -> s/PullWizardPAge/PullWizardPage/

Line:720, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties -> why three dots ?

Line:1, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullWithOptionsActionHandler.java -> missing license header

Line:9, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullWithOptionsActionHandler.java -> missing javadoc

Line:62, org.eclipse.egit.core/src/org/eclipse/egit/core/op/PullOperation.java -> xxx@xxx.xxx tag

Line:141, org.eclipse.egit.core/src/org/eclipse/egit/core/op/PullOperation.java -> xxx@xxx.xxx tag

Line:66, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizard.java -> the meaning of this checkbox isn't completely obvious if upstream is already configured when opening the wizard.

Also configuring upstream only makes sense if the given reference is a branch, I think you can't track a commit or tag since they are immutable, see https://git-scm.com/docs/git-branch for option --track

Line:72, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizard.java -> fix TODOs

Line:83, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizard.java -> style nit: missing braces

Line:1, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullWithOptionsAction.java -> missing license header

Line:3, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullWithOptionsAction.java -> remove unused import

Line:5, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullWithOptionsAction.java -> missing javadoc

Line:7, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/actions/PullWithOptionsAction.java -> missing javadoc

-------------------------------------
author: Isis Velasquez
date: 2016-01-09 22:50:51.000000000

Patch Set 1:

(2 comments)

Thanks Matthias for the review. I'll work on a new patch set asap.

Line:720, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties -> For things such are not named branches on GitHub, such as pull/51/head

Line:66, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/pull/PullWizard.java -> The checkbox is only visible and the configuureUostream==true in the case of a branch. See the condition before creation of checkbox on PullWizardPage

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

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

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