Community
Participate
Working Groups
Build Identifier: M20110210-1200 EGit version: 1.1.0.201109151100-r When importing projects using the ProjectSetCapability API, the import can fail if the repo is already cloned with the right branch locally. Specifically if you use ProjectSetCapability.addToWorkspace(...) repetitively add projects one reference URI at a time, all the subsequent projects fail with an error similar to: Destination directory <path>/core exists. Don't clone [<project-name>] from ssh://<host>:<port><path-to-repo> to prevent data loss. A suggestion by Robin on the egit-dev list was: "We could add additional logic that checks if a Git repository already exists with the given URI and branch, and in that case skip the clone step and directly import and connect the project." Logging as major as the API doesn't work even after restart as well making the ability to use the team import API non-usable to sync projects using external products using said API. Please adjust as appropriate based on project conventions. Thanks! Reproducible: Always Steps to Reproduce: 1. Add one project using ProjectSetCapability.addToWorkspace(...) -- it succeeds 2. Attempt to add other projects using ProjectSetCapability.addToWorkspace(...): It only succeeds if the projects have different URIs / branches If the branch / URI is from the same repository, fails with error above. 3. Restarting Eclipse does not appear to allow it to succeed, the same error can occur on other project additions
Pushed two changes to implement this: * Refactor import code of GitProjectSetCapability http://egit.eclipse.org/r/4779 * Skip clone for import of project from existing repo http://egit.eclipse.org/r/4780
(In reply to comment #1) > Pushed two changes to implement this: -2 as it will not update existing local repository, i.e.: - clone remote repo A with one project and import it; - someone pushed new changes to remote repo A and now it has three projects; - someone updated PSF accordingly (it refers to three projects); - you use this PSF and it should import three projects; - BUT your local repository still has only one. Am I missing something?
This situation is only possible if you never pulled since the you imported the original repository. But even then, I don't think we should touch the existing repositories. What are you suggesting, doing a pull? What about if there are merge conflicts?
(In reply to comment #3) > But even then, I don't think we should touch the existing repositories. What > are you suggesting, doing a pull? No, this is what I would expect in this situation: - add a new remote - fetch from it - stash uncommitted changes if any - switch to branch, according to PSF - import
(In reply to comment #4) > (In reply to comment #3) > > > But even then, I don't think we should touch the existing repositories. What > > are you suggesting, doing a pull? > > No, this is what I would expect in this situation: > - add a new remote > - fetch from it > - stash uncommitted changes if any > - switch to branch, according to PSF > - import Do others also think that this would be the right thing to do?
merged http://egit.eclipse.org/r/#change,4779 as 6ed6b9104cbce86668d6819601694f8a29a16119
merged http://egit.eclipse.org/r/4780 as 03a111b4c460bb1443f50de3294da9424de0dbcd
With 03a111b4c4, -1 as there is no way to get feedback about the case from comment #2. -1 as it makes PSF useless if you have a local clone for such project as it will SILENTLY do nothing as a result of 'Import from PSF' action. +0 as it solves the problem that has a workaround. So, it breaks my expectation about using PSF: it finishes w/o errors = I have all projects from this PSF in my workspace. Personally, I see no value in this change.
(In reply to comment #8) > With 03a111b4c4, > -1 as there is no way to get feedback about the case from comment #2. > -1 as it makes PSF useless if you have a local clone for such project as it > will SILENTLY do nothing as a result of 'Import from PSF' action. > +0 as it solves the problem that has a workaround. > > So, it breaks my expectation about using PSF: it finishes w/o errors = I have > all projects from this PSF in my workspace. Personally, I see no value in this > change. IMHO this is good starting point for further improvements and discussions. We can now continue working on proper user experience and make another small step ahead.
