diff options
Diffstat (limited to 'org.eclipse.egit.core/src')
5 files changed, 14 insertions, 14 deletions
diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/CommitFileRevision.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/CommitFileRevision.java index e9d690db97..ee0f2ca420 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/CommitFileRevision.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/CommitFileRevision.java @@ -47,17 +47,17 @@ class CommitFileRevision extends GitFileRevision { private ObjectId blobId; CommitFileRevision(final Repository repo, final RevCommit rc, - final String fileName) { - this(repo, rc, fileName, null); + final String path) { + this(repo, rc, path, null); } CommitFileRevision(final Repository repo, final RevCommit rc, - final String fileName, final ObjectId blob) { - super(fileName); + final String path, final ObjectId blob) { + super(path); db = repo; commit = rc; author = rc.getAuthorIdent(); - path = fileName; + this.path = path; blobId = blob; } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileRevision.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileRevision.java index c9e0cf4eaa..c896514459 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileRevision.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/GitFileRevision.java @@ -85,8 +85,8 @@ public abstract class GitFileRevision extends FileRevision { private final String path; - GitFileRevision(final String fileName) { - path = fileName; + GitFileRevision(final String path) { + this.path = path; } public String getName() { diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexFileRevision.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexFileRevision.java index 429cb4d408..a9bb41d213 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexFileRevision.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/IndexFileRevision.java @@ -40,14 +40,14 @@ public class IndexFileRevision extends GitFileRevision { private ObjectId blobId; - IndexFileRevision(final Repository repo, final String fileName) { - this(repo, fileName, FIRST_AVAILABLE); + IndexFileRevision(final Repository repo, final String path) { + this(repo, path, FIRST_AVAILABLE); } - IndexFileRevision(final Repository repo, final String fileName, int stage) { - super(fileName); + IndexFileRevision(final Repository repo, final String path, int stage) { + super(path); this.db = repo; - this.path = fileName; + this.path = path; this.stage = stage; } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkingTreeFileRevision.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkingTreeFileRevision.java index fce50d1e23..4c0d855478 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkingTreeFileRevision.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkingTreeFileRevision.java @@ -30,7 +30,7 @@ public class WorkingTreeFileRevision extends GitFileRevision { * @param file */ public WorkingTreeFileRevision(final File file) { - super(file.getName()); + super(file.getPath()); this.file = file; } diff --git a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkspaceFileRevision.java b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkspaceFileRevision.java index 25ee2b2cf1..0ab709d4f8 100644 --- a/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkspaceFileRevision.java +++ b/org.eclipse.egit.core/src/org/eclipse/egit/core/internal/storage/WorkspaceFileRevision.java @@ -24,7 +24,7 @@ public class WorkspaceFileRevision extends GitFileRevision { * @param resource */ public WorkspaceFileRevision(final IResource resource) { - super(resource.getName()); + super(resource.getLocation().toString()); rsrc = resource; } |