From 66c84da28900f93fd4a5375e71b03f0a36f8dc5b Mon Sep 17 00:00:00 2001 From: Robin Rosenberg Date: Mon, 25 Jun 2007 02:37:54 +0200 Subject: [PATCH] Use getRepostoryRelativeName everywhere Signed-off-by: Robin Rosenberg --- .../src/org/spearce/egit/core/GitBlobStorage.java | 7 +------ .../src/org/spearce/egit/core/GitStorage.java | 7 +------ .../org/spearce/egit/core/internal/UpdateJob.java | 10 ++-------- .../egit/core/internal/mapping/GitFileHistory.java | 8 ++------ .../egit/core/internal/mapping/GitFileRevision.java | 20 ++++++-------------- .../src/org/spearce/egit/core/op/TrackOperation.java | 10 ++-------- .../org/spearce/egit/core/op/UntrackOperation.java | 10 ++-------- 7 files changed, 16 insertions(+), 56 deletions(-) diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/GitBlobStorage.java b/org.spearce.egit.core/src/org/spearce/egit/core/GitBlobStorage.java index 3ab21847..6a9a9894 100644 --- a/org.spearce.egit.core/src/org/spearce/egit/core/GitBlobStorage.java +++ b/org.spearce.egit.core/src/org/spearce/egit/core/GitBlobStorage.java @@ -53,12 +53,7 @@ public class GitBlobStorage implements IStorage { Tree tree; try { tree = repositoryMapping.getRepository().mapTree(treeId); - String prefix = repositoryMapping.getSubset(); - if (prefix != null) - prefix = prefix + "/"; - else - prefix = ""; - String name = prefix + resource.getProjectRelativePath().toString(); + String name = repositoryMapping.getRepoRelativePath(resource); entry = tree.findBlobMember(name); } catch (IOException e) { // TODO Auto-generated catch block diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/GitStorage.java b/org.spearce.egit.core/src/org/spearce/egit/core/GitStorage.java index edef5db9..cdb270ec 100644 --- a/org.spearce.egit.core/src/org/spearce/egit/core/GitStorage.java +++ b/org.spearce.egit.core/src/org/spearce/egit/core/GitStorage.java @@ -56,12 +56,7 @@ public class GitStorage implements IStorage { Tree tree; try { tree = repositoryMapping.getRepository().mapTree(treeId); - String prefix = repositoryMapping.getSubset(); - if (prefix != null) - prefix = prefix + "/"; - else - prefix = ""; - String name = prefix + resource.getProjectRelativePath().toString(); + String name = repositoryMapping.getRepoRelativePath(resource); if (resource.getType() == IResource.FILE) entry = tree.findBlobMember(name); else diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/UpdateJob.java b/org.spearce.egit.core/src/org/spearce/egit/core/internal/UpdateJob.java index 6c3b3b02..df7481a8 100644 --- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/UpdateJob.java +++ b/org.spearce.egit.core/src/org/spearce/egit/core/internal/UpdateJob.java @@ -88,18 +88,12 @@ public class UpdateJob extends Job { final RepositoryMapping rm = pd.getRepositoryMapping(p); final GitIndex index = rm.getRepository().getIndex(); tomerge.put(rm, Boolean.TRUE); - String prefix = rm.getSubset(); - if (prefix == null) - prefix = ""; - else - prefix = prefix + "/"; - final String fprefix = prefix; if (r instanceof IContainer) { ((IContainer)r).accept(new IResourceVisitor() { public boolean visit(IResource resource) throws CoreException { try { if (resource.getType() == IResource.FILE) { - String path = fprefix + resource.getProjectRelativePath(); + String path = rm.getRepoRelativePath(resource); Entry entry = index.getEntry(path); if (entry != null) { entry.update(new File(rm.getWorkDir(),path), rm.getRepository()); @@ -114,7 +108,7 @@ public class UpdateJob extends Job { } },IResource.DEPTH_INFINITE, IContainer.EXCLUDE_DERIVED); } else { - String path = fprefix + r.getProjectRelativePath(); + String path = rm.getRepoRelativePath(r); Entry entry = index.getEntry(path); if (entry != null) { entry.update(new File(rm.getWorkDir(),path), rm.getRepository()); diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileHistory.java b/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileHistory.java index 35aa5fca..7347f21f 100644 --- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileHistory.java +++ b/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileHistory.java @@ -196,12 +196,8 @@ static class EclipseWalker extends Walker { List ret = new ArrayList(); ObjectId activeDiffLeafId = null; if (!(resource instanceof IContainer)) { - String relativeResourceNameString = resource - .getProjectRelativePath().toPortableString(); - String prefix = getRepositoryMapping().getSubset(); - if (prefix != null) - relativeResourceNameString = prefix + "/" - + relativeResourceNameString; + String relativeResourceNameString = getRepositoryMapping() + .getRepoRelativePath(resource); activeDiffLeafId = getRepository().getIndex().getEntry( relativeResourceNameString).getObjectId(); } diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileRevision.java b/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileRevision.java index 63d84865..9266fdca 100644 --- a/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileRevision.java +++ b/org.spearce.egit.core/src/org/spearce/egit/core/internal/mapping/GitFileRevision.java @@ -148,21 +148,13 @@ public class GitFileRevision extends FileRevision { Tree tree; try { tree = repositoryMapping.getRepository().mapTree(getCommit().getTreeId()); - String prefix = repositoryMapping.getSubset(); - if (prefix != null) { - String relPath = resource.getProjectRelativePath().toString(); - if (relPath.equals("")) - return tree; - else { - prefix = prefix + "/"; - String name = prefix + relPath; - if (resource.getType() == IResource.FILE) - return tree.findBlobMember(name); - else - return tree.findTreeMember(name); - } - } else + String path = repositoryMapping.getRepoRelativePath(resource); + if (path.equals("")) return tree; + if (resource.getType() == IResource.FILE) + return tree.findBlobMember(path); + else + return tree.findBlobMember(path); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java b/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java index 31d37d21..7c71ba9c 100644 --- a/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java +++ b/org.spearce.egit.core/src/org/spearce/egit/core/op/TrackOperation.java @@ -92,19 +92,13 @@ public class TrackOperation implements IWorkspaceRunnable { } tomerge.put(rm, Boolean.TRUE); - String prefix = rm.getSubset(); - if (prefix == null) - prefix = ""; - else - prefix = prefix + "/"; - final String fprefix = prefix; if (toAdd instanceof IContainer) { ((IContainer)toAdd).accept(new IResourceVisitor() { public boolean visit(IResource resource) throws CoreException { try { if (resource.getType() == IResource.FILE) { if (!Team.isIgnored((IFile)resource)) - index.add(rm.getWorkDir(), new File(rm.getWorkDir(),fprefix + resource.getProjectRelativePath().toFile())); + index.add(rm.getWorkDir(), new File(rm.getWorkDir(),rm.getRepoRelativePath(resource))); } } catch (IOException e) { e.printStackTrace(); @@ -114,7 +108,7 @@ public class TrackOperation implements IWorkspaceRunnable { } },IResource.DEPTH_INFINITE, IContainer.EXCLUDE_DERIVED); } else { - index.add(rm.getWorkDir(), new File(rm.getWorkDir(),prefix + toAdd.getProjectRelativePath().toFile())); + index.add(rm.getWorkDir(), new File(rm.getWorkDir(),rm.getRepoRelativePath(toAdd))); } } diff --git a/org.spearce.egit.core/src/org/spearce/egit/core/op/UntrackOperation.java b/org.spearce.egit.core/src/org/spearce/egit/core/op/UntrackOperation.java index 5a9d8b6e..ae506bf9 100644 --- a/org.spearce.egit.core/src/org/spearce/egit/core/op/UntrackOperation.java +++ b/org.spearce.egit.core/src/org/spearce/egit/core/op/UntrackOperation.java @@ -80,23 +80,17 @@ public class UntrackOperation implements IWorkspaceRunnable { final RepositoryMapping rm = pd.getRepositoryMapping(p); final GitIndex index = rm.getRepository().getIndex(); tomerge.put(rm, Boolean.TRUE); - String prefix = rm.getSubset(); - if (prefix == null) - prefix = ""; - else - prefix = prefix + "/"; - final String fprefix = prefix; if (toRemove instanceof IContainer) { ((IContainer)toRemove).accept(new IResourceVisitor() { public boolean visit(IResource resource) throws CoreException { if (resource.getType() == IResource.FILE) { - index.remove(rm.getWorkDir(), new File(rm.getWorkDir(),fprefix + resource.getProjectRelativePath().toFile())); + index.remove(rm.getWorkDir(), new File(rm.getWorkDir(),rm.getRepoRelativePath(resource))); } return true; } },IResource.DEPTH_INFINITE, IContainer.EXCLUDE_DERIVED); } else { - index.remove(rm.getWorkDir(), new File(rm.getWorkDir(),prefix + toRemove.getProjectRelativePath().toFile())); + index.remove(rm.getWorkDir(), new File(rm.getWorkDir(),rm.getRepoRelativePath(toRemove))); } } m.worked(200); -- 2.11.4.GIT