svn: Fix decoded urls parsing in tree conflict panel (IDEA-190790)

plugins/svn4idea/src/org/jetbrains/idea/svn/treeConflict/TreeConflictRefreshablePanel.java

@@ -1,18 +1,4 @@
-/*
- * Copyright 2000-2017 JetBrains s.r.o.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.idea.svn.treeConflict;
 
 import com.intellij.openapi.CompositeDisposable;
@@ -65,7 +51,6 @@ import static com.intellij.openapi.application.ModalityState.defaultModalityStat
 import static com.intellij.openapi.util.io.FileUtil.toSystemIndependentName;
 import static com.intellij.util.ObjectUtils.notNull;
 import static com.intellij.vcsUtil.VcsUtil.getFilePathOnNonLocal;
-import static org.jetbrains.idea.svn.SvnUtil.append;
 import static org.jetbrains.idea.svn.history.SvnHistorySession.getCurrentCommittedRevision;
 
 public class TreeConflictRefreshablePanel implements Disposable {
@@ -482,8 +467,8 @@ public class TreeConflictRefreshablePanel implements Disposable {
       super(vcs.getProject(), version);
       myVcs = vcs;
       myPeg = peg;
-      myPath = getFilePathOnNonLocal(append(version.getRepositoryRoot(), toSystemIndependentName(version.getPath()), true).toString(),
-                                     version.isDirectory());
+      myPath =
+        getFilePathOnNonLocal(version.getRepositoryRoot().appendPath(version.getPath(), false).toDecodedString(), version.isDirectory());
 
       mySessionAdapter = new VcsAppendableHistoryPartnerAdapter();
       /*mySessionAdapter.reportCreatedEmptySession(new SvnHistorySession(myVcs, Collections.<VcsFileRevision>emptyList(),