Move GitUtil back to git4idea, because the TeamCity plugin depends on it.

diff --git a/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java b/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java
index acf62daf9c26bc0130d2d6e30aac764b6832ce47..9adb39a90dd78601b5d89411962c0974014f605e 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java
+++ b/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.vcs.changes.BinaryContentRevision;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
 import git4idea.util.GitFileUtils;
-import git4idea.util.GitUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/plugins/git4idea/src/git4idea/GitBranch.java b/plugins/git4idea/src/git4idea/GitBranch.java
index d9e18f73c130cd33f20aace4ab45e152237af97d..f878b16ea1eef66a777f2306789ed17a82a10e5c 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitBranch.java
+++ b/plugins/git4idea/src/git4idea/GitBranch.java
@@ -24,7 +24,6 @@ import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
 import git4idea.config.GitConfigUtil;
 import git4idea.history.GitHistoryUtils;
-import git4idea.util.GitUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/plugins/git4idea/src/git4idea/GitContentRevision.java b/plugins/git4idea/src/git4idea/GitContentRevision.java
index a0043caf9504fa39ea4fd75ed9b34176ed813175..40ba200159cfa470bdcf39dcdecb5b4ea34dd7d1 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitContentRevision.java
+++ b/plugins/git4idea/src/git4idea/GitContentRevision.java
@@ -32,7 +32,6 @@ import com.intellij.vcsUtil.VcsUtil;
 import git4idea.util.GitFileUtils;
 import git4idea.history.wholeTree.GitBinaryMultipleContentsRevision;
 import git4idea.history.wholeTree.GitMultipleContentsRevision;
-import git4idea.util.GitUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/plugins/git4idea/src/git4idea/GitFileRevision.java b/plugins/git4idea/src/git4idea/GitFileRevision.java
index 7f51742cdbc1280bf5b8ea1f8ff53112f853e6d2..a9a6a3e3683b91c8e21d9bb33ce78fcfcf736563 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitFileRevision.java
+++ b/plugins/git4idea/src/git4idea/GitFileRevision.java
@@ -28,7 +28,6 @@ import com.intellij.openapi.vcs.impl.ContentRevisionCache;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
 import git4idea.util.GitFileUtils;
-import git4idea.util.GitUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/plugins/git4idea/src/git4idea/GitRevisionNumber.java b/plugins/git4idea/src/git4idea/GitRevisionNumber.java
index 1f107db17ee9bd67037429cee864f877c554b36d..0b7afd0b3bc9fb515fefc83237e0dd8e17033e78 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitRevisionNumber.java
+++ b/plugins/git4idea/src/git4idea/GitRevisionNumber.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.util.GitUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/GitRootConverter.java b/plugins/git4idea/src/git4idea/GitRootConverter.java
index 30e098ade0ddd0fd079cca8ac57bedd4e1d906b6..ed073ff9e338888c5fc2d1bf9368593892de86fd 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitRootConverter.java
+++ b/plugins/git4idea/src/git4idea/GitRootConverter.java
@@ -19,7 +19,6 @@ package git4idea;
 import com.intellij.openapi.vcs.AbstractVcs;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.HashSet;
-import git4idea.util.GitUtil;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/plugins/git4idea/src/git4idea/util/GitUtil.java b/plugins/git4idea/src/git4idea/GitUtil.java
similarity index 99%
rename from plugins/git4idea/src/git4idea/util/GitUtil.java
rename to plugins/git4idea/src/git4idea/GitUtil.java
index c60870eba110c427a74d41f777cc6a32ebbb3e50..6fa5f09f2b45d576d2f8af55fb6f7969866fabbe 100644 (file)
--- a/plugins/git4idea/src/git4idea/util/GitUtil.java
+++ b/plugins/git4idea/src/git4idea/GitUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.util;
+package git4idea;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -29,19 +29,17 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
 import com.intellij.vcsUtil.VcsFileUtil;
 import com.intellij.vcsUtil.VcsUtil;
-import git4idea.GitBranch;
-import git4idea.GitVcs;
 import git4idea.changes.GitChangeUtils;
 import git4idea.changes.GitCommittedChangeList;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitHandler;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.util.StringScanner;
 import git4idea.config.GitConfigUtil;
 import git4idea.i18n.GitBundle;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
