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
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
|
/*
* Copyright 2000-2014 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package git4idea.changes;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Pair;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vcs.*;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangesUtil;
import com.intellij.openapi.vcs.changes.committed.DecoratorManager;
import com.intellij.openapi.vcs.changes.committed.VcsCommittedListsZipper;
import com.intellij.openapi.vcs.changes.committed.VcsCommittedViewAuxiliary;
import com.intellij.openapi.vcs.history.VcsFileRevision;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.openapi.vcs.versionBrowser.ChangeBrowserSettings;
import com.intellij.openapi.vcs.versionBrowser.ChangesBrowserSettingsEditor;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
import com.intellij.openapi.vfs.LocalFileSystem;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.util.AsynchConsumer;
import com.intellij.util.Consumer;
import git4idea.*;
import git4idea.commands.GitSimpleHandler;
import git4idea.history.GitHistoryUtils;
import git4idea.history.browser.GitHeavyCommit;
import git4idea.history.browser.SymbolicRefs;
import git4idea.repo.GitRepository;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.File;
import java.util.*;
/**
* The provider for committed change lists
*/
public class GitCommittedChangeListProvider implements CommittedChangesProvider<CommittedChangeList, ChangeBrowserSettings> {
private static final Logger LOG = Logger.getInstance(GitCommittedChangeListProvider.class);
@NotNull private final Project myProject;
public GitCommittedChangeListProvider(@NotNull Project project) {
myProject = project;
}
@NotNull
public ChangeBrowserSettings createDefaultSettings() {
return new ChangeBrowserSettings();
}
public ChangesBrowserSettingsEditor<ChangeBrowserSettings> createFilterUI(boolean showDateFilter) {
return new GitVersionFilterComponent(showDateFilter);
}
public RepositoryLocation getLocationFor(@NotNull FilePath root) {
VirtualFile gitRoot = GitUtil.getGitRootOrNull(root);
if (gitRoot == null) {
return null;
}
GitRepository repository = GitUtil.getRepositoryManager(myProject).getRepositoryForRoot(gitRoot);
if (repository == null) {
LOG.info("No GitRepository for " + gitRoot);
return null;
}
GitLocalBranch currentBranch = repository.getCurrentBranch();
if (currentBranch == null) {
return null;
}
GitRemoteBranch trackedBranch = currentBranch.findTrackedBranch(repository);
if (trackedBranch == null) {
return null;
}
File rootFile = new File(gitRoot.getPath());
return new GitRepositoryLocation(trackedBranch.getRemote().getFirstUrl(), rootFile);
}
public RepositoryLocation getLocationFor(FilePath root, String repositoryPath) {
return getLocationFor(root);
}
@Nullable
public VcsCommittedListsZipper getZipper() {
return null;
}
public void loadCommittedChanges(ChangeBrowserSettings settings, RepositoryLocation location, int maxCount,
final AsynchConsumer<CommittedChangeList> consumer) throws VcsException {
try {
getCommittedChangesImpl(settings, location, maxCount, new Consumer<GitCommittedChangeList>() {
@Override
public void consume(GitCommittedChangeList gitCommittedChangeList) {
consumer.consume(gitCommittedChangeList);
}
});
}
finally {
consumer.finished();
}
}
public List<CommittedChangeList> getCommittedChanges(ChangeBrowserSettings settings, RepositoryLocation location, final int maxCount)
throws VcsException {
final List<CommittedChangeList> result = new ArrayList<CommittedChangeList>();
getCommittedChangesImpl(settings, location, maxCount, new Consumer<GitCommittedChangeList>() {
public void consume(GitCommittedChangeList committedChangeList) {
result.add(committedChangeList);
}
});
return result;
}
private void getCommittedChangesImpl(ChangeBrowserSettings settings, RepositoryLocation location, final int maxCount,
final Consumer<GitCommittedChangeList> consumer)
throws VcsException {
GitRepositoryLocation l = (GitRepositoryLocation)location;
final Long beforeRev = settings.getChangeBeforeFilter();
final Long afterRev = settings.getChangeAfterFilter();
final Date beforeDate = settings.getDateBeforeFilter();
final Date afterDate = settings.getDateAfterFilter();
final String author = settings.getUserFilter();
VirtualFile root = LocalFileSystem.getInstance().findFileByIoFile(l.getRoot());
if (root == null) {
throw new VcsException("The repository does not exists anymore: " + l.getRoot());
}
GitUtil.getLocalCommittedChanges(myProject, root, new Consumer<GitSimpleHandler>() {
public void consume(GitSimpleHandler h) {
if (!StringUtil.isEmpty(author)) {
h.addParameters("--author=" + author);
}
if (beforeDate != null) {
h.addParameters("--before=" + GitUtil.gitTime(beforeDate));
}
if (afterDate != null) {
h.addParameters("--after=" + GitUtil.gitTime(afterDate));
}
if (maxCount != getUnlimitedCountValue()) {
h.addParameters("-n" + maxCount);
}
if (beforeRev != null && afterRev != null) {
h.addParameters(GitUtil.formatLongRev(afterRev) + ".." + GitUtil.formatLongRev(beforeRev));
}
else if (beforeRev != null) {
h.addParameters(GitUtil.formatLongRev(beforeRev));
}
else if (afterRev != null) {
h.addParameters(GitUtil.formatLongRev(afterRev) + "..");
}
}
}, consumer, false);
}
public ChangeListColumn[] getColumns() {
return new ChangeListColumn[]{ChangeListColumn.NUMBER, ChangeListColumn.DATE, ChangeListColumn.DESCRIPTION, ChangeListColumn.NAME};
}
public VcsCommittedViewAuxiliary createActions(DecoratorManager manager, RepositoryLocation location) {
return null;
}
public int getUnlimitedCountValue() {
return -1;
}
@Override
public Pair<CommittedChangeList, FilePath> getOneList(final VirtualFile file, final VcsRevisionNumber number) throws VcsException {
final FilePathImpl filePath = new FilePathImpl(file);
final List<GitHeavyCommit> gitCommits =
GitHistoryUtils.commitsDetails(myProject, filePath, new SymbolicRefs(), Collections.singletonList(number.asString()));
if (gitCommits.size() != 1) {
return null;
}
final GitHeavyCommit gitCommit = gitCommits.get(0);
CommittedChangeList commit = new GitCommittedChangeList(gitCommit.getDescription() + " (" + gitCommit.getShortHash().getString() + ")",
gitCommit.getDescription(), gitCommit.getAuthor(), (GitRevisionNumber)number,
new Date(gitCommit.getAuthorTime()), gitCommit.getChanges(), true);
final Collection<Change> changes = commit.getChanges();
if (changes.size() == 1) {
Change change = changes.iterator().next();
return Pair.create(commit, ChangesUtil.getFilePath(change));
}
for (Change change : changes) {
if (change.getAfterRevision() != null && FileUtil.filesEqual(filePath.getIOFile(), change.getAfterRevision().getFile().getIOFile())) {
return new Pair<CommittedChangeList, FilePath>(commit, filePath);
}
}
final String afterTime = "--after=" + GitUtil.gitTime(gitCommit.getDate());
final List<VcsFileRevision> history = GitHistoryUtils.history(myProject, filePath, null, afterTime);
if (history.isEmpty()) {
return new Pair<CommittedChangeList, FilePath>(commit, filePath);
}
return Pair.create(commit, ((GitFileRevision)history.get(history.size() - 1)).getPath());
}
@Override
public RepositoryLocation getForNonLocal(VirtualFile file) {
return null;
}
@Override
public boolean supportsIncomingChanges() {
return false;
}
}
|
