[hg] move HgUtil and HgErrorUtil to the util subpackage.

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgContentRevision.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgContentRevision.java
index 41d1d3dfe930e1d1ccfc2c888eb14f8029411e55..d213e5703b515585af8cd332d5a1ed2f7a052c94 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgContentRevision.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgContentRevision.java
@@ -24,6 +24,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.command.HgCatCommand;
+import org.zmlx.hg4idea.util.HgUtil;
 
 import java.io.UnsupportedEncodingException;
 

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgFileRevision.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgFileRevision.java
index 070190b7ae3339df9397457c62d15fad81b8c1c0..240febc364e370210cbcb167e973b41830bf7bbc 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgFileRevision.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgFileRevision.java
@@ -18,6 +18,7 @@ import com.intellij.openapi.vcs.history.VcsFileRevision;
 import org.apache.commons.lang.builder.EqualsBuilder;
 import org.apache.commons.lang.builder.HashCodeBuilder;
 import org.zmlx.hg4idea.command.HgCatCommand;
+import org.zmlx.hg4idea.util.HgUtil;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java
index 6d9932321be5076dc525abf0ffd632b949806a1c..399290077632fb8aa28972708abfdcaed3277f16 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgPusher.java
@@ -25,6 +25,8 @@ import org.zmlx.hg4idea.command.HgPushCommand;
 import org.zmlx.hg4idea.execution.HgCommandResult;
 import org.zmlx.hg4idea.execution.HgCommandResultHandler;
 import org.zmlx.hg4idea.ui.HgPushDialog;
+import org.zmlx.hg4idea.util.HgErrorUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 
 import java.util.List;
 import java.util.regex.Matcher;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgRootsHandler.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgRootsHandler.java
index 5da62435f18a0ce3b06780824897c5490b43981c..4aef2c46607194c2a27d73b309d9fc9b43af5822 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgRootsHandler.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgRootsHandler.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsUtil;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.Nullable;
+import org.zmlx.hg4idea.util.HgUtil;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java
index 0f98a89c5eca39470f1a26ce148c7c7029734176..10c8dbac9970f4a096f468ab2b150c1420de0fde 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVFSListener.java
@@ -27,6 +27,7 @@ import com.intellij.util.ui.VcsBackgroundTask;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.NotNull;
 import org.zmlx.hg4idea.command.*;
+import org.zmlx.hg4idea.util.HgUtil;
 
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
index a58acb43336ba5fad43270edb993f42767a6815b..0afbaf0ec6b431363ce4144e913acfe29f065a09 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgVcs.java
@@ -59,6 +59,7 @@ import org.zmlx.hg4idea.provider.update.HgIntegrateEnvironment;
 import org.zmlx.hg4idea.provider.update.HgUpdateEnvironment;
 import org.zmlx.hg4idea.ui.HgChangesetStatus;
 import org.zmlx.hg4idea.ui.HgCurrentBranchStatus;
+import org.zmlx.hg4idea.util.HgUtil;
 
 import javax.swing.*;
 import java.io.File;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java
index 2efb5e73116ab3123e68b19f1ccd5ebfafb5131c..82e8489074a91209e3c002543aa2019131d1538d 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractFilesAction.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.TransactionRunnable;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.HgVcs;
 
 import java.lang.reflect.InvocationTargetException;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java
index e752629af8471e49f95d03e3ca4196d16e634c8a..1c4e1ea0c3500b514680538a4dc87e8092a3bb2e 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgAbstractGlobalAction.java
@@ -18,7 +18,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.Nullable;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.execution.HgCommandException;
 
 import java.lang.reflect.InvocationTargetException;
