By default the commit dialog will be populated with all changed resources
in the projects that contain the selected resources, provided the projects
are associated with a Git respository.
Signed-off-by: Robin Rosenberg <robin.rosenberg@xxxxxxxxxx>
---
.../egit/ui/internal/actions/CommitAction.java | 33 +++++++++----------
1 files changed, 16 insertions(+), 17 deletions(-)
diff --git a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java
index 8db701c..d703048 100644
--- a/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java
+++ b/org.spearce.egit.ui/src/org/spearce/egit/ui/internal/actions/CommitAction.java
@@ -68,7 +68,7 @@ public void run(IAction act) {
return;
}
- Repository[] repos = getRepositories();
+ Repository[] repos = getRepositoriesFor(getProjectsForSelectedResources());
amendAllowed = repos.length == 1;
for (Repository repo : repos) {
if (!repo.getRepositoryState().canCommit()) {
@@ -124,7 +124,7 @@ private void resetState() {
}
private void loadPreviousCommit() {
- IProject project = getSelectedProjects()[0];
+ IProject project = getProjectsForSelectedResources()[0];
Repository repo = RepositoryMapping.getMapping(project).getRepository();
try {
@@ -313,21 +313,20 @@ private void writeTreeWithSubTrees(Tree tree) throws TeamException {
}
private void buildIndexHeadDiffList() throws IOException {
- for (IProject project : getSelectedProjects()) {
+ for (IProject project : getProjectsInRepositoryOfSelectedResources()) {
RepositoryMapping repositoryMapping = RepositoryMapping.getMapping(project);
- if (repositoryMapping != null) {
- Repository repository = repositoryMapping.getRepository();
- Tree head = repository.mapTree("HEAD");
- GitIndex index = repository.getIndex();
- IndexDiff indexDiff = new IndexDiff(head, index);
- indexDiff.diff();
-
- includeList(project, indexDiff.getAdded(), indexChanges);
- includeList(project, indexDiff.getChanged(), indexChanges);
- includeList(project, indexDiff.getRemoved(), indexChanges);
- includeList(project, indexDiff.getMissing(), notIndexed);
- includeList(project, indexDiff.getModified(), notIndexed);
- }
+ assert repositoryMapping != null;
+ Repository repository = repositoryMapping.getRepository();
+ Tree head = repository.mapTree("HEAD");
+ GitIndex index = repository.getIndex();
+ IndexDiff indexDiff = new IndexDiff(head, index);
+ indexDiff.diff();
+
+ includeList(project, indexDiff.getAdded(), indexChanges);
+ includeList(project, indexDiff.getChanged(), indexChanges);
+ includeList(project, indexDiff.getRemoved(), indexChanges);
+ includeList(project, indexDiff.getMissing(), notIndexed);
+ includeList(project, indexDiff.getModified(), notIndexed);
}
}
@@ -395,7 +394,7 @@ private boolean isChanged(RepositoryMapping map, IFile resource) {
@Override
public boolean isEnabled() {
- return getRepositories().length > 0;
+ return getProjectsInRepositoryOfSelectedResources().length > 0;
}
}
--
1.6.0.rc2.35.g04c6e9
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
