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

vcs: additional logging in commit dialog

Browse Source
This commit is contained in:
Aleksey Pivovarov
2018-04-16 16:02:08 +03:00
parent 0fd1df69ba
commit 42429d6171
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/CommitChangeListDialog.java
+13 -1
View File
@@ -15,6 +15,7 @@ import com.intellij.openapi.actionSystem.AnAction;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.openapi.application.ModalityState;
import com.intellij.openapi.diagnostic.Logger;
import com.intellij.openapi.extensions.Extensions;
import com.intellij.openapi.fileEditor.FileDocumentManager;
import com.intellij.openapi.progress.ProgressManager;
@@ -60,6 +61,7 @@ import java.io.File;
import java.util.*;
import java.util.List;
import static com.intellij.openapi.diagnostic.Logger.getInstance;
import static com.intellij.openapi.util.text.StringUtil.escapeXml;
import static com.intellij.openapi.vcs.VcsBundle.message;
import static com.intellij.util.ArrayUtil.isEmpty;
@@ -78,6 +80,8 @@ import static com.intellij.util.ui.UIUtil.*;
import static java.util.Collections.*;
public class CommitChangeListDialog extends DialogWrapper implements CheckinProjectPanel, DataProvider {
private static final Logger LOG = getInstance(CommitChangeListDialog.class);
private static final String HELP_ID = "reference.dialogs.vcs.commit";
private static final String TITLE = message("commit.dialog.title");
@@ -663,12 +667,14 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
commitExecutor.getActionText(), true, getProject());
if (completed) {
LOG.debug("Commit successful");
myHandlers.forEach(CheckinHandler::checkinSuccessful);
success = true;
defaultListCleaner.clean();
close(OK_EXIT_CODE);
}
else {
LOG.debug("Commit canceled");
session.executionCanceled();
}
}
@@ -828,6 +834,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
private CheckinHandler.ReturnResult runBeforeCheckinHandlers(@Nullable CommitExecutor executor) {
for (CheckinHandler handler : myHandlers) {
if (!handler.acceptExecutor(executor)) continue;
LOG.debug("CheckinHandler.beforeCheckin: " + handler);
CheckinHandler.ReturnResult result = handler.beforeCheckin(executor, myCommitOptions.getAdditionalData());
if (result == CheckinHandler.ReturnResult.COMMIT) continue;
if (result == CheckinHandler.ReturnResult.CANCEL) {
@@ -850,8 +857,12 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
private Runnable wrapIntoCheckinMetaHandlers(Runnable runnable) {
for (CheckinHandler handler : myHandlers) {
if (handler instanceof CheckinMetaHandler) {
CheckinMetaHandler metaHandler = (CheckinMetaHandler)handler;
Runnable previousRunnable = runnable;
runnable = () -> ((CheckinMetaHandler)handler).runCheckinHandlers(previousRunnable);
runnable = () -> {
LOG.debug("CheckinMetaHandler.runCheckinHandlers: " + handler);
metaHandler.runCheckinHandlers(previousRunnable);
};
}
}
return runnable;
@@ -932,6 +943,7 @@ public class CommitChangeListDialog extends DialogWrapper implements CheckinProj
}
private void doCommit(@Nullable CommitResultHandler customResultHandler) {
LOG.debug("CommitHelper: Do actual commit");
CommitHelper helper =
new CommitHelper(myProject, myBrowser.getSelectedChangeList(), getIncludedChanges(), TITLE, getCommitMessage(), myHandlers,
myAllOfDefaultChangeListChangesIncluded, false, myCommitOptions.getAdditionalData(), customResultHandler, myIsAlien,
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/PartialChangesUtil.java
+10 -2
View File
@@ -123,7 +123,7 @@ public class PartialChangesUtil {
return task.compute();
}
clm.setDefaultChangeList(targetChangeList, true);
switchChangeList(clm, targetChangeList, oldDefaultList);
try {
return task.compute();
}
@@ -143,7 +143,7 @@ public class PartialChangesUtil {
return task.compute();
}
clm.setDefaultChangeList(targetChangeList, true);
switchChangeList(clm, targetChangeList, oldDefaultList);
try {
return task.compute();
}
@@ -155,11 +155,19 @@ public class PartialChangesUtil {
}
}
private static void switchChangeList(@NotNull ChangeListManagerEx clm,
@NotNull LocalChangeList targetChangeList,
@NotNull LocalChangeList oldDefaultList) {
clm.setDefaultChangeList(targetChangeList, true);
LOG.debug(String.format("Active changelist changed: %s -> %s", oldDefaultList.getName(), targetChangeList.getName()));
}
private static void restoreChangeList(@NotNull ChangeListManagerEx clm,
@NotNull LocalChangeList targetChangeList,
@NotNull LocalChangeList oldDefaultList) {
if (Comparing.equal(clm.getDefaultChangeList().getId(), targetChangeList.getId())) {
clm.setDefaultChangeList(oldDefaultList, true);
LOG.debug(String.format("Active changelist restored: %s -> %s", targetChangeList.getName(), oldDefaultList.getName()));
}
else {
LOG.warn(new Throwable("Active changelist was changed during the operation"));