From a472d35528242d95fbc9306ef95b28b928e99bf3 Mon Sep 17 00:00:00 2001 From: Konstantin Kolosovsky Date: Tue, 18 Feb 2014 21:41:34 +0400 Subject: [PATCH] svn: Optimized IdeaCommitHandler - track deleted files only if required (corresponding parameter is set) --- .../org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java | 8 +++++--- .../jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java index 96c96161c898..d35752a9c41a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/IdeaCommitHandler.java @@ -48,14 +48,16 @@ public class IdeaCommitHandler implements CommitEventHandler, ISVNEventHandler { @Nullable private final ProgressIndicator myProgress; @NotNull private final List myDeletedFiles = ContainerUtil.newArrayList(); private final boolean myCheckCancel; + private final boolean myTrackDeletedFiles; public IdeaCommitHandler(@Nullable ProgressIndicator progress) { - this(progress, false); + this(progress, false, false); } - public IdeaCommitHandler(@Nullable ProgressIndicator progress, boolean checkCancel) { + public IdeaCommitHandler(@Nullable ProgressIndicator progress, boolean checkCancel, boolean trackDeletedFiles) { myProgress = progress; myCheckCancel = checkCancel; + myTrackDeletedFiles = trackDeletedFiles; } @NotNull @@ -83,7 +85,7 @@ public class IdeaCommitHandler implements CommitEventHandler, ISVNEventHandler { if (path != null) { CommitEventType eventType = convert(event.getAction()); - if (CommitEventType.deleting.equals(eventType)) { + if (CommitEventType.deleting.equals(eventType) && myTrackDeletedFiles) { trackDeletedFile(event); } updateProgress(eventType, path); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java index 8c9756ba8a1d..b3303e074170 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/checkin/SvnCheckinEnvironment.java @@ -94,7 +94,7 @@ public class SvnCheckinEnvironment implements CheckinEnvironment { final SVNCommitClient committer = mySvnVcs.createCommitClient(); final ProgressIndicator progress = ProgressManager.getInstance().getProgressIndicator(); - IdeaCommitHandler handler = new IdeaCommitHandler(progress, true); + IdeaCommitHandler handler = new IdeaCommitHandler(progress, true, true); if (progress != null) { committer.setEventHandler(handler); }