Java MergeData类代码示例

import com.intellij.openapi.vcs.merge.MergeData; //导入依赖的package包/类
@Override
public MyResult step(DiffChainContext context) {
  if (myChange.getAfterRevision() == null) return createErrorResult();
  FileType type = myChange.getVirtualFile() != null ? myChange.getVirtualFile().getFileType() : null;
  if (myFile.getFileType().isBinary()) {
    final boolean nowItIsText = ChangeDiffRequestPresentable.checkAssociate(myProject, myFile.getName(), context);
    if (! nowItIsText) {
      return createErrorResult();
    }
  }
  final AbstractVcs vcs = ChangesUtil.getVcsForChange(myChange, myProject);
  if (vcs == null || vcs.getMergeProvider() == null) {
    return createErrorResult();
  }
  try {
    final MergeData mergeData = vcs.getMergeProvider().loadRevisions(myFile);
    final Charset charset = myFile.getCharset();
    final MergeRequest request = DiffRequestFactory.getInstance()
      .create3WayDiffRequest(CharsetToolkit.bytesToString(mergeData.CURRENT, charset),
                             CharsetToolkit.bytesToString(mergeData.LAST, charset),
                             CharsetToolkit.bytesToString(mergeData.ORIGINAL, charset),
                             type, myProject, null, null);
    request.setWindowTitle(FileUtil.toSystemDependentName(myFile.getPresentableUrl()));
    // todo titles?
    VcsRevisionNumber lastRevisionNumber = mergeData.LAST_REVISION_NUMBER;
    request.setVersionTitles(new String[]{myChange.getAfterRevision().getRevisionNumber().asString(),
      "Base Version", lastRevisionNumber != null ? lastRevisionNumber.asString() : ""});
    return new MyResult(request, DiffPresentationReturnValue.useRequest);
  }
  catch (VcsException e) {
    LOG.info(e);
    return createErrorResult();
  }
}
 

import com.intellij.openapi.vcs.merge.MergeData; //导入依赖的package包/类
@Override
@NotNull
public MergeData loadRevisions(@NotNull final VirtualFile file) throws VcsException {
  final MergeData mergeData = new MergeData();
  final VirtualFile root = GitUtil.getGitRoot(file);
  final FilePath path = VcsUtil.getFilePath(file.getPath());

  VcsRunnable runnable = new VcsRunnable() {
    @Override
    @SuppressWarnings({"ConstantConditions"})
    public void run() throws VcsException {
      GitFileRevision original = new GitFileRevision(myProject, path, new GitRevisionNumber(":" + ORIGINAL_REVISION_NUM));
      GitFileRevision current = new GitFileRevision(myProject, path, new GitRevisionNumber(":" + yoursRevision(root)));
      GitFileRevision last = new GitFileRevision(myProject, path, new GitRevisionNumber(":" + theirsRevision(root)));
      try {
        try {
          mergeData.ORIGINAL = original.getContent();
        }
        catch (Exception ex) {
          /// unable to load original revision, use the current instead
          /// This could happen in case if rebasing.
          mergeData.ORIGINAL = file.contentsToByteArray();
        }
        mergeData.CURRENT = loadRevisionCatchingErrors(current);
        mergeData.LAST = loadRevisionCatchingErrors(last);
        mergeData.LAST_REVISION_NUMBER = findLastRevisionNumber(root);
      }
      catch (IOException e) {
        throw new IllegalStateException("Failed to load file content", e);
      }
    }
  };
  VcsUtil.runVcsProcessWithProgress(runnable, GitBundle.message("merge.load.files"), false, myProject);
  return mergeData;
}
 

import com.intellij.openapi.vcs.merge.MergeData; //导入依赖的package包/类
private void verifyMergeData(final VirtualFile file, String expectedBase, String expectedLocal, String expectedServer)
  throws VcsException {
  final MergeData mergeData = myMergeProvider.loadRevisions(file);
  assertEquals(expectedBase, mergeData.ORIGINAL);
  assertEquals(expectedServer, mergeData.LAST);
  assertEquals(expectedLocal, mergeData.CURRENT);
}
 

