Search in sources :

Example 1 with HgMergeDialog

use of org.zmlx.hg4idea.ui.HgMergeDialog in project intellij-community by JetBrains.

the class HgMerge method execute.

@Override
public void execute(@NotNull final Project project, @NotNull final Collection<HgRepository> repos, @Nullable final HgRepository selectedRepo) {
    final HgMergeDialog mergeDialog = new HgMergeDialog(project, repos, selectedRepo);
    if (mergeDialog.showAndGet()) {
        final String targetValue = StringUtil.escapeBackSlashes(mergeDialog.getTargetValue());
        final HgRepository repo = mergeDialog.getRepository();
        HgMergeCommand.mergeWith(repo, targetValue, UpdatedFiles.create());
    }
}
Also used : HgRepository(org.zmlx.hg4idea.repo.HgRepository) HgMergeDialog(org.zmlx.hg4idea.ui.HgMergeDialog)

Aggregations

HgRepository (org.zmlx.hg4idea.repo.HgRepository)1 HgMergeDialog (org.zmlx.hg4idea.ui.HgMergeDialog)1