From 64bb1c226ebb76e7795c7b5dcfadc429a001aa4b Mon Sep 17 00:00:00 2001 From: irengrig Date: Mon, 19 Mar 2012 16:59:17 +0400 Subject: [PATCH] SVN: we do not need auto-upgrade to any SVN version now (native svn does not upgrade to 1.7 automatically) --- .../src/org/jetbrains/idea/svn/SvnVcs.java | 53 ------------------- 1 file changed, 53 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java index a817078ce36d..d2ffac3d0ac7 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java @@ -297,10 +297,8 @@ public class SvnVcs extends AbstractVcs { SvnConfiguration.SvnSupportOptions supportOptions = null; try { ChangeListManager.getInstance(myProject).setReadOnly(SvnChangeProvider.ourDefaultListName, true); - supportOptions = myConfiguration.getSupportOptions(myProject); - upgradeToRecentVersion(supportOptions); if (! supportOptions.changeListsSynchronized()) { processChangeLists(lists); } @@ -363,30 +361,6 @@ public class SvnVcs extends AbstractVcs { } } - private void upgradeToRecentVersion(final SvnConfiguration.SvnSupportOptions supportOptions) { - if (! supportOptions.upgradeTo16Asked()) { - final SvnWorkingCopyChecker workingCopyChecker = new SvnWorkingCopyChecker(); - - if (workingCopyChecker.upgradeNeeded()) { - - Notifications.Bus.notify(new Notification(getDisplayName(), SvnBundle.message("upgrade.format.to16.question.title"), - "Old format Subversion working copies could be upgraded to version 1.6.", - NotificationType.INFORMATION, new NotificationListener() { - public void hyperlinkUpdate(@NotNull Notification notification, @NotNull HyperlinkEvent event) { - final int upgradeAnswer = Messages.showYesNoDialog(SvnBundle.message("upgrade.format.to16.question.text", - SvnBundle.message("label.where.svn.format.can.be.changed.text", SvnBundle.message("action.show.svn.map.text.reference"))), - SvnBundle.message("upgrade.format.to16.question.title"), Messages.getWarningIcon()); - if (DialogWrapper.OK_EXIT_CODE == upgradeAnswer) { - workingCopyChecker.doUpgrade(); - } - - notification.expire(); - } - })); - } - } - } - @Override public void activate() { createPool(); @@ -1011,33 +985,6 @@ public class SvnVcs extends AbstractVcs { return infos; } - private class SvnWorkingCopyChecker { - private List myAllWcInfos; - - public boolean upgradeNeeded() { - myAllWcInfos = getAllWcInfos(); - for (WCInfo info : myAllWcInfos) { - if (! WorkingCopyFormat.ONE_DOT_SIX.equals(info.getFormat())) { - return true; - } - } - return false; - } - - public void doUpgrade() { - ApplicationManager.getApplication().invokeLater(new Runnable() { - public void run() { - final SvnFormatWorker formatWorker = new SvnFormatWorker(myProject, WorkingCopyFormat.ONE_DOT_SIX, myAllWcInfos); - // additionally ask about working copies with roots above the project root - formatWorker.checkForOutsideCopies(); - if (formatWorker.haveStuffToConvert()) { - ProgressManager.getInstance().run(formatWorker); - } - } - }); - } - } - @Override public RootsConvertor getCustomConvertor() { if (myProject.isDefault()) return null;