@@ -42,7 +42,7 @@ abstract class HgAbstractGlobalAction extends AnAction {
     }
     try {
       command.execute();
-      HgUtil.markDirectoryDirty(project,command.getRepo());
+      HgUtil.markDirectoryDirty(project, command.getRepo());
     } catch (HgCommandException e) {
       handleException(project, e);
     } catch (InvocationTargetException e) {

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommandResultNotifier.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommandResultNotifier.java
index 7b2aba8799527a6fac1fe3783c263c29fc47fb72..5eaa0f5bed5440042e2559132c863f743c52fcbf 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommandResultNotifier.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgCommandResultNotifier.java
@@ -19,7 +19,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.vcsUtil.VcsUtil;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.Nullable;
-import org.zmlx.hg4idea.HgErrorUtil;
+import org.zmlx.hg4idea.util.HgErrorUtil;
 import org.zmlx.hg4idea.HgVcs;
 import org.zmlx.hg4idea.execution.HgCommandResult;
 

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgInit.java b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgInit.java
index e745a7b0085e0251e4a877cd331583df3c046057..8ab3aaa6c7e1894c90fc78eb51ca6dc6ec71329c 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgInit.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/action/HgInit.java
@@ -13,7 +13,7 @@ import com.intellij.openapi.vcs.VcsDirectoryMapping;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.HgVcs;
 import org.zmlx.hg4idea.HgVcsMessages;
 import org.zmlx.hg4idea.command.HgInitCommand;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgAddCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgAddCommand.java
index 7025c7f68227e0cde547ee1c8c0e0ffba809bec3..fb2445f56450db8f8032a4baffbb69c9dc88aa30 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgAddCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgAddCommand.java
@@ -16,7 +16,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.zmlx.hg4idea.HgFile;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.execution.HgCommandExecutor;
 
 import java.util.Arrays;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgInitCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgInitCommand.java
index 9043571410b097335638539d4bb6a5bb1c055c5a..805becdf15b2cb5e29c586d22e6374a3b6b06533 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgInitCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgInitCommand.java
@@ -5,7 +5,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
-import org.zmlx.hg4idea.HgErrorUtil;
+import org.zmlx.hg4idea.util.HgErrorUtil;
 import org.zmlx.hg4idea.execution.HgCommandExecutor;
 import org.zmlx.hg4idea.execution.HgCommandResult;
 import org.zmlx.hg4idea.execution.HgCommandResultHandler;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRemoveCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRemoveCommand.java
index 6f21cff6bcbbacfce3d8e76b5109a6a6ced1ecd9..802e8b88fc6942833cc0d85ec90fd166ef62836a 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRemoveCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRemoveCommand.java
@@ -16,7 +16,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.zmlx.hg4idea.HgFile;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.execution.HgCommandExecutor;
 
 import java.util.Arrays;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java
index ce13c6e053fab822282cdf732478bf567c1a3b65..eaa89a78c6c069491552b060618428bb1cec485c 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgRevisionsCommand.java
@@ -22,7 +22,7 @@ import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgFile;
 import org.zmlx.hg4idea.HgFileRevision;
 import org.zmlx.hg4idea.HgRevisionNumber;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.util.HgChangesetUtil;
 import org.zmlx.hg4idea.execution.HgCommandResult;
 import org.zmlx.hg4idea.execution.HgCommandExecutor;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
index 689ceb481b7d844f68dacf721bfe6c95b9b812e3..263abab6aa40acf4550984c56fdee340a7152d2a 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/command/HgWorkingCopyRevisionsCommand.java
@@ -22,7 +22,7 @@ import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgRevisionNumber;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.execution.HgCommandResult;
 import org.zmlx.hg4idea.execution.HgCommandExecutor;
 import org.zmlx.hg4idea.util.HgChangesetUtil;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
index 385e390e8b77e008789b724d111a698eaf0f8ca7..0b974bfa4c7406918f1bccacaeee2f2e3217c7df 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/execution/HgCommandExecutor.java
@@ -21,6 +21,7 @@ import com.intellij.vcsUtil.VcsUtil;
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.*;
+import org.zmlx.hg4idea.util.HgErrorUtil;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java
index a6690f64f6de1d6cc889fa1280ac2b8eafbd6f8f..f19a2429102a66c40e6881ce047d13726e62161f 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgHistoryProvider.java
@@ -23,7 +23,7 @@ import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.Nullable;
 import org.zmlx.hg4idea.HgFile;
 import org.zmlx.hg4idea.HgFileRevision;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.command.HgLogCommand;
 import org.zmlx.hg4idea.command.HgWorkingCopyRevisionsCommand;
 

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgMergeProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgMergeProvider.java
index 1d31179d512aa82d5c33584b680d0e0e4d749315..a21515c79577d3f6f8e271976f9a6a8dd90a9f96 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgMergeProvider.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/HgMergeProvider.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull;
 import org.zmlx.hg4idea.HgContentRevision;
 import org.zmlx.hg4idea.HgFile;
 import org.zmlx.hg4idea.HgRevisionNumber;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.command.HgResolveCommand;
 import org.zmlx.hg4idea.command.HgWorkingCopyRevisionsCommand;
 

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgHeadMerger.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgHeadMerger.java
index 7120af385c8de732c3b3e833352d7fc676d30c53..8e710804ac443432d2c7a382dc526b1fc81ec00f 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgHeadMerger.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/update/HgHeadMerger.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.zmlx.hg4idea.HgChange;
 import org.zmlx.hg4idea.HgFile;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.HgVcs;
 import org.zmlx.hg4idea.execution.HgCommandResult;
 import org.zmlx.hg4idea.command.HgMergeCommand;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgInitDialog.java b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgInitDialog.java
index 936d9915147854e073134b67dec007ddf3f5b92d..281c9b860a21090622e836438c0403b368d0e95d 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgInitDialog.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/ui/HgInitDialog.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.Nullable;
-import org.zmlx.hg4idea.HgUtil;
+import org.zmlx.hg4idea.util.HgUtil;
 import org.zmlx.hg4idea.HgVcsMessages;
 
 import javax.swing.*;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgErrorUtil.java
similarity index 98%
rename from plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorUtil.java
rename to plugins/hg4idea/src/org/zmlx/hg4idea/util/HgErrorUtil.java
index a9c087df5035e70d72c1a065c3380bb5de78aea9..6f328d14f6fe90b801bcafc432dddbaee7d1b8da 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgErrorUtil.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgErrorUtil.java
@@ -10,7 +10,7 @@
 // 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.
-package org.zmlx.hg4idea;
+package org.zmlx.hg4idea.util;
 
 import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.Nullable;

diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
similarity index 99%
rename from plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java
rename to plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
index 9a8c4b6fc9892d9d24096a4e5fdaf741038f50e2..2545612e5831caf905e08a91824b820b8a13ea0f 100644 (file)
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgUtil.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/util/HgUtil.java
@@ -10,7 +10,7 @@
 // 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.
-package org.zmlx.hg4idea;
+package org.zmlx.hg4idea.util;
 
 import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
@@ -31,6 +31,7 @@ import com.intellij.util.containers.HashMap;
 import com.intellij.vcsUtil.VcsUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.zmlx.hg4idea.*;
 import org.zmlx.hg4idea.command.HgRemoveCommand;
 import org.zmlx.hg4idea.command.HgStatusCommand;
 import org.zmlx.hg4idea.command.HgWorkingCopyRevisionsCommand;