MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

git: remove confusing error message

Browse Source 
GitOrigin-RevId: c9481d12869a7323409ef25ac65ba93b04269e19
This commit is contained in:
Aleksey Pivovarov
2024-06-27 13:44:35 +02:00
committed by intellij-monorepo-bot
parent e545bafa29
commit 157ae7dabe
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
platform/vcs-api/vcs-api-core/resources/messages/VcsBundle.properties
View File

@@ -1116,7 +1116,6 @@ history.failed.to.load.content.for.revision.0=Failed to load content for revisio
history.tab.title.can.not.load.changelist.contents=Cannot load changelist contents
error.annotated.line.out.of.bounds=Annotated line is out of bounds: {0}, total line count: {1}
error.cant.load.affected.files=Cannot load affected files for path ''{0}'' in revision ''{1}''
error.cant.load.affected.files.with.limit=Cannot load affected files for path ''{0}'' in revision ''{1}'' with limit {2} (found {3})
error.cant.get.local.file.for.non.local=Cannot get local location for file ''{0}''
update.label.before.update=Before update
update.notification.title.project.partially.updated=Project Partially Updated

8
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/AbstractVcsHelperImpl.java
View File

@@ -12,6 +12,7 @@ import com.intellij.openapi.application.Application;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.command.CommandProcessor;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.editor.Editor;
import com.intellij.openapi.fileEditor.FileEditor;
import com.intellij.openapi.fileEditor.FileEditorManager;
@@ -81,6 +82,8 @@ import static com.intellij.util.ui.ConfirmationDialog.requestForConfirmation;
import static java.text.MessageFormat.format;
public class AbstractVcsHelperImpl extends AbstractVcsHelper {
private static final Logger LOG = Logger.getInstance(AbstractVcsHelperImpl.class);
private Consumer<VcsException> myCustomHandler = null;
protected AbstractVcsHelperImpl(@NotNull Project project) {
@@ -611,8 +614,9 @@ public class AbstractVcsHelperImpl extends AbstractVcsHelper {
return change;
}
}
throw new VcsException(VcsBundle.message("error.cant.load.affected.files.with.limit",
location, revision.asString(), provider.getUnlimitedCountValue(), changes.size()));
LOG.warn(String.format("Cannot load affected files for location '%s' in revision '%s' with limit %s (found %s)",
location, revision.asString(), provider.getUnlimitedCountValue(), changes.size()), new Throwable());
throw new VcsException(VcsBundle.message("error.cant.load.affected.files", nonLocal.getPath(), revision.asString()));
}
@NotNull