MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Hg: refactor show history for directory commit (IDEA-68122).

Browse Source
This commit is contained in:
Nadya.Zabrodina
2012-12-03 14:57:52 +04:00
parent c10c22198c
commit 5b317e21dd
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgDiffFromHistoryHandler.java
+5 -11
View File
@@ -94,8 +94,9 @@ public class HgDiffFromHistoryHandler implements DiffFromHistoryHandler {
private void showDiffForDirectory(@NotNull final FilePath path,
@Nullable final HgFileRevision rev1,
@Nullable final HgFileRevision rev2) {
HgRepositoryLocation repository = getLocationFor(path);
calculateDiffInBackground(repository, path, rev1, rev2, new Consumer<List<Change>>() {
VirtualFile root = VcsUtil.getVcsRootFor(myProject, path);
LOG.assertTrue(root != null, "Repository is null for " + path);
calculateDiffInBackground(root, path, rev1, rev2, new Consumer<List<Change>>() {
@Override
public void consume(List<Change> changes) {
showDirDiffDialog(path, rev1 != null ? rev1.getRevisionNumber().getChangeset() : null,
@@ -106,7 +107,7 @@ public class HgDiffFromHistoryHandler implements DiffFromHistoryHandler {
// rev1 == null => rev2 is the initial commit
// rev2 == null => comparing rev1 with local
private void calculateDiffInBackground(@NotNull final HgRepositoryLocation repository, @NotNull final FilePath path,
private void calculateDiffInBackground(@NotNull final VirtualFile root, @NotNull final FilePath path,
@Nullable final HgFileRevision rev1, @Nullable final HgFileRevision rev2,
final Consumer<List<Change>> successHandler) {
new Task.Backgroundable(myProject, "Comparing revisions...") {
@@ -114,7 +115,7 @@ public class HgDiffFromHistoryHandler implements DiffFromHistoryHandler {
@Override
public void run(@NotNull ProgressIndicator indicator) {
myChanges = HgUtil.getDiff(HgDiffFromHistoryHandler.this.myProject, repository, path, rev1, rev2);
myChanges = HgUtil.getDiff(HgDiffFromHistoryHandler.this.myProject, root, path, rev1, rev2);
}
@Override
@@ -147,12 +148,5 @@ public class HgDiffFromHistoryHandler implements DiffFromHistoryHandler {
dialogBuilder.setCenterPanel(changesBrowser);
dialogBuilder.showNotModal();
}
@NotNull
private HgRepositoryLocation getLocationFor(FilePath filePath) {
VirtualFile repo = VcsUtil.getVcsRootFor(myProject, filePath);
LOG.assertTrue(repo != null, "Repository is null for " + filePath);
return new HgRepositoryLocation(repo.getUrl(), repo);
}
}
plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
+20 -8
View File
@@ -16,6 +16,7 @@ import com.intellij.notification.Notification;
import com.intellij.notification.NotificationType;
import com.intellij.notification.Notifications;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.ShutDownTracker;
import com.intellij.openapi.util.io.FileUtil;
@@ -36,7 +37,6 @@ import org.zmlx.hg4idea.command.HgRemoveCommand;
import org.zmlx.hg4idea.command.HgStatusCommand;
import org.zmlx.hg4idea.command.HgWorkingCopyRevisionsCommand;
import org.zmlx.hg4idea.provider.HgChangeProvider;
import org.zmlx.hg4idea.provider.HgRepositoryLocation;
import java.awt.*;
import java.io.*;
@@ -50,6 +50,7 @@ import java.util.List;
public abstract class HgUtil {
public static final int MANY_FILES = 100;
private static final Logger LOG = Logger.getInstance(HgUtil.class);
public static File copyResourceToTempFile(String basename, String extension) throws IOException {
final InputStream in = HgUtil.class.getClassLoader().getResourceAsStream("python/" + basename + extension);
@@ -407,7 +408,7 @@ public abstract class HgUtil {
@NotNull
public static List<Change> getDiff(@NotNull final Project project,
@NotNull final HgRepositoryLocation repository,
@NotNull final VirtualFile root,
@NotNull final FilePath path,
@Nullable final HgFileRevision rev1,
@Nullable final HgFileRevision rev2) {
@@ -420,17 +421,17 @@ public abstract class HgUtil {
statusCommand.setTargetRevision(rev2 != null ? rev2.getRevisionNumber() : null); //rev2==null means "compare with local version"
}
else {
assert (rev2 != null); //rev1 and rev2 can't be null both//
LOG.assertTrue(rev2 != null, "revision1 and revision2 can't both be null. Path: " + path); //rev1 and rev2 can't be null both//
statusCommand.setBaseRevision(rev2.getRevisionNumber()); //get initial changes//
}
Collection<HgChange> hgChanges = statusCommand.execute(repository.getRoot(), Collections.singleton(path));
Collection<HgChange> hgChanges = statusCommand.execute(root, Collections.singleton(path));
List<Change> changes = new ArrayList<Change>();
//convert output changes to standart Change class
for (HgChange hgChange : hgChanges) {
FileStatus status = convertHgDiffStatus(hgChange.getStatus());
if (status != null) {
changes.add(createChange(project, repository.getRoot(), hgChange.beforeFile().getRelativePath(), revNumber1,
if (status != FileStatus.UNKNOWN && status!= FileStatus.IGNORED) {
changes.add(createChange(project, root, hgChange.beforeFile().getRelativePath(), revNumber1,
hgChange.afterFile().getRelativePath(),
rev2 != null ? rev2.getRevisionNumber() : null, status));
}
@@ -460,7 +461,7 @@ public abstract class HgUtil {
return new Change(beforeRevision, afterRevision, aStatus);
}
@Nullable
@NotNull
public static FileStatus convertHgDiffStatus(@NotNull HgFileStatusEnum hgstatus) {
if (hgstatus.equals(HgFileStatusEnum.ADDED)) {
return FileStatus.ADDED;
@@ -471,6 +472,17 @@ public abstract class HgUtil {
else if (hgstatus.equals(HgFileStatusEnum.MODIFIED)) {
return FileStatus.MODIFIED;
}
return null;
else if (hgstatus.equals(HgFileStatusEnum.COPY)) {
return HgChangeProvider.COPIED;
}
else if (hgstatus.equals(HgFileStatusEnum.UNVERSIONED)) {
return FileStatus.UNKNOWN;
}
else if (hgstatus.equals(HgFileStatusEnum.IGNORED)) {
return FileStatus.IGNORED;
}
else {
return FileStatus.UNKNOWN;
}
}
}