Commit 02d1b4cb authored by agurov's avatar agurov

There should be a way to add to SVN the intermediate folders produced by svn:externals (bug 471188)

https://bugs.eclipse.org/bugs/show_bug.cgi?id=471188

git-svn-id: https://dev.eclipse.org/svnroot/technology/org.eclipse.subversive/trunk@21486 ee007c2a-0a25-0410-9ab9-bf268980928c
parent 7b5b7780
......@@ -56,7 +56,7 @@ public class QueryResourceAddition {
* @return recursive, non-recursive additions and root nodes
*/
public IResource [][]queryAdditionsSeparated() {
HashSet<IResource> nonRecursive = new HashSet<IResource>(Arrays.asList(this.selector.getSelectedResources(IStateFilter.SF_IGNORED_BUT_NOT_EXTERNAL)));
HashSet<IResource> nonRecursive = new HashSet<IResource>(Arrays.asList(this.selector.getSelectedResources(IStateFilter.SF_IGNORED)));
HashSet<IResource> recursive = new HashSet<IResource>(Arrays.asList(this.selector.getSelectedResourcesRecursive(IStateFilter.SF_NEW)));
HashSet<IResource> resources = new HashSet<IResource>();
......@@ -97,7 +97,7 @@ public class QueryResourceAddition {
public static IResource []getSelectedForAddition(IResourceSelector selector) {
Set<IResource> resources = new HashSet<IResource>();
// non-recursive part (ignored)
resources.addAll(Arrays.asList(selector.getSelectedResources(IStateFilter.SF_IGNORED_BUT_NOT_EXTERNAL)));
resources.addAll(Arrays.asList(selector.getSelectedResources(IStateFilter.SF_IGNORED)));
// all new resources that can be fetched recursively
resources.addAll(Arrays.asList(selector.getSelectedResourcesRecursive(IStateFilter.SF_NEW)));
return resources.toArray(new IResource[resources.size()]);
......
......@@ -49,7 +49,7 @@ public class AddToSVNAction extends AbstractRecursiveTeamAction {
public boolean isEnabled() {
return
this.checkForResourcesPresence(IStateFilter.SF_IGNORED_BUT_NOT_EXTERNAL) ||
this.checkForResourcesPresence(IStateFilter.SF_IGNORED) ||
this.checkForResourcesPresenceRecursive(IStateFilter.SF_NEW);
}
......
......@@ -72,7 +72,7 @@ public class CommitActionUtility {
this.allResourcesSet = new HashSet<IResource>();
this.allResourcesSet.addAll(Arrays.asList(this.selector.getSelectedResourcesRecursive(new IStateFilter.OrStateFilter(new IStateFilter[] {IStateFilter.SF_COMMITABLE, IStateFilter.SF_CONFLICTING, IStateFilter.SF_TREE_CONFLICTING, IStateFilter.SF_NEW}))));
this.newNonRecursive = new HashSet<IResource>(Arrays.asList(this.selector.getSelectedResources(IStateFilter.SF_IGNORED_BUT_NOT_EXTERNAL)));
this.newNonRecursive = new HashSet<IResource>(Arrays.asList(this.selector.getSelectedResources(IStateFilter.SF_IGNORED)));
this.newRecursive = new HashSet<IResource>(Arrays.asList(FileUtility.getResourcesRecursive((IResource [])this.allResourcesSet.toArray(new IResource[this.allResourcesSet.size()]), IStateFilter.SF_NEW, IResource.DEPTH_ZERO)));
HashSet<IResource> fullSet = new HashSet<IResource>(this.newNonRecursive);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment