DESCRIPTION

Bug 414200 - Option to ignore conflicting projects during import

Change-Id: I2808ee03a6042de0d9e811f46827a68086a895c2
Signed-off-by: Zaid Mosley xxx@xxx.xxx

COMMENTS

author: Brenden Conley
date: 2013-08-01 12:00:09.000000000

Patch Set 1:

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

-------------------------------------
author: Brenden Conley
date: 2013-08-01 12:19:40.000000000

Patch Set 1: Code-Review-1

Build Unstable 

https://hudson.eclipse.org/sandbox/job/egit.gerrit/4743/ : UNSTABLE

-------------------------------------
author: Ace Duncan
date: 2013-08-02 07:44:26.000000000

Patch Set 1: Code-Review-1

(1 comment)

Line:38, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/ProjectRecord.java -> Why not private boolean hasConflicts?

-------------------------------------
author: Zaid Mosley
date: 2013-08-02 07:49:09.000000000

Patch Set 1:

Mykola, this would require an additional getter. I can do this change, but it does not improve the code IMHO.

-------------------------------------
author: Ace Duncan
date: 2013-08-02 08:22:31.000000000

Patch Set 1:

(2 comments)

Did you mean 'setter'? ProjectRecord#hasConflicts() is a getter.

Line:543, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/GitProjectsImportPage.java -> I would drop else clause with smth like:

    boolean hasConflicts = isProjectInWorkspace(selectedProjects[i].getProjectName());
    selectedProjects[i].hasConflicts = hasConflicts;
    if(!hasConflicts) {
        validProjects.add(selectedProjects[i]);
    }

Line:102, org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/ProjectRecord.java -> This getter actually makes no sense if hasConflicts is not private

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