From: Robin Rosenberg <robin.rosenberg@dewire.com>
To: "Shawn O. Pearce" <spearce@spearce.org>, git@vger.kernel.org
Cc: Robin Rosenberg <robin.rosenberg@dewire.com>
Subject: [EGIT RFC] Enable commit for any resource in a Git-shared project
Date: Fri, 13 Jun 2008 01:39:57 +0200 [thread overview]
Message-ID: <1213313997-1520-3-git-send-email-robin.rosenberg@dewire.com> (raw)
In-Reply-To: <1213313997-1520-2-git-send-email-robin.rosenberg@dewire.com>
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.
---
.../egit/ui/internal/actions/CommitAction.java | 31 +++++++++----------
1 files changed, 15 insertions(+), 16 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 db38c10..da32ea5 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 class CommitAction extends RepositoryAction {
return;
}
- Repository[] repos = getRepositories();
+ Repository[] repos = getRepositoriesFor(getProjectsForSelectedResources());
amendAllowed = repos.length == 1;
for (Repository repo : repos) {
if (!repo.getRepositoryState().canCommit()) {
@@ -313,21 +313,20 @@ public class CommitAction extends RepositoryAction {
}
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 @@ public class CommitAction extends RepositoryAction {
@Override
public boolean isEnabled() {
- return getRepositories().length > 0;
+ return getProjectsInRepositoryOfSelectedResources().length > 0;
}
}
--
1.5.5.1.178.g1f811
next prev parent reply other threads:[~2008-06-12 23:44 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-06-12 23:39 [EGIT RFC] Commit behaviour Robin Rosenberg
2008-06-12 23:39 ` [EGIT RFC] Add utilities for figuring out repositories for selected resources Robin Rosenberg
2008-06-12 23:39 ` Robin Rosenberg [this message]
2008-06-13 22:07 ` [EGIT RFC] Commit behaviour Marek Zawirski
2008-06-13 22:41 ` Marek Zawirski
2008-06-14 8:40 ` Robin Rosenberg
2008-06-14 10:05 ` Robin Rosenberg
2008-06-14 9:08 ` Robin Rosenberg
2008-06-14 10:23 ` Robin Rosenberg
2008-06-15 2:00 ` Marek Zawirski
2008-06-16 2:11 ` Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1213313997-1520-3-git-send-email-robin.rosenberg@dewire.com \
--to=robin.rosenberg@dewire.com \
--cc=git@vger.kernel.org \
--cc=spearce@spearce.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).