Skip to content

Refactoring (part 3) #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 5 commits into from
Nov 20, 2025
Merged

Refactoring (part 3) #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ed9e049
Refactoring (part 3).
unv-unv Nov 19, 2025
88d927d
Reverting simplification of GitVersion.equals().
unv-unv Nov 20, 2025
b9e8b7a
GitRepoInfo.equals() formatting.
unv-unv Nov 20, 2025
3e3ef93
GitRepoInfo.equals() formatting (take 2).
unv-unv Nov 20, 2025
6a3b873
GitRepoInfo.equals() formatting (take 3).
unv-unv Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
348 changes: 162 additions & 186 deletions plugin/src/main/java/git4idea/GitFileRevision.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,198 +27,174 @@
import consulo.versionControlSystem.util.VcsFileUtil;
import consulo.virtualFileSystem.VirtualFile;
import git4idea.util.GitFileUtils;

import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

import java.io.IOException;
import java.util.Collection;
import java.util.Collections;
import java.util.Date;

public class GitFileRevision extends VcsFileRevisionEx implements Comparable<VcsFileRevision>, VcsFileRevisionDvcsSpecific
{

@Nonnull
private final Project myProject;
@Nonnull
private final FilePath myPath;
@Nonnull
private final GitRevisionNumber myRevision;
@Nullable
private final Couple<Couple<String>> myAuthorAndCommitter;
@Nullable
private final String myMessage;
@Nullable
private final String myBranch;
@Nullable
private final Date myAuthorTime;
@Nonnull
private final Collection<String> myParents;
@Nullable
private final VirtualFile myRoot;

public GitFileRevision(@Nonnull Project project, @Nonnull FilePath path, @Nonnull GitRevisionNumber revision)
{
this(project, null, path, revision, null, null, null, null, Collections.<String>emptyList());
}

public GitFileRevision(@Nonnull Project project,
@Nullable VirtualFile root,
@Nonnull FilePath path,
@Nonnull GitRevisionNumber revision,
@Nullable Couple<Couple<String>> authorAndCommitter,
@Nullable String message,
@Nullable String branch,
@Nullable final Date authorTime,
@Nonnull Collection<String> parents)
{
myProject = project;
myRoot = root;
myPath = path;
myRevision = revision;
myAuthorAndCommitter = authorAndCommitter;
myMessage = message;
myBranch = branch;
myAuthorTime = authorTime;
myParents = parents;
}

@Override
@Nonnull
public FilePath getPath()
{
return myPath;
}

@Nullable
@Override
public RepositoryLocation getChangedRepositoryPath()
{
return null;
}

@Override
@Nonnull
public VcsRevisionNumber getRevisionNumber()
{
return myRevision;
}

@Override
public Date getRevisionDate()
{
return myRevision.getTimestamp();
}

@Nullable
@Override
public Date getDateForRevisionsOrdering()
{
return myAuthorTime;
}

@Override
@Nullable
public String getAuthor()
{
if(myAuthorAndCommitter != null)
{
return myAuthorAndCommitter.getFirst().getFirst();
}
return null;
}

@Nullable
@Override
public String getAuthorEmail()
{
if(myAuthorAndCommitter != null)
{
return myAuthorAndCommitter.getFirst().getSecond();
}
return null;
}

@Nullable
@Override
public String getCommitterName()
{
if(myAuthorAndCommitter != null)
{
return myAuthorAndCommitter.getSecond() == null ? null : myAuthorAndCommitter.getSecond().getFirst();
}
return null;
}

@Nullable
@Override
public String getCommitterEmail()
{
if(myAuthorAndCommitter != null)
{
return myAuthorAndCommitter.getSecond() == null ? null : myAuthorAndCommitter.getSecond().getSecond();
}
return null;
}

@Override
@Nullable
public String getCommitMessage()
{
return myMessage;
}

@Override
@Nullable
public String getBranchName()
{
return myBranch;
}

@Override
public synchronized byte[] loadContent() throws IOException, VcsException
{
VirtualFile root = getRoot();
return GitFileUtils.getFileContent(myProject, root, myRevision.getRev(), VcsFileUtil.relativePath(root, myPath));
}

private VirtualFile getRoot() throws VcsException
{
return myRoot != null ? myRoot : GitUtil.getGitRoot(myPath);
}

@Override
public synchronized byte[] getContent() throws IOException, VcsException
{
return loadContent();
}

@Override
public int compareTo(VcsFileRevision rev)
{
if(rev instanceof GitFileRevision)
{
return myRevision.compareTo(((GitFileRevision) rev).myRevision);
}
return getRevisionDate().compareTo(rev.getRevisionDate());
}

@Override
public String toString()
{
return myPath.getName() + ":" + myRevision.getShortRev();
}

@Nonnull
public Collection<String> getParents()
{
return myParents;
}

@Nonnull
public String getHash()
{
return myRevision.getRev();
}
public class GitFileRevision extends VcsFileRevisionEx implements Comparable<VcsFileRevision>, VcsFileRevisionDvcsSpecific {

@Nonnull
private final Project myProject;
@Nonnull
private final FilePath myPath;
@Nonnull
private final GitRevisionNumber myRevision;
@Nullable
private final Couple<Couple<String>> myAuthorAndCommitter;
@Nullable
private final String myMessage;
@Nullable
private final String myBranch;
@Nullable
private final Date myAuthorTime;
@Nonnull
private final Collection<String> myParents;
@Nullable
private final VirtualFile myRoot;

public GitFileRevision(@Nonnull Project project, @Nonnull FilePath path, @Nonnull GitRevisionNumber revision) {
this(project, null, path, revision, null, null, null, null, Collections.<String>emptyList());
}

public GitFileRevision(
@Nonnull Project project,
@Nullable VirtualFile root,
@Nonnull FilePath path,
@Nonnull GitRevisionNumber revision,
@Nullable Couple<Couple<String>> authorAndCommitter,
@Nullable String message,
@Nullable String branch,
@Nullable Date authorTime,
@Nonnull Collection<String> parents
) {
myProject = project;
myRoot = root;
myPath = path;
myRevision = revision;
myAuthorAndCommitter = authorAndCommitter;
myMessage = message;
myBranch = branch;
myAuthorTime = authorTime;
myParents = parents;
}

@Override
@Nonnull
public FilePath getPath() {
return myPath;
}

@Nullable
@Override
public RepositoryLocation getChangedRepositoryPath() {
return null;
}

@Override
@Nonnull
public VcsRevisionNumber getRevisionNumber() {
return myRevision;
}

@Override
public Date getRevisionDate() {
return myRevision.getTimestamp();
}

@Nullable
@Override
public Date getDateForRevisionsOrdering() {
return myAuthorTime;
}

@Override
@Nullable
public String getAuthor() {
if (myAuthorAndCommitter != null) {
return myAuthorAndCommitter.getFirst().getFirst();
}
return null;
}

@Nullable
@Override
public String getAuthorEmail() {
if (myAuthorAndCommitter != null) {
return myAuthorAndCommitter.getFirst().getSecond();
}
return null;
}

@Nullable
@Override
public String getCommitterName() {
if (myAuthorAndCommitter != null) {
return myAuthorAndCommitter.getSecond() == null ? null : myAuthorAndCommitter.getSecond().getFirst();
}
return null;
}

@Nullable
@Override
public String getCommitterEmail() {
if (myAuthorAndCommitter != null) {
return myAuthorAndCommitter.getSecond() == null ? null : myAuthorAndCommitter.getSecond().getSecond();
}
return null;
}

@Override
@Nullable
public String getCommitMessage() {
return myMessage;
}

@Override
@Nullable
public String getBranchName() {
return myBranch;
}

@Override
public synchronized byte[] loadContent() throws IOException, VcsException {
VirtualFile root = getRoot();
return GitFileUtils.getFileContent(myProject, root, myRevision.getRev(), VcsFileUtil.relativePath(root, myPath));
}

private VirtualFile getRoot() throws VcsException {
return myRoot != null ? myRoot : GitUtil.getGitRoot(myPath);
}

@Override
public synchronized byte[] getContent() throws IOException, VcsException {
return loadContent();
}

@Override
public int compareTo(VcsFileRevision rev) {
if (rev instanceof GitFileRevision fileRevision) {
return myRevision.compareTo(fileRevision.myRevision);
}
return getRevisionDate().compareTo(rev.getRevisionDate());
}

@Override
public String toString() {
return myPath.getName() + ":" + myRevision.getShortRev();
}

@Nonnull
public Collection<String> getParents() {
return myParents;
}

@Nonnull
public String getHash() {
return myRevision.getRev();
}

}
Loading
Loading