From 8583eb961dedba283b6adb3d1b4b365526872b3c Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 13 Mar 2014 13:08:16 +0400 Subject: [PATCH 1/2] [git] IDEA-122086 update repository info after cherry-pick --- .../git4idea/src/git4idea/cherrypick/GitCherryPicker.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java index a19ea0726201..7cd821d8de86 100644 --- a/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java +++ b/plugins/git4idea/src/git4idea/cherrypick/GitCherryPicker.java @@ -81,7 +81,10 @@ public class GitCherryPicker { public void cherryPick(@NotNull Map> commitsInRoots) { List successfulCommits = new ArrayList(); for (Map.Entry> entry : commitsInRoots.entrySet()) { - if (!cherryPick(entry.getKey(), entry.getValue(), successfulCommits)) { + GitRepository repository = entry.getKey(); + boolean result = cherryPick(repository, entry.getValue(), successfulCommits); + repository.update(); + if (!result) { return; } } From 86eda0804bfc46ef091b471b4e97ad339b5a678e Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Thu, 13 Mar 2014 13:17:45 +0400 Subject: [PATCH 2/2] [log] IDEA-117753 trim spaces in log filters --- .../intellij/vcs/log/ui/filter/MultilinePopupBuilder.java | 8 +++++++- .../intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultilinePopupBuilder.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultilinePopupBuilder.java index bb61a79ffb31..44baa2cc5da6 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultilinePopupBuilder.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultilinePopupBuilder.java @@ -34,6 +34,7 @@ import com.intellij.ui.EditorCustomization; import com.intellij.ui.EditorTextField; import com.intellij.ui.EditorTextFieldProvider; import com.intellij.ui.SoftWrapsEditorCustomization; +import com.intellij.util.Function; import com.intellij.util.TextFieldCompletionProviderDumbAware; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -94,7 +95,12 @@ class MultilinePopupBuilder { @NotNull Collection getSelectedValues() { - return ContainerUtil.toCollection(StringUtil.tokenize(myTextField.getText().trim(), new String(SEPARATORS))); + return ContainerUtil.map(StringUtil.tokenize(myTextField.getText(), new String(SEPARATORS)), new Function() { + @Override + public String fun(String value) { + return value.trim(); + } + }); } private static class MyCompletionProvider extends TextFieldCompletionProviderDumbAware { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java index d33e2ef67ec1..446b84cbb898 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/VcsLogClassicFilterUi.java @@ -91,7 +91,7 @@ public class VcsLogClassicFilterUi implements VcsLogFilterUi { @NotNull @Override public VcsLogFilterCollection getFilters() { - VcsLogTextFilter textFilter = !myTextFilter.getText().isEmpty() ? new VcsLogTextFilterImpl(myTextFilter.getText()) : null; + VcsLogTextFilter textFilter = !myTextFilter.getText().isEmpty() ? new VcsLogTextFilterImpl(myTextFilter.getText().trim()) : null; return new VcsLogFilterCollectionImpl(myBranchFilterComponent.getFilter(), myUserFilterComponent.getFilter(), myDateFilterComponent.getFilter(), textFilter, myStructureFilterComponent.getFilter()); }