blob: 052f0fffdc22dec5ba149a71c1ec9aedcc5d8199 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
|
/*******************************************************************************
* Copyright (C) 2011, Bernard Leach <leachbj@bouncycastle.org>
* Copyright (C) 2011, Dariusz Luksza <dariusz@luksza.org>
* Copyright (C) 2012, Robin Stocker <robin@nibor.org>
*
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*******************************************************************************/
package org.eclipse.egit.core.op;
import static org.eclipse.jgit.lib.Constants.HEAD;
import java.io.IOException;
import java.util.Collection;
import java.util.Map;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.egit.core.Activator;
import org.eclipse.egit.core.internal.CoreText;
import org.eclipse.egit.core.internal.job.RuleUtil;
import org.eclipse.egit.core.internal.util.ResourceUtil;
import org.eclipse.jgit.api.Git;
import org.eclipse.jgit.api.GitCommand;
import org.eclipse.jgit.api.ResetCommand;
import org.eclipse.jgit.api.RmCommand;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.Ref;
import org.eclipse.jgit.lib.Repository;
/**
* Remove from Git Index operation (unstage).
*/
public class RemoveFromIndexOperation implements IEGitOperation {
private final Map<Repository, Collection<String>> pathsByRepository;
/**
* @param paths
* list of paths that should be removed from index
* @since 2.2
*/
public RemoveFromIndexOperation(Collection<IPath> paths) {
this.pathsByRepository = ResourceUtil.splitPathsByRepository(paths);
}
/**
* @param repo
* repository in with given files should be removed from index
* @param resources
* list of resources that should be removed from index
* @deprecated use {@link #RemoveFromIndexOperation(Collection)} instead
*/
@Deprecated
public RemoveFromIndexOperation(Repository repo, IResource[] resources) {
this.pathsByRepository = ResourceUtil.splitResourcesByRepository(resources);
}
@Override
public void execute(IProgressMonitor m) throws CoreException {
IProgressMonitor monitor = (m != null) ? m : new NullProgressMonitor();
monitor.beginTask(
CoreText.RemoveFromIndexOperation_removingFilesFromIndex,
pathsByRepository.size());
for (Map.Entry<Repository, Collection<String>> entry : pathsByRepository.entrySet()) {
Repository repository = entry.getKey();
Collection<String> paths = entry.getValue();
GitCommand<?> command = prepareCommand(repository, paths);
try {
command.call();
monitor.worked(1);
} catch (GitAPIException e) {
Activator.logError(e.getMessage(), e);
}
}
monitor.done();
}
@Override
public ISchedulingRule getSchedulingRule() {
return RuleUtil.getRuleForRepositories(pathsByRepository.keySet());
}
private static GitCommand<?> prepareCommand(Repository repository,
Collection<String> paths) {
Git git = new Git(repository);
if (hasHead(repository)) {
ResetCommand resetCommand = git.reset();
resetCommand.setRef(HEAD);
for (String path : paths)
resetCommand.addPath(getCommandPath(path));
return resetCommand;
} else {
RmCommand rmCommand = git.rm();
rmCommand.setCached(true);
for (String path : paths)
rmCommand.addFilepattern(getCommandPath(path));
return rmCommand;
}
}
private static boolean hasHead(Repository repository) {
try {
Ref head = repository.getRef(HEAD);
return head != null && head.getObjectId() != null;
} catch (IOException e) {
return false;
}
}
private static String getCommandPath(String path) {
if ("".equals(path)) // Working directory //$NON-NLS-1$
return "."; //$NON-NLS-1$
else
return path;
}
}
|