+import git4idea.util.StringScanner;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -57,7 +55,7 @@ public class GitUtil {
   /**
    * The logger instance
    */
-  private final static Logger LOG = Logger.getInstance("#git4idea.util.GitUtil");
+  private final static Logger LOG = Logger.getInstance("#git4idea.GitUtil");
   /**
    * Comparator for virtual files by name
    */

diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java
index a8f4654375cb3455f25dd92c629b01a7a3dd9505..960ae602b6b9d5b7edf3b7900e6f7d8e961a2697 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitVcs.java
+++ b/plugins/git4idea/src/git4idea/GitVcs.java
@@ -73,7 +73,6 @@ import git4idea.rollback.GitRollbackEnvironment;
 import git4idea.status.GitChangeProvider;
 import git4idea.ui.branch.GitBranchWidget;
 import git4idea.update.GitUpdateEnvironment;
-import git4idea.util.GitUtil;
 import git4idea.vfs.GitRootTracker;
 import git4idea.vfs.GitRootsListener;
 import git4idea.vfs.GitVFSListener;

diff --git a/plugins/git4idea/src/git4idea/actions/GitAdd.java b/plugins/git4idea/src/git4idea/actions/GitAdd.java
index 8085e89207fdd19169d6bf87a9d0e6096dd6ae9f..516c131383aa405fe9620403e3a0471ebb2f1ea9 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/GitAdd.java
+++ b/plugins/git4idea/src/git4idea/actions/GitAdd.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.util.GitFileUtils;
 import git4idea.i18n.GitBundle;

diff --git a/plugins/git4idea/src/git4idea/actions/GitInit.java b/plugins/git4idea/src/git4idea/actions/GitInit.java
index 7ec5c87b2be475dabc3d875fc218646def67176f..1709c05d89c92d9b3fc52e6c01975c86f9b9f0c9 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/GitInit.java
+++ b/plugins/git4idea/src/git4idea/actions/GitInit.java
@@ -32,8 +32,8 @@ import com.intellij.openapi.vcs.VcsDirectoryMapping;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
+import git4idea.GitUtil;
 import git4idea.commands.Git;
-import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.i18n.GitBundle;
 import git4idea.util.GitUIUtil;

diff --git a/plugins/git4idea/src/git4idea/actions/GitPull.java b/plugins/git4idea/src/git4idea/actions/GitPull.java
index af22bfad82384d409fa9719d22274ba092b41289..d2a370cb67cfab1d72623e5fd5170e0f274cbfe8 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/GitPull.java
+++ b/plugins/git4idea/src/git4idea/actions/GitPull.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.update.ActionInfo;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitLineHandler;
 import git4idea.commands.GitStandardProgressAnalyzer;
 import git4idea.commands.GitTask;

diff --git a/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java b/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java
index 356dbe04fe3285f952b7b4357ca3613a533c5ce9..a9fffc8cc91c5b8d6e9498cce0454cdd32908fef 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java
+++ b/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java
@@ -27,7 +27,7 @@ import com.intellij.openapi.vcs.TransactionRunnable;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.i18n.GitBundle;
 import git4idea.repo.GitRepository;

diff --git a/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java b/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java
index 13ea34a7a9dd0862f4b06efcc612c2e17de9e621..ceb6ddaee93824b8dab704b44a7e40d6236c31ea 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java
+++ b/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java
@@ -31,7 +31,7 @@ import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ui.UIUtil;
 import git4idea.GitFileRevision;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.changes.GitChangeUtils;
 import git4idea.i18n.GitBundle;
 import git4idea.util.GitUIUtil;

diff --git a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
index ab0a1b372e21b61cbe9fd38c28710e7c434bc396..d9490caf578d63a364b376082a0ea10861c13c5c 100644 (file)
--- a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
+++ b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
@@ -32,7 +32,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.GitFileRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
 import git4idea.util.StringScanner;

diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
index 13c3bc156406a39d14502a0a886544a76fdd5e3e..ae3b8a239dab280c9795f4ecc07ac9c618345eae 100644 (file)
--- a/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
+++ b/plugins/git4idea/src/git4idea/branch/GitBranchOperation.java
@@ -27,7 +27,7 @@ import com.intellij.util.ui.UIUtil;
 import git4idea.GitVcs;
 import git4idea.merge.GitConflictResolver;
 import git4idea.repo.GitRepository;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.event.HyperlinkEvent;
@@ -192,7 +192,8 @@ abstract class GitBranchOperation {
         String description = "You have to resolve all merge conflicts before checkout.<br/>" + getRollbackProposal();
         // suppressing: this message looks ugly if capitalized by words
         //noinspection DialogTitleCapitalization
-        ok.set(Messages.OK == Messages.showYesNoDialog(myProject, description, UNMERGED_FILES_ERROR_TITLE, "Rollback", "Don't rollback", Messages.getErrorIcon()));
+        ok.set(Messages.OK == Messages.showYesNoDialog(myProject, description, UNMERGED_FILES_ERROR_TITLE, "Rollback", "Don't rollback",
+                                                       Messages.getErrorIcon()));
       }
     });
     if (ok.get()) {

diff --git a/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java b/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
index b4cd83af43b3f8f4e13748e0241e8fe8f3b1c4a2..b0c3403070f08fb5720900e54a44187bfc8f8925 100644 (file)
--- a/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
+++ b/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
@@ -38,6 +38,7 @@ import com.intellij.util.continuation.ContinuationContext;
 import com.intellij.util.text.DateFormatUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.commands.*;
 import git4idea.merge.GitConflictResolver;
@@ -45,7 +46,6 @@ import git4idea.repo.GitRepository;
 import git4idea.stash.GitChangesSaver;
 import git4idea.update.GitComplexProcess;
 import git4idea.util.GitUIUtil;
-import git4idea.util.GitUtil;
 import git4idea.util.UntrackedFilesNotifier;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java
index 8317cc9db80b32b9b0df4843510063a660299aeb..c37f7eca50a6f20da682f434d3ae3a2c6664cae9 100644 (file)
--- a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java
+++ b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java
@@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
 import git4idea.GitContentRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitHandler;
 import git4idea.commands.GitSimpleHandler;

diff --git a/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java b/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java
index b898452485ad3176e32122025e2013e8e81abdd7..439afdf1fa628ae56582545ba65ce1e9c0901cd2 100644 (file)
--- a/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java
+++ b/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java
@@ -37,7 +37,7 @@ import com.intellij.util.Consumer;
 import git4idea.GitBranch;
 import git4idea.GitFileRevision;
 import git4idea.GitDeprecatedRemote;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitSimpleHandler;
 import git4idea.history.GitHistoryUtils;
 import git4idea.history.browser.GitCommit;

diff --git a/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java b/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java
index 3e6d81bd64c90950a1e2e0653805072ea3865a54..83a7d8ff526b3e0d79c0ee34e262bd471f6e0ee0 100644 (file)
--- a/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java
+++ b/plugins/git4idea/src/git4idea/changes/GitOutgoingChangesProvider.java
@@ -27,7 +27,7 @@ import com.intellij.util.Consumer;
 import com.intellij.util.containers.Convertor;
 import git4idea.GitBranchesSearcher;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitSimpleHandler;
 import git4idea.history.GitHistoryUtils;
 import git4idea.history.browser.SHAHash;

diff --git a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
index 320ccd75bb7570a887c11db89dc61754283f84fe..6ef8e74e2f6817197becaf1d51379af1a13e5e6c 100644 (file)
--- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
@@ -39,7 +39,7 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsFileUtil;
 import com.intellij.vcsUtil.VcsUtil;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.util.GitFileUtils;
 import git4idea.commands.GitSimpleHandler;

diff --git a/plugins/git4idea/src/git4idea/commands/GitBinaryHandler.java b/plugins/git4idea/src/git4idea/commands/GitBinaryHandler.java
index 589175ae7e5846a47aea90fbc55673f72b58bed2..df3b5b1253004b9f4a637f08034dee23c5c4bf87 100644 (file)
--- a/plugins/git4idea/src/git4idea/commands/GitBinaryHandler.java
+++ b/plugins/git4idea/src/git4idea/commands/GitBinaryHandler.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/config/GitConfigUtil.java b/plugins/git4idea/src/git4idea/config/GitConfigUtil.java
index 1483f76fb815c2419fdf8fa68abc1371d3b8312b..0e42072e25056b4eb1ca832107cbcc44924c46b1 100644 (file)
--- a/plugins/git4idea/src/git4idea/config/GitConfigUtil.java
+++ b/plugins/git4idea/src/git4idea/config/GitConfigUtil.java
@@ -19,7 +19,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
 import org.jetbrains.annotations.NonNls;

diff --git a/plugins/git4idea/src/git4idea/diff/GitDiffProvider.java b/plugins/git4idea/src/git4idea/diff/GitDiffProvider.java
index ee1fe916c4d4353ec1e222b0843b3dae86e80823..0ff4989def66adfe9e283e6fe8ef0c4963ebb0cc 100644 (file)
--- a/plugins/git4idea/src/git4idea/diff/GitDiffProvider.java
+++ b/plugins/git4idea/src/git4idea/diff/GitDiffProvider.java
@@ -30,7 +30,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.GitContentRevision;
 import git4idea.GitFileRevision;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.history.GitHistoryUtils;
 import git4idea.i18n.GitBundle;

diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
index e2813f2bee73858f2d28ced356022109679d4dba..3225167b10aa6f2785a6ad1f71089f8cdb9b7fd4 100644 (file)
--- a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
+++ b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
@@ -29,7 +29,7 @@ import com.intellij.util.Processor;
 import com.intellij.util.ui.ColumnInfo;
 import git4idea.GitFileRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.actions.GitShowAllSubmittedFilesAction;
 import git4idea.changes.GitChangeUtils;

diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
index bca7f9501d55e3be35ca2682a2284ca267bb75c8..3c79476025e185cf58d539c0f57077696d1ad499 100644 (file)
--- a/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
+++ b/plugins/git4idea/src/git4idea/history/GitHistoryUtils.java
@@ -39,7 +39,7 @@ import com.intellij.util.concurrency.Semaphore;
 import git4idea.GitBranch;
 import git4idea.GitFileRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.*;
 import git4idea.config.GitConfigUtil;
 import git4idea.history.browser.GitCommit;

diff --git a/plugins/git4idea/src/git4idea/history/GitLogRecord.java b/plugins/git4idea/src/git4idea/history/GitLogRecord.java
index 6dbc53552186949be019d9b101fb6054805e685b..4436abf6769da5fae89c9768630c15521965e819 100644 (file)
--- a/plugins/git4idea/src/git4idea/history/GitLogRecord.java
+++ b/plugins/git4idea/src/git4idea/history/GitLogRecord.java
@@ -27,7 +27,7 @@ import com.intellij.util.ArrayUtil;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.GitContentRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitHandler;
 import git4idea.history.wholeTree.AbstractHash;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/history/browser/ChangesFilter.java b/plugins/git4idea/src/git4idea/history/browser/ChangesFilter.java
index 15fe7c8987332d27cddd5f1699e396e835eaa3bb..d7903c386f1957c9454d879f71862b5caacc916f 100644 (file)
--- a/plugins/git4idea/src/git4idea/history/browser/ChangesFilter.java
+++ b/plugins/git4idea/src/git4idea/history/browser/ChangesFilter.java
@@ -21,7 +21,7 @@ import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.changes.FilePathsHelper;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.PairProcessor;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java
index 09f7dbf6f756591c264aca4cfd6e79eeb3f20fec..2f3c716f5bdfd63cb335ef53db3f25a6cbf28247 100644 (file)
--- a/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java
+++ b/plugins/git4idea/src/git4idea/history/wholeTree/SelectRepositoryAndShowLogAction.java
@@ -45,7 +45,7 @@ import com.intellij.ui.content.ContentManager;
 import com.intellij.util.Function;
 import com.intellij.util.SmartList;
 import com.intellij.util.ui.AdjustComponentWhenShown;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.config.GitVersion;
 import git4idea.history.browser.GitProjectLogManager;

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
index 3b18a93055023782d33027f7f59e0773af9d7882..779546da35e0ddce6a52ce0ba9c17c8900e90470 100644 (file)
--- a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
@@ -30,7 +30,7 @@ import com.intellij.vcsUtil.VcsRunnable;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.GitFileRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.util.GitFileUtils;
 import git4idea.commands.GitSimpleHandler;

diff --git a/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java b/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java
index cf665ac702802e45cc36d944e633d9c4150c6d3f..84e169624db41e0285bd1c3258aa393f3c3f01c9 100644 (file)
--- a/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java
+++ b/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.vcs.update.FileGroup;
 import com.intellij.openapi.vcs.update.UpdatedFiles;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;

diff --git a/plugins/git4idea/src/git4idea/push/GitPushDialog.java b/plugins/git4idea/src/git4idea/push/GitPushDialog.java
index 402299c515fb60098bca85ef35498926dde3641c..96159428b8016a5dad7ef0c1652fefc1e8545ace 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitPushDialog.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushDialog.java
@@ -26,7 +26,7 @@ import com.intellij.ui.components.JBLoadingPanel;
 import com.intellij.util.Consumer;
 import com.intellij.util.ui.UIUtil;
 import git4idea.GitBranch;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;

diff --git a/plugins/git4idea/src/git4idea/push/GitPushLog.java b/plugins/git4idea/src/git4idea/push/GitPushLog.java
index fb357851a8c1219eab5e93963e521feb4d456a61..f8ada332cb7b8432784d87c79e289fd7d5a16015 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitPushLog.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushLog.java
@@ -31,7 +31,7 @@ import com.intellij.util.text.DateFormatUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
 import git4idea.GitBranch;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.history.browser.GitCommit;
 import git4idea.repo.GitRepository;
 import git4idea.util.GitUIUtil;

diff --git a/plugins/git4idea/src/git4idea/push/GitPushResult.java b/plugins/git4idea/src/git4idea/push/GitPushResult.java
index 9c31ce88756efbc57d0ede4096b2c57cc6215f87..5cb5542a358f32e716492d1864537d019731511f 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitPushResult.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushResult.java
@@ -31,7 +31,7 @@ import com.intellij.openapi.vcs.update.UpdateInfoTree;
 import com.intellij.openapi.vcs.update.UpdatedFiles;
 import git4idea.GitBranch;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.merge.MergeChangeCollector;
 import git4idea.repo.GitRepository;

diff --git a/plugins/git4idea/src/git4idea/push/GitPushSpec.java b/plugins/git4idea/src/git4idea/push/GitPushSpec.java
index 7006754ba301c448f9fdd830b72b21876322e655..8389b5b9a2483dc5f8225961a152abfde6cd2d25 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitPushSpec.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushSpec.java
@@ -19,7 +19,7 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vcs.VcsException;
 import git4idea.GitBranch;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.branch.GitBranchPair;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;

diff --git a/plugins/git4idea/src/git4idea/push/GitPusher.java b/plugins/git4idea/src/git4idea/push/GitPusher.java
index 46b54972c073c37de2a6209426dbad2c25943fb7..fa9d72351f48eecc2b8d4ca58db942a8db001ee3 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitPusher.java
+++ b/plugins/git4idea/src/git4idea/push/GitPusher.java
@@ -25,9 +25,9 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.update.UpdatedFiles;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ui.UIUtil;
+import git4idea.GitUtil;
 import git4idea.commands.Git;
 import git4idea.GitBranch;
-import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.branch.GitBranchPair;
 import git4idea.commands.GitCommandResult;

diff --git a/plugins/git4idea/src/git4idea/push/GitRejectedPushUpdateDialog.java b/plugins/git4idea/src/git4idea/push/GitRejectedPushUpdateDialog.java
index f2d8eabab2336f1d092d745b212f876bf369ce7d..d4611481830ed050a9c657891c0ab1bcf7fcfa47 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitRejectedPushUpdateDialog.java
+++ b/plugins/git4idea/src/git4idea/push/GitRejectedPushUpdateDialog.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.util.ui.UIUtil;
 import git4idea.GitBranch;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.config.UpdateMethod;
 import git4idea.repo.GitRepository;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java
index f92c4d75d29a67a3f98b971eb8f31f5a041d77c8..6afa4b40bc0c561da928f08058c7cb7ed63e8f4e 100644 (file)
--- a/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.BufferedReader;

diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaser.java b/plugins/git4idea/src/git4idea/rebase/GitRebaser.java
index 0914a7383d4763482356080e0ea1d799418b83bd..1ee4146473cac06b4e9949f5389e7c61fb7c5d22 100644 (file)
--- a/plugins/git4idea/src/git4idea/rebase/GitRebaser.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitRebaser.java
@@ -22,7 +22,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.commands.*;
 import git4idea.merge.GitConflictResolver;

diff --git a/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java b/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java
index 9fb659685a6c17e459a3f4d9bcbd8b6fe32f11a8..82f35fc056f47d89d9f506d6a0cbd1c2ed86ec36 100644 (file)
--- a/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java
+++ b/plugins/git4idea/src/git4idea/rollback/GitRollbackEnvironment.java
@@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
 import com.intellij.vcsUtil.VcsUtil;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.util.GitFileUtils;
 import git4idea.commands.GitHandlerUtil;

diff --git a/plugins/git4idea/src/git4idea/status/GitChangeProvider.java b/plugins/git4idea/src/git4idea/status/GitChangeProvider.java
index 7da110893e5be78de662d8a859aeba3c36e13e03..ae35fc82ad353abbdad6f0764733f9e0a25b36cc 100644 (file)
--- a/plugins/git4idea/src/git4idea/status/GitChangeProvider.java
+++ b/plugins/git4idea/src/git4idea/status/GitChangeProvider.java
@@ -36,7 +36,7 @@ import com.intellij.openapi.vcs.changes.VcsModifiableDirtyScope;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.GitContentRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.changes.GitChangeUtils;
 import git4idea.config.GitVersion;

diff --git a/plugins/git4idea/src/git4idea/status/GitChangesCollector.java b/plugins/git4idea/src/git4idea/status/GitChangesCollector.java
index 8669ddbd916a4e75411aeda3852a1d5b13055cd4..92058bc189d076acac1277bb68f9fe6bbb73ddc4 100644 (file)
--- a/plugins/git4idea/src/git4idea/status/GitChangesCollector.java
+++ b/plugins/git4idea/src/git4idea/status/GitChangesCollector.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vcs.changes.ChangeListManager;
 import com.intellij.openapi.vcs.changes.VcsDirtyScope;
 import com.intellij.openapi.vfs.VirtualFile;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.File;

diff --git a/plugins/git4idea/src/git4idea/status/GitOldChangesCollector.java b/plugins/git4idea/src/git4idea/status/GitOldChangesCollector.java
index 42a2d15074febc72d472261d88b83ab3201b4f19..b719ffc5b6722c693ccd836746908cc30b4afab6 100644 (file)
--- a/plugins/git4idea/src/git4idea/status/GitOldChangesCollector.java
+++ b/plugins/git4idea/src/git4idea/status/GitOldChangesCollector.java
@@ -26,7 +26,7 @@ import com.intellij.openapi.vcs.changes.VcsDirtyScope;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.GitContentRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.changes.GitChangeUtils;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;

diff --git a/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.java b/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.java
index 1ccf37005178747c06b1714228c6f6abcc0ea1d4..8880d86b2cc05084a168b7e7a5283c23d8181a3f 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.java
@@ -24,7 +24,7 @@ import com.intellij.ui.*;
 import com.intellij.util.ui.tree.TreeUtil;
 import com.intellij.vcsUtil.VcsFileUtil;
 import git4idea.DialogManager;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.config.GitVcsSettings;
 import git4idea.i18n.GitBundle;
 

diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java b/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
index 4c73b972aac9c2ab0cb80bf32fd02627f383e934..4e45aed7a5b4f2456c0c6195802c5b32d99f685a 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
+++ b/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
@@ -16,7 +16,7 @@
 package git4idea.ui.branch;
 
 import git4idea.GitBranch;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.branch.GitBranchesCollection;
 import git4idea.repo.GitRepository;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
index e270122f511f8ea8ca97dc7cbf5d5fbfec7b6d33..7d4f42b7afdf75247bb30c8095939900404a2ddb 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
+++ b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
@@ -28,7 +28,7 @@ import com.intellij.openapi.vcs.changes.ui.ChangeListViewerDialog;
 import com.intellij.openapi.vcs.update.UpdatedFiles;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ui.UIUtil;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.branch.GitBranchPair;
 import git4idea.commands.*;
 import git4idea.merge.GitConflictResolver;

diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java b/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java
index 69cc5c2a349f6bd887f09675c4951d75f19d9158..b3a662ee9f33123b3fb36b5ced0b966135c559d7 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java
@@ -27,7 +27,7 @@ import com.intellij.openapi.vcs.update.UpdateEnvironment;
 import com.intellij.openapi.vcs.update.UpdateSession;
 import com.intellij.openapi.vcs.update.UpdatedFiles;
 import com.intellij.openapi.vfs.VirtualFile;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.config.GitVcsSettings;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java
index 2db9d9f47248ef4983fb5705e311f6a0d1be9872..e597477eeb21e71cf992b2fdeac4bbf80a9af511 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsUtil;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
 import git4idea.util.StringScanner;

diff --git a/plugins/git4idea/src/git4idea/update/GitUpdater.java b/plugins/git4idea/src/git4idea/update/GitUpdater.java
index 055d3fe829efee283964010622d9269f3c8dc2a1..ff64539a3a0c67454b2c322925aac0420609d802 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitUpdater.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdater.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.vcs.update.UpdatedFiles;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.GitBranch;
 import git4idea.GitRevisionNumber;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.branch.GitBranchPair;
 import git4idea.config.GitConfigUtil;

diff --git a/plugins/git4idea/src/git4idea/validators/GitNewBranchNameValidator.java b/plugins/git4idea/src/git4idea/validators/GitNewBranchNameValidator.java
index 2e2dda9333d17d32114f188f613846c8a0c29db4..607e749b0208a4eb06a2dba72cad4270d54fe70d 100644 (file)
--- a/plugins/git4idea/src/git4idea/validators/GitNewBranchNameValidator.java
+++ b/plugins/git4idea/src/git4idea/validators/GitNewBranchNameValidator.java
@@ -17,7 +17,7 @@ package git4idea.validators;
 
 import com.intellij.openapi.ui.InputValidatorEx;
 import git4idea.GitBranch;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.branch.GitBranchesCollection;
 import git4idea.repo.GitRepository;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java b/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java
index 16fc19c62306943b08dd84c54ca7cca62b0a78b3..a4b9b156c156baed980d581cb4cac81c44998da2 100644 (file)
--- a/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java
+++ b/plugins/git4idea/src/git4idea/vfs/GitRootTracker.java
@@ -43,7 +43,7 @@ import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.update.MergingUpdateQueue;
 import com.intellij.util.ui.update.Update;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.i18n.GitBundle;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java b/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java
index 796422f435425381650cbea94fbc9dd6eeba35aa..99d84c60c9b4b406b8e486dd53ec553370b34502 100644 (file)
--- a/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java
+++ b/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java
@@ -29,8 +29,8 @@ import com.intellij.ui.AppUIUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsFileUtil;
 import com.intellij.vcsUtil.VcsUtil;
+import git4idea.GitUtil;
 import git4idea.commands.Git;
-import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.util.GitFileUtils;
 import git4idea.i18n.GitBundle;

diff --git a/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java b/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java
index e7aa71c4fe869550edf976dbf3a709d5b5883232..6c048bca9e8b8268b0042a51c556f9aa7e1bcda8 100644 (file)
--- a/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java
+++ b/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.Change;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.testFramework.LightVirtualFile;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.tests.GitTest;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/plugins/git4idea/tests/git4idea/tests/GitUtilsTest.java b/plugins/git4idea/tests/git4idea/tests/GitUtilsTest.java
index 93d08e2dab04ba4d0709176c6e70ba5b6a190862..7e90f054e25c5ba504f1def626462ecad8815e1f 100644 (file)
--- a/plugins/git4idea/tests/git4idea/tests/GitUtilsTest.java
+++ b/plugins/git4idea/tests/git4idea/tests/GitUtilsTest.java
@@ -15,7 +15,7 @@
  */
 package git4idea.tests;
 
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import org.junit.Assert;
 import org.junit.Test;
 

diff --git a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
index 9619adee436112088aa781dc828bcc26e8cffdb4..1903933b61e2884b5c20a39444654927ad191f79 100644 (file)
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
@@ -28,7 +28,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.concurrency.Semaphore;
 import com.intellij.util.containers.HashSet;
 import git4idea.GitDeprecatedRemote;
-import git4idea.util.GitUtil;
+import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.actions.BasicAction;
 import git4idea.actions.GitInit;