import com.intellij.openapi.vcs.merge.MergeData; //导入依赖的package包/类
@NotNull
public MergeData loadRevisions(final VirtualFile file) throws VcsException {
  final MergeData mergeData = new MergeData();
  if (file == null) return mergeData;
  final VirtualFile root = GitUtil.getGitRoot(file);
  final FilePath path = VcsUtil.getFilePath(file.getPath());

  VcsRunnable runnable = new VcsRunnable() {
    @SuppressWarnings({"ConstantConditions"})
    public void run() throws VcsException {
      GitFileRevision original = new GitFileRevision(myProject, path, new GitRevisionNumber(":" + ORIGINAL_REVISION_NUM));
      GitFileRevision current = new GitFileRevision(myProject, path, new GitRevisionNumber(":" + yoursRevision(root)));
      GitFileRevision last = new GitFileRevision(myProject, path, new GitRevisionNumber(":" + theirsRevision(root)));
      try {
        try {
          mergeData.ORIGINAL = original.getContent();
        }
        catch (Exception ex) {
          /// unable to load original revision, use the current instead
          /// This could happen in case if rebasing.
          mergeData.ORIGINAL = file.contentsToByteArray();
        }
        mergeData.CURRENT = loadRevisionCatchingErrors(current);
        mergeData.LAST = loadRevisionCatchingErrors(last);
        mergeData.LAST_REVISION_NUMBER = findLastRevisionNumber(root);
      }
      catch (IOException e) {
        throw new IllegalStateException("Failed to load file content", e);
      }
    }
  };
  VcsUtil.runVcsProcessWithProgress(runnable, GitBundle.message("merge.load.files"), false, myProject);
  return mergeData;
}
 

import com.intellij.openapi.vcs.merge.MergeData; //导入依赖的package包/类
public static void putRevisionInfos(@Nonnull DiffRequest request, @Nonnull MergeData data) {
  if (request instanceof ContentDiffRequest) {
    List<? extends DiffContent> contents = ((ContentDiffRequest)request).getContents();
    if (contents.size() == 3) {
      putRevisionInfo(contents, data);
    }
  }
}
 

import com.intellij.openapi.vcs.merge.MergeData; //导入依赖的package包/类
private static void putRevisionInfo(@Nonnull List<? extends DiffContent> contents, @Nonnull MergeData data) {
  for (ThreeSide side : ThreeSide.values()) {
    DiffContent content = side.select(contents);
    FilePath filePath = side.select(data.CURRENT_FILE_PATH, data.ORIGINAL_FILE_PATH, data.LAST_FILE_PATH);
    VcsRevisionNumber revision = side.select(data.CURRENT_REVISION_NUMBER, data.ORIGINAL_REVISION_NUMBER, data.LAST_REVISION_NUMBER);
    if (filePath != null && revision != null) {
      content.putUserData(DiffUserDataKeysEx.REVISION_INFO, Pair.create(filePath, revision));
    }
  }
}
 

import com.intellij.openapi.vcs.merge.MergeData; //导入依赖的package包/类
@Override
public MyResult step(DiffChainContext context) {
  if (myChange.getAfterRevision() == null) return createErrorResult();
  FileType type = myChange.getVirtualFile() != null ? myChange.getVirtualFile().getFileType() : null;
  if (myFile.getFileType().isBinary()) {
    final boolean nowItIsText = ChangeDiffRequestPresentable.checkAssociate(myProject, myFile.getName(), context);
    if (! nowItIsText) {
      return createErrorResult();
    }
  }
  final AbstractVcs vcs = ChangesUtil.getVcsForChange(myChange, myProject);
  if (vcs == null || vcs.getMergeProvider() == null) {
    return createErrorResult();
  }
  try {
    final MergeData mergeData = vcs.getMergeProvider().loadRevisions(myFile);
    final Charset charset = myFile.getCharset();
    final MergeRequest request = DiffRequestFactory.getInstance()
            .create3WayDiffRequest(CharsetToolkit.bytesToString(mergeData.CURRENT, charset),
                                   CharsetToolkit.bytesToString(mergeData.LAST, charset),
                                   CharsetToolkit.bytesToString(mergeData.ORIGINAL, charset),
                                   type, myProject, null, null);
    request.setWindowTitle(FileUtil.toSystemDependentName(myFile.getPresentableUrl()));
    // todo titles?
    VcsRevisionNumber lastRevisionNumber = mergeData.LAST_REVISION_NUMBER;
    request.setVersionTitles(new String[]{myChange.getAfterRevision().getRevisionNumber().asString(),
            "Base Version", lastRevisionNumber != null ? lastRevisionNumber.asString() : ""});
    return new MyResult(request, DiffPresentationReturnValue.useRequest);
  }
  catch (VcsException e) {
    LOG.info(e);
    return createErrorResult();
  }
}
 

