Skip to content

Commit

Permalink
Fix for bug #226
Browse files Browse the repository at this point in the history
  • Loading branch information
groboclown committed Apr 8, 2021
1 parent f8221d1 commit 1e7581a
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 8 deletions.
11 changes: 11 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
# IDEA Community VCS Integration for Perforce


## ::v0.11.3::

### Overview

* Bug fixes

### Details

* Change provider make an incorrect assumption that the IDE API `getListsCopy` call returned a mutable value (bug #225).


## ::v0.11.2::

### Overview
Expand Down
3 changes: 3 additions & 0 deletions lib/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,9 @@ $ cd idea-community
$ git fetch --all --tags --prune
$ git checkout -f tags/idea/191.8026.42 -b 191
$ git clean -f -e android -e tools-base
$ cd android
$ git fetch --all --tags --prune
$ git checkout -f tags/
```

That might be paranoid, but it works and keeps you from running into odd compile failures, especially after a fetch in an existing repository.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -247,8 +247,7 @@ public P4CommandRunner.QueryAnswer<ListClientsForUserResult> checkServerConnecti
// For Configuration UI. Avoids cache hits.
private P4CommandRunner.QueryAnswer<ListOpenedFilesChangesResult> checkClientConnection(ClientConfig clientConfig) {
// This is necessary for loading a project from version control when the project isn't setup yet.
// Init is happening earlier now
// initComponent();
// Don't init the component here; it is happening earlier now
return connectRunner.listOpenedFilesChanges(
// Checking the connection doesn't require a root; we don't care about the files returned.
clientConfig, new ListOpenedFilesChangesQuery(null, 1, 1));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,9 @@ private Set<FilePath> getMatchedDirtyRootFiles(Set<FilePath> dirtyFiles,

private P4CommandRunner.ActionAnswer<Object> updateChangelists(IdeChangelistMap changelistMap, ChangeListManagerGate addGate)
throws InterruptedException {
List<LocalChangeList> existingLocalChangeLists = addGate.getListsCopy();
// Need to make a copy of the changelists, because it can be immutable.
// See bug #226
List<LocalChangeList> existingLocalChangeLists = new ArrayList<>(addGate.getListsCopy());
P4CommandRunner.ActionAnswer<Object> actions = new DoneActionAnswer<>(null);

Collection<ClientConfigRoot> roots = getClientConfigRoots();
Expand Down
9 changes: 4 additions & 5 deletions plugin-v3/src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
@@ -1,19 +1,18 @@
<idea-plugin>
<name>Perforce IDEA Community Integration</name>
<id>PerforceIC</id>
<version>0.11.2</version>
<version>0.11.3</version>
<!-- see http://www.jetbrains.org/intellij/sdk/docs/basics/getting_started/build_number_ranges.html -->
<idea-version since-build="171"/>
<category>VCS Integration</category>
<change-notes><![CDATA[
<ul>
<li><em>0.11.3</em><ul>
<li>Fixed a bug where a list returned by the IDE API was assumed to be mutable.</li>
</ul></li>
<li><em>0.11.2</em><ul>
<li>Fixed compatiblity check to handle JetBrains 2020.2.1 and Android Studio 4.0.</li>
</ul></li>
<li><em>0.11.1</em><ul>
<li>Fixed a bug related to an NPE on a cached component.</li>
<li>Fixed a bug where the encoding from the Perforce server wasn't supported by Java (specifically, `utf8-bom`). It now tries to strip the "-bom" off, then will resort to the default enocding of the local computer.</li>
</ul></li>
</ul>
]]></change-notes>
<description><![CDATA[
Expand Down

0 comments on commit 1e7581a

Please sign in to comment.