From 499c73e2e0bf18486fc94dfabc3f7d53cd48a30a Mon Sep 17 00:00:00 2001 From: irengrig Date: Wed, 19 Dec 2012 16:15:06 +0400 Subject: [PATCH] IDEA-54047 Subversion: in CreateBranch dialog browse button doesn't work for Base URL if the working copy lies below the project directory and default VCS mapping is used --- .../src/org/jetbrains/idea/svn/dialogs/CopyDialog.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java index fc85e9d56d5f..051aff2b4ec7 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java @@ -84,6 +84,7 @@ public class CopyDialog extends DialogWrapper { @NonNls private static final String HELP_ID = "vcs.subversion.branch"; private SvnBranchConfigurationNew myBranchConfiguration; private final VirtualFile mySrcVirtualFile; + private final String myWcRootUrl; public CopyDialog(final Project project, boolean canBeParent, File file) throws VcsException { super(project, canBeParent); @@ -139,6 +140,7 @@ public class CopyDialog extends DialogWrapper { throw new VcsException("Can not find working copy for file: " + file.getPath()); } this.mySrcVirtualFile = srcVirtualFile; + myWcRootUrl = root.getUrl(); myRevisionPanel.setRoot(mySrcVirtualFile); myRevisionPanel.setProject(myProject); @@ -174,7 +176,7 @@ public class CopyDialog extends DialogWrapper { updateToURL(); myProjectButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - myRepositoryField.setText(myBranchConfiguration.getBaseUrl(mySrcURL)); + myRepositoryField.setText(myWcRootUrl); } }); myBranchTagBaseComboBox.addActionListener(new ActionListener() {