import com.intellij.openapi.vcs.merge.MergeData; //导入依赖的package包/类
@NotNull
public MergeData loadRevisions(@NotNull final VirtualFile file) throws VcsException {
  final MergeData data = new MergeData();
  VcsRunnable runnable = new VcsRunnable() {
    public void run() throws VcsException {
      File oldFile = null;
      File newFile = null;
      File workingFile = null;
      boolean mergeCase = false;
      SvnVcs vcs = SvnVcs.getInstance(myProject);
      Info info = vcs.getInfo(file);

      if (info != null) {
        oldFile = info.getConflictOldFile();
        newFile = info.getConflictNewFile();
        workingFile = info.getConflictWrkFile();
        mergeCase = workingFile == null || workingFile.getName().contains("working");
        // for debug
        if (workingFile == null) {
          LOG.info("Null working file when merging text conflict for " + file.getPath() + " old file: " + oldFile + " new file: " + newFile);
        }
        if (mergeCase) {
          // this is merge case
          oldFile = info.getConflictNewFile();
          newFile = info.getConflictOldFile();
          workingFile = info.getConflictWrkFile();
        }
        data.LAST_REVISION_NUMBER = new SvnRevisionNumber(info.getRevision());
      } else {
        throw new VcsException("Could not get info for " + file.getPath());
      }
      if (oldFile == null || newFile == null || workingFile == null) {
        ByteArrayOutputStream bos = getBaseRevisionContents(vcs, file);
        data.ORIGINAL = bos.toByteArray();
        data.LAST = bos.toByteArray();
        data.CURRENT = readFile(new File(file.getPath()));
      }
      else {
        data.ORIGINAL = readFile(oldFile);
        data.LAST = readFile(newFile);
        data.CURRENT = readFile(workingFile);
      }
      if (mergeCase) {
        final ByteArrayOutputStream contents = getBaseRevisionContents(vcs, file);
        if (! Arrays.equals(contents.toByteArray(), data.ORIGINAL)) {
          // swap base and server: another order of merge arguments
          byte[] original = data.ORIGINAL;
          data.ORIGINAL = data.LAST;
          data.LAST = original;
        }
      }
    }
  };
  VcsUtil.runVcsProcessWithProgress(runnable, VcsBundle.message("multiple.file.merge.loading.progress.title"), false, myProject);

  return data;
}
 

import com.intellij.openapi.vcs.merge.MergeData; //导入依赖的package包/类
@NotNull
public MergeData loadRevisions(final VirtualFile file) throws VcsException {
  final MergeData data = new MergeData();
  VcsRunnable runnable = new VcsRunnable() {
    public void run() throws VcsException {
      SvnVcs vcs = SvnVcs.getInstance(myProject);
      File oldFile = null;
      File newFile = null;
      File workingFile = null;
      SVNWCClient client;
      boolean mergeCase = false;
      try {
        client = vcs.createWCClient();
        SVNInfo info = client.doInfo(new File(file.getPath()), SVNRevision.UNDEFINED);
        if (info != null) {
          oldFile = info.getConflictOldFile();
          newFile = info.getConflictNewFile();
          workingFile = info.getConflictWrkFile();
          mergeCase = workingFile == null || workingFile.getName().contains("working");
          // for debug
          if (workingFile == null) {
            LOG.info("Null working file when merging text conflict for " + file.getPath() + " old file: " + oldFile + " new file: " + newFile);
          }
          if (mergeCase) {
            // this is merge case
            oldFile = info.getConflictNewFile();
            newFile = info.getConflictOldFile();
            workingFile = info.getConflictWrkFile();
          }
          data.LAST_REVISION_NUMBER = new SvnRevisionNumber(info.getRevision());
        }
      }
      catch (SVNException e) {
        throw new VcsException(e);
      }
      if (oldFile == null || newFile == null || workingFile == null) {
        ByteArrayOutputStream bos = getBaseRevisionContents(client, file);
        data.ORIGINAL = bos.toByteArray();
        data.LAST = bos.toByteArray();
        data.CURRENT = readFile(new File(file.getPath()));
      }
      else {
        data.ORIGINAL = readFile(oldFile);
        data.LAST = readFile(newFile);
        data.CURRENT = readFile(workingFile);
      }
      if (mergeCase) {
        final ByteArrayOutputStream contents = getBaseRevisionContents(vcs.createWCClient(), file);
        if (! Arrays.equals(contents.toByteArray(), data.ORIGINAL)) {
          // swap base and server: another order of merge arguments
          byte[] original = data.ORIGINAL;
          data.ORIGINAL = data.LAST;
          data.LAST = original;
        }
      }
    }
  };
  VcsUtil.runVcsProcessWithProgress(runnable, VcsBundle.message("multiple.file.merge.loading.progress.title"), false, myProject);

  return data;
}