Move GitUtil, GitFileUtils, StringScanner, GitUIUtil to git4idea.util

Move GitPushUtils to git4idea.push

diff --git a/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java b/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java
index 36fba58ffd46ef31cce3936c55ec15dad24e6c16..acf62daf9c26bc0130d2d6e30aac764b6832ce47 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java
+++ b/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java
@@ -21,7 +21,8 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vcs.changes.BinaryContentRevision;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
-import git4idea.commands.GitFileUtils;
+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 f878b16ea1eef66a777f2306789ed17a82a10e5c..d9e18f73c130cd33f20aace4ab45e152237af97d 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitBranch.java
+++ b/plugins/git4idea/src/git4idea/GitBranch.java
@@ -24,6 +24,7 @@ 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 73b122616885792f2e305908f5b3cbbd03b159be..a0043caf9504fa39ea4fd75ed9b34176ed813175 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitContentRevision.java
+++ b/plugins/git4idea/src/git4idea/GitContentRevision.java
@@ -29,9 +29,10 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
 import com.intellij.vcsUtil.VcsUtil;
-import git4idea.commands.GitFileUtils;
+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/GitDeprecatedRemote.java b/plugins/git4idea/src/git4idea/GitDeprecatedRemote.java
index 8fa8048f7a1f5b2005de9b4981bc42e8d882d343..e723f9cc682c278a838039f9667d13c6858f6ff2 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitDeprecatedRemote.java
+++ b/plugins/git4idea/src/git4idea/GitDeprecatedRemote.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.ContainerUtil;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.config.GitConfigUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/GitFileRevision.java b/plugins/git4idea/src/git4idea/GitFileRevision.java
index d6e4e2ee67b14338a97347da410ee9e8cedbe567..7f51742cdbc1280bf5b8ea1f8ff53112f853e6d2 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitFileRevision.java
+++ b/plugins/git4idea/src/git4idea/GitFileRevision.java
@@ -27,7 +27,8 @@ import com.intellij.openapi.vcs.history.VcsRevisionNumber;
 import com.intellij.openapi.vcs.impl.ContentRevisionCache;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
-import git4idea.commands.GitFileUtils;
+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 0b7afd0b3bc9fb515fefc83237e0dd8e17033e78..1f107db17ee9bd67037429cee864f877c554b36d 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitRevisionNumber.java
+++ b/plugins/git4idea/src/git4idea/GitRevisionNumber.java
@@ -22,6 +22,7 @@ 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 ed073ff9e338888c5fc2d1bf9368593892de86fd..30e098ade0ddd0fd079cca8ac57bedd4e1d906b6 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitRootConverter.java
+++ b/plugins/git4idea/src/git4idea/GitRootConverter.java
@@ -19,6 +19,7 @@ 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/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java
index 960ae602b6b9d5b7edf3b7900e6f7d8e961a2697..a8f4654375cb3455f25dd92c629b01a7a3dd9505 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitVcs.java
+++ b/plugins/git4idea/src/git4idea/GitVcs.java
@@ -73,6 +73,7 @@ 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/BasicAction.java b/plugins/git4idea/src/git4idea/actions/BasicAction.java
index dba27a02d0ee2a5c348d6742865b208d35bfea3a..49bcd9652eccfd79211dcc1936355d0e94a637be 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/BasicAction.java
+++ b/plugins/git4idea/src/git4idea/actions/BasicAction.java
@@ -33,7 +33,7 @@ import com.intellij.util.Consumer;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsFileUtil;
 import git4idea.GitVcs;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/plugins/git4idea/src/git4idea/actions/GitAdd.java b/plugins/git4idea/src/git4idea/actions/GitAdd.java
index dd24e844539d0f54d345ba874c427945bc38fbad..8085e89207fdd19169d6bf87a9d0e6096dd6ae9f 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/GitAdd.java
+++ b/plugins/git4idea/src/git4idea/actions/GitAdd.java
@@ -23,9 +23,9 @@ 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
-import git4idea.commands.GitFileUtils;
+import git4idea.util.GitFileUtils;
 import git4idea.i18n.GitBundle;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java b/plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java
index bdeaf7f6d167201c50b3056e17ab59cf02f7a0c4..6182aedb53e20347252ce50e3424b151e49a1054 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java
+++ b/plugins/git4idea/src/git4idea/actions/GitCompareWithBranchAction.java
@@ -40,7 +40,7 @@ import git4idea.GitRevisionNumber;
 import git4idea.history.GitHistoryUtils;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;

diff --git a/plugins/git4idea/src/git4idea/actions/GitInit.java b/plugins/git4idea/src/git4idea/actions/GitInit.java
index 01d0cf5c8501c93b703343f09471a89f44e4cde1..42b70241cecb1371c41e597969d3713fde498e8a 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/GitInit.java
+++ b/plugins/git4idea/src/git4idea/actions/GitInit.java
@@ -33,10 +33,10 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
 import git4idea.Git;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.i18n.GitBundle;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;

diff --git a/plugins/git4idea/src/git4idea/actions/GitPull.java b/plugins/git4idea/src/git4idea/actions/GitPull.java
index b29f0e1bc7e58c885e2ad3a48616a847afd7145f..af22bfad82384d409fa9719d22274ba092b41289 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.commands.GitLineHandler;
 import git4idea.commands.GitStandardProgressAnalyzer;
 import git4idea.commands.GitTask;
@@ -36,7 +36,7 @@ import git4idea.merge.GitPullDialog;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import git4idea.update.GitFetcher;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java b/plugins/git4idea/src/git4idea/actions/GitRepositoryAction.java
index a9fffc8cc91c5b8d6e9498cce0454cdd32908fef..356dbe04fe3285f952b7b4357ca3613a533c5ce9 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.GitUtil;
+import git4idea.util.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 9eb2533feda9d0671ca5b8800e73e31331c9cd45..13ea34a7a9dd0862f4b06efcc612c2e17de9e621 100644 (file)
--- a/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java
+++ b/plugins/git4idea/src/git4idea/actions/GitShowAllSubmittedFilesAction.java
@@ -31,10 +31,10 @@ import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ui.UIUtil;
 import git4idea.GitFileRevision;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.changes.GitChangeUtils;
 import git4idea.i18n.GitBundle;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
index e137b78bff2b855b59e5c58e2abe321f890fadaf..ab0a1b372e21b61cbe9fd38c28710e7c434bc396 100644 (file)
--- a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
+++ b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
@@ -32,10 +32,10 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.GitFileRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.history.GitHistoryUtils;
 import git4idea.i18n.GitBundle;
 import org.jetbrains.annotations.NonNls;

diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java b/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java
index 6b1f503d005094c2d5d482ae785289bb236b9c76..486029175198bdc274672f2b76d19e67c24909d5 100644 (file)
--- a/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java
+++ b/plugins/git4idea/src/git4idea/branch/GitBranchIsNotFullyMergedDialog.java
@@ -26,7 +26,7 @@ import git4idea.history.browser.GitCommit;
 import git4idea.i18n.GitBundle;
 import git4idea.repo.GitRepository;
 import git4idea.ui.GitCommitListWithDiffPanel;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java b/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java
index 49b74ee14580882b5985186258fcd35ba7f76e6d..ac6f637519f60349cf4cbe02c336671d963a2e1d 100644 (file)
--- a/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java
+++ b/plugins/git4idea/src/git4idea/branch/GitBranchUtil.java
@@ -16,7 +16,7 @@
 package git4idea.branch;
 
 import com.intellij.openapi.project.Project;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.merge.GitConflictResolver;
 import git4idea.repo.GitRepository;
 

diff --git a/plugins/git4idea/src/git4idea/branch/GitCheckoutNewBranchOperation.java b/plugins/git4idea/src/git4idea/branch/GitCheckoutNewBranchOperation.java
index 943bad5050f7b43d3ab07f50f51e57f44ef65d94..6f3de74a1f096f393e8db2796aa070a0fa55cce3 100644 (file)
--- a/plugins/git4idea/src/git4idea/branch/GitCheckoutNewBranchOperation.java
+++ b/plugins/git4idea/src/git4idea/branch/GitCheckoutNewBranchOperation.java
@@ -24,12 +24,12 @@ import git4idea.commands.GitCommandResult;
 import git4idea.commands.GitCompoundResult;
 import git4idea.commands.GitSimpleEventDetector;
 import git4idea.repo.GitRepository;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Collection;
 
-import static git4idea.ui.GitUIUtil.code;
+import static git4idea.util.GitUIUtil.code;
 
 /**
 * @author Kirill Likhodedov

diff --git a/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java b/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
index 67d41bafb37fc1341a736bbd62452934f193672b..72f451e984bf66374784d3e7d65e61b9654dc483 100644 (file)
--- a/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
+++ b/plugins/git4idea/src/git4idea/branch/GitCheckoutOperation.java
@@ -34,7 +34,7 @@ import com.intellij.util.continuation.ContinuationContext;
 import com.intellij.util.text.DateFormatUtil;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.Git;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.commands.GitCommandResult;
 import git4idea.commands.GitCompoundResult;
@@ -43,7 +43,7 @@ import git4idea.commands.GitSimpleEventDetector;
 import git4idea.merge.GitConflictResolver;
 import git4idea.repo.GitRepository;
 import git4idea.stash.GitChangesSaver;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import git4idea.update.GitComplexProcess;
 import git4idea.util.UntrackedFilesNotifier;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java
index af6e03608ecf739ed3e0ab406887d46e8b042285..8317cc9db80b32b9b0df4843510063a660299aeb 100644 (file)
--- a/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java
+++ b/plugins/git4idea/src/git4idea/changes/GitChangeUtils.java
@@ -27,11 +27,11 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ArrayUtil;
 import git4idea.GitContentRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitHandler;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.history.browser.SHAHash;
 import git4idea.history.wholeTree.AbstractHash;
 import org.jetbrains.annotations.NonNls;
@@ -46,7 +46,7 @@ import java.util.*;
  */
 public class GitChangeUtils {
   /**
-   * the pattern for committed changelist assumed by {@link #parseChangeList(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile,git4idea.commands.StringScanner,boolean)}
+   * the pattern for committed changelist assumed by {@link #parseChangeList(com.intellij.openapi.project.Project,com.intellij.openapi.vfs.VirtualFile, git4idea.util.StringScanner,boolean)}
    */
   public static final String COMMITTED_CHANGELIST_FORMAT = "%ct%n%H%n%P%n%an%x20%x3C%ae%x3E%n%cn%x20%x3C%ce%x3E%n%s%n%x03%n%b%n%x03";
 

diff --git a/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java b/plugins/git4idea/src/git4idea/changes/GitCommittedChangeListProvider.java
index 439afdf1fa628ae56582545ba65ce1e9c0901cd2..b898452485ad3176e32122025e2013e8e81abdd7 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.GitUtil;
+import git4idea.util.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 83a7d8ff526b3e0d79c0ee34e262bd471f6e0ee0..3e6d81bd64c90950a1e2e0653805072ea3865a54 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.GitUtil;
+import git4idea.util.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 3010687ee3c097d72aa82034a2c47af91277371b..320ccd75bb7570a887c11db89dc61754283f84fe 100644 (file)
--- a/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
+++ b/plugins/git4idea/src/git4idea/checkin/GitCheckinEnvironment.java
@@ -39,9 +39,9 @@ import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsFileUtil;
 import com.intellij.vcsUtil.VcsUtil;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.commands.GitCommand;
-import git4idea.commands.GitFileUtils;
+import git4idea.util.GitFileUtils;
 import git4idea.commands.GitSimpleHandler;
 import git4idea.config.GitConfigUtil;
 import git4idea.config.GitVcsSettings;

diff --git a/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java b/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java
index 7ae48528db7d7bf81a9f5995a0211a77bbdb9350..9ef8e0e99e85b62cd79799a10009903ed3061347 100644 (file)
--- a/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java
+++ b/plugins/git4idea/src/git4idea/checkout/GitCheckoutProvider.java
@@ -29,7 +29,7 @@ import git4idea.actions.BasicAction;
 import git4idea.commands.GitCommandResult;
 import git4idea.i18n.GitBundle;
 import git4idea.jgit.GitHttpAdapter;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import git4idea.update.GitFetchResult;
 import git4idea.update.GitFetcher;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/commands/GitBinaryHandler.java b/plugins/git4idea/src/git4idea/commands/GitBinaryHandler.java
index df3b5b1253004b9f4a637f08034dee23c5c4bf87..589175ae7e5846a47aea90fbc55673f72b58bed2 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java b/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java
index 3e9acd911347ffd01ba75d2bb12fbeedb298f486..05b8246dd7ab2e196d16f7ea47e8fcb335aaa5a6 100644 (file)
--- a/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java
+++ b/plugins/git4idea/src/git4idea/commands/GitHandlerUtil.java
@@ -23,7 +23,7 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.i18n.GitBundle;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/plugins/git4idea/src/git4idea/config/GitConfigUtil.java b/plugins/git4idea/src/git4idea/config/GitConfigUtil.java
index 0e42072e25056b4eb1ca832107cbcc44924c46b1..1483f76fb815c2419fdf8fa68abc1371d3b8312b 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.GitUtil;
+import git4idea.util.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 0ff4989def66adfe9e283e6fe8ef0c4963ebb0cc..ee1fe916c4d4353ec1e222b0843b3dae86e80823 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.history.GitHistoryUtils;
 import git4idea.i18n.GitBundle;

diff --git a/plugins/git4idea/src/git4idea/diff/GitTreeDiffProvider.java b/plugins/git4idea/src/git4idea/diff/GitTreeDiffProvider.java
index 5da1cb4f5279bbdf96a4c3ecbef04326dfe0f353..5545c77b0360942a39f6dc7afb347164e9fe821c 100644 (file)
--- a/plugins/git4idea/src/git4idea/diff/GitTreeDiffProvider.java
+++ b/plugins/git4idea/src/git4idea/diff/GitTreeDiffProvider.java
@@ -28,7 +28,7 @@ import git4idea.GitBranchesSearcher;
 import git4idea.changes.GitChangeUtils;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java b/plugins/git4idea/src/git4idea/history/GitHistoryProvider.java
index 3225167b10aa6f2785a6ad1f71089f8cdb9b7fd4..e2813f2bee73858f2d28ced356022109679d4dba 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.GitUtil;
+import git4idea.util.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 3c79476025e185cf58d539c0f57077696d1ad499..bca7f9501d55e3be35ca2682a2284ca267bb75c8 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.GitUtil;
+import git4idea.util.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 4436abf6769da5fae89c9768630c15521965e819..6dbc53552186949be019d9b101fb6054805e685b 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.GitUtil;
+import git4idea.util.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 d7903c386f1957c9454d879f71862b5caacc916f..15fe7c8987332d27cddd5f1699e396e835eaa3bb 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.GitUtil;
+import git4idea.util.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 2f3c716f5bdfd63cb335ef53db3f25a6cbf28247..09f7dbf6f756591c264aca4cfd6e79eeb3f20fec 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.config.GitVersion;
 import git4idea.history.browser.GitProjectLogManager;

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java
index 1e86dce8d3daa4e54397dfd0e8308a9fdce2585a..a15769ab6a0939f797b4377915f86b3f250e8530 100644 (file)
--- a/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeDialog.java
@@ -25,7 +25,7 @@ import git4idea.commands.GitCommand;
 import git4idea.commands.GitLineHandler;
 import git4idea.commands.GitSimpleHandler;
 import git4idea.i18n.GitBundle;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 
 import javax.swing.*;
 import java.awt.*;

diff --git a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
index a4517b7245c1719a19ee83588e12730f87f0edbd..224a6c438ad43318707ee58017d01b1e01c1c70d 100644 (file)
--- a/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
+++ b/plugins/git4idea/src/git4idea/merge/GitMergeProvider.java
@@ -30,11 +30,11 @@ import com.intellij.vcsUtil.VcsRunnable;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.GitFileRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.commands.GitCommand;
-import git4idea.commands.GitFileUtils;
+import git4idea.util.GitFileUtils;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.i18n.GitBundle;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java
index db8e7b4ec5d06c09306400de36478a3ea7af9bba..d468164ef7488264ef1075c0018ba20830aa4c2c 100644 (file)
--- a/plugins/git4idea/src/git4idea/merge/GitPullDialog.java
+++ b/plugins/git4idea/src/git4idea/merge/GitPullDialog.java
@@ -32,7 +32,7 @@ import git4idea.i18n.GitBundle;
 import git4idea.jgit.GitHttpAdapter;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java b/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java
index 33cf523ef525206c370ae3988a48c3ad37a8ecc7..cf665ac702802e45cc36d944e633d9c4150c6d3f 100644 (file)
--- a/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java
+++ b/plugins/git4idea/src/git4idea/merge/MergeChangeCollector.java
@@ -23,11 +23,11 @@ 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/plugins/git4idea/src/git4idea/push/GitPushDialog.java b/plugins/git4idea/src/git4idea/push/GitPushDialog.java
index 96159428b8016a5dad7ef0c1652fefc1e8545ace..402299c515fb60098bca85ef35498926dde3641c 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.GitUtil;
+import git4idea.util.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 a35c73eea346a4adc0afe8fe8a92f0fa2d40b881..fb357851a8c1219eab5e93963e521feb4d456a61 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitPushLog.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushLog.java
@@ -31,10 +31,10 @@ import com.intellij.util.text.DateFormatUtil;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
 import git4idea.GitBranch;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.history.browser.GitCommit;
 import git4idea.repo.GitRepository;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;

diff --git a/plugins/git4idea/src/git4idea/push/GitPushRepoResult.java b/plugins/git4idea/src/git4idea/push/GitPushRepoResult.java
index 562bbf341ccb90f526b394dec110e8fc6e8471e6..361fdade339807253c4348b7ba8551664c83c6d7 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitPushRepoResult.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushRepoResult.java
@@ -23,8 +23,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
-import static git4idea.ui.GitUIUtil.bold;
-import static git4idea.ui.GitUIUtil.code;
+import static git4idea.util.GitUIUtil.bold;
+import static git4idea.util.GitUIUtil.code;
 
 /**
  * If an error happens, all push is unsuccessful, for all branches.

diff --git a/plugins/git4idea/src/git4idea/push/GitPushResult.java b/plugins/git4idea/src/git4idea/push/GitPushResult.java
index 5cb5542a358f32e716492d1864537d019731511f..9c31ce88756efbc57d0ede4096b2c57cc6215f87 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.GitUtil;
+import git4idea.util.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 8389b5b9a2483dc5f8225961a152abfde6cd2d25..7006754ba301c448f9fdd830b72b21876322e655 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.branch.GitBranchPair;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;

diff --git a/plugins/git4idea/src/git4idea/checkin/GitPushUtils.java b/plugins/git4idea/src/git4idea/push/GitPushUtils.java
similarity index 99%
rename from plugins/git4idea/src/git4idea/checkin/GitPushUtils.java
rename to plugins/git4idea/src/git4idea/push/GitPushUtils.java
index 21aeb01c7a62dabd1a13751ac8814aaf765371b8..5fb3795372d7bad668735a8ed519d8956b568120 100644 (file)
--- a/plugins/git4idea/src/git4idea/checkin/GitPushUtils.java
+++ b/plugins/git4idea/src/git4idea/push/GitPushUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.checkin;
+package git4idea.push;
 
 import com.intellij.execution.process.ProcessOutputTypes;
 import com.intellij.openapi.project.Project;

diff --git a/plugins/git4idea/src/git4idea/push/GitPusher.java b/plugins/git4idea/src/git4idea/push/GitPusher.java
index c4391ab1e8f02720e0a00af40f07f6be717e631d..7d1ac2d3005e8d483fc778251463ec5645c9d53d 100644 (file)
--- a/plugins/git4idea/src/git4idea/push/GitPusher.java
+++ b/plugins/git4idea/src/git4idea/push/GitPusher.java
@@ -27,7 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.ui.UIUtil;
 import git4idea.Git;
 import git4idea.GitBranch;
-import git4idea.GitUtil;
+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 f71d5daf3bc9622a171bd53b43e24af648fe56b5..f2d8eabab2336f1d092d745b212f876bf369ce7d 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.config.UpdateMethod;
 import git4idea.repo.GitRepository;
 import org.jetbrains.annotations.NotNull;
@@ -33,7 +33,7 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import static git4idea.ui.GitUIUtil.code;
+import static git4idea.util.GitUIUtil.code;
 
 /**
  * @author Kirill Likhodedov

diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseActionDialog.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseActionDialog.java
index d848b3e19455b8e067644efc31069df4db9e64a3..2cf76e79d92cb55684f95ffa8326315424a5d152 100644 (file)
--- a/plugins/git4idea/src/git4idea/rebase/GitRebaseActionDialog.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseActionDialog.java
@@ -18,7 +18,7 @@ package git4idea.rebase;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.vfs.VirtualFile;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;

diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.java
index 27ec4324808f2535e6b521d43a5aa40b49befd14..e08d4a890787e48556d6dbd1689b23a9cfdfac25 100644 (file)
--- a/plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseDialog.java
@@ -28,7 +28,7 @@ import git4idea.config.GitConfigUtil;
 import git4idea.i18n.GitBundle;
 import git4idea.merge.GitMergeUtil;
 import git4idea.ui.GitReferenceValidator;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;

diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.java
index 675f6eefb157015c6c26408aa53f9eb877ca6393..e1332d5ba92b34d490993ded6e2db93f06daf08b 100644 (file)
--- a/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitRebaseEditor.java
@@ -25,7 +25,7 @@ import com.intellij.util.ListWithSelection;
 import com.intellij.util.ui.ComboBoxTableCellEditor;
 import com.intellij.util.ui.ComboBoxTableCellRenderer;
 import git4idea.actions.GitShowAllSubmittedFilesAction;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.config.GitConfigUtil;
 import git4idea.i18n.GitBundle;
 import org.jetbrains.annotations.NonNls;

diff --git a/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java b/plugins/git4idea/src/git4idea/rebase/GitRebaseUtils.java
index 6afa4b40bc0c561da928f08058c7cb7ed63e8f4e..f92c4d75d29a67a3f98b971eb8f31f5a041d77c8 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.GitUtil;
+import git4idea.util.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 90e34160ca8c8549df953e597122a9799843fc69..0914a7383d4763482356080e0ea1d799418b83bd 100644 (file)
--- a/plugins/git4idea/src/git4idea/rebase/GitRebaser.java
+++ b/plugins/git4idea/src/git4idea/rebase/GitRebaser.java
@@ -22,11 +22,12 @@ 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.commands.*;
 import git4idea.merge.GitConflictResolver;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
+import git4idea.util.StringScanner;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java b/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
index 295529367485410835a2df58329288a6727b65b5..922aafa96c0c03314179e5edc3d90e8c8dbe1393 100644 (file)
--- a/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
+++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryFiles.java
@@ -16,7 +16,7 @@
 package git4idea.repo;
 
 import com.intellij.openapi.vfs.VirtualFile;
-import git4idea.commands.GitFileUtils;
+import git4idea.util.GitFileUtils;
 import org.jetbrains.annotations.NotNull;
 
 /**

diff --git a/plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java b/plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java
index 1125ea8cb4a86129a4ab509d86f79cc1312cc741..91b9bf1790ca38d388ce2c06e60a6d23f4271a56 100644 (file)
--- a/plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java
+++ b/plugins/git4idea/src/git4idea/repo/GitRepositoryUpdater.java
@@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.newvfs.events.VFileEvent;
 import com.intellij.util.Consumer;
 import com.intellij.util.concurrency.QueueProcessor;
 import com.intellij.util.messages.MessageBusConnection;
-import git4idea.commands.GitFileUtils;
+import git4idea.util.GitFileUtils;
 
 import java.util.List;
 

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

diff --git a/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java b/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
index bf3eabd0da0ab1cd586e2799bdb9852d193688ff..b369b44557175e22b656357af6c42ca02ac51fe6 100644 (file)
--- a/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
+++ b/plugins/git4idea/src/git4idea/stash/GitStashChangesSaver.java
@@ -35,7 +35,7 @@ import git4idea.commands.*;
 import git4idea.config.GitVcsSettings;
 import git4idea.convert.GitFileSeparatorConverter;
 import git4idea.merge.GitConflictResolver;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import git4idea.ui.GitUnstashDialog;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

diff --git a/plugins/git4idea/src/git4idea/stash/GitStashUtils.java b/plugins/git4idea/src/git4idea/stash/GitStashUtils.java
index 53945b0656568d6a6ffed6ec89c070dfba8c3a05..b952f3455b85a541de279cd3be0288ed363f7eec 100644 (file)
--- a/plugins/git4idea/src/git4idea/stash/GitStashUtils.java
+++ b/plugins/git4idea/src/git4idea/stash/GitStashUtils.java
@@ -22,9 +22,9 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.Consumer;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.config.GitConfigUtil;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import git4idea.ui.StashInfo;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/status/GitChangeProvider.java b/plugins/git4idea/src/git4idea/status/GitChangeProvider.java
index ae35fc82ad353abbdad6f0764733f9e0a25b36cc..7da110893e5be78de662d8a859aeba3c36e13e03 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.GitUtil;
+import git4idea.util.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 92058bc189d076acac1277bb68f9fe6bbb73ddc4..8669ddbd916a4e75411aeda3852a1d5b13055cd4 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.GitUtil;
+import git4idea.util.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 770f23e61719a12550ed1d39e3c6f857a2300443..42a2d15074febc72d472261d88b83ab3201b4f19 100644 (file)
--- a/plugins/git4idea/src/git4idea/status/GitOldChangesCollector.java
+++ b/plugins/git4idea/src/git4idea/status/GitOldChangesCollector.java
@@ -26,11 +26,11 @@ import com.intellij.openapi.vcs.changes.VcsDirtyScope;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.GitContentRevision;
 import git4idea.GitRevisionNumber;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.changes.GitChangeUtils;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;

diff --git a/plugins/git4idea/src/git4idea/ui/CurrentBranchDialog.java b/plugins/git4idea/src/git4idea/ui/CurrentBranchDialog.java
index 82e16f119a0db4bc49f095bf26a4759d468b8267..191223192defa1522678db62907db71b74a9a311 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/CurrentBranchDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/CurrentBranchDialog.java
@@ -22,6 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.GitBranch;
 import git4idea.GitDeprecatedRemote;
 import git4idea.i18n.GitBundle;
+import git4idea.util.GitUIUtil;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;

diff --git a/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.java b/plugins/git4idea/src/git4idea/ui/GitConvertFilesDialog.java
index 8880d86b2cc05084a168b7e7a5283c23d8181a3f..1ccf37005178747c06b1714228c6f6abcc0ea1d4 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.config.GitVcsSettings;
 import git4idea.i18n.GitBundle;
 

diff --git a/plugins/git4idea/src/git4idea/ui/GitReferenceValidator.java b/plugins/git4idea/src/git4idea/ui/GitReferenceValidator.java
index ff6036d6db96989ef2a923da22bdf67e6fa87366..eb652deb870248952e590df33a0fa4fa2fbd12ff 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitReferenceValidator.java
+++ b/plugins/git4idea/src/git4idea/ui/GitReferenceValidator.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.DocumentAdapter;
 import git4idea.GitRevisionNumber;
 import git4idea.actions.GitShowAllSubmittedFilesAction;
+import git4idea.util.GitUIUtil;
 
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;

diff --git a/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.java b/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.java
index 1a492effa3107b0cba860ce8d25129676fe13a29..da2f5138cd0a7528ba745b980d943a83f3ad03c6 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.java
@@ -31,7 +31,7 @@ import git4idea.GitTag;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitHandlerUtil;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.i18n.GitBundle;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.java b/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.java
index 0b16e4879feeed8ffd0f358e0b0b57bdead6603e..b64fd47a42a1735e85732d6a8e2940a5ba1b71cb 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.java
+++ b/plugins/git4idea/src/git4idea/ui/GitRefspecPanel.java
@@ -24,7 +24,8 @@ import com.intellij.util.containers.HashMap;
 import git4idea.GitBranch;
 import git4idea.GitDeprecatedRemote;
 import git4idea.GitTag;
-import git4idea.commands.StringScanner;
+import git4idea.util.GitUIUtil;
+import git4idea.util.StringScanner;
 import git4idea.i18n.GitBundle;
 import git4idea.validators.GitBranchNameValidator;
 import org.jetbrains.annotations.NonNls;

diff --git a/plugins/git4idea/src/git4idea/ui/GitResetDialog.java b/plugins/git4idea/src/git4idea/ui/GitResetDialog.java
index e85d1f477293240e5d2860550d0c3fb3bb37ec9b..f551e6d22052f15d1dcf75612867c0f611402cf7 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitResetDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitResetDialog.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitLineHandler;
 import git4idea.i18n.GitBundle;
+import git4idea.util.GitUIUtil;
 
 import javax.swing.*;
 import java.util.List;

diff --git a/plugins/git4idea/src/git4idea/ui/GitStashDialog.java b/plugins/git4idea/src/git4idea/ui/GitStashDialog.java
index 19bb8da8af59054b99852ab6486541ab1494667b..a48798eaff18831ff14d5b0de09031c77e006552 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitStashDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitStashDialog.java
@@ -21,6 +21,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitLineHandler;
 import git4idea.i18n.GitBundle;
+import git4idea.util.GitUIUtil;
 
 import javax.swing.*;
 import java.util.List;

diff --git a/plugins/git4idea/src/git4idea/ui/GitTagDialog.java b/plugins/git4idea/src/git4idea/ui/GitTagDialog.java
index af733abeabeff5439b97ceabe4bacf08cdadea04..fdfd7ec163650ee55d34db49a3cbd4ea24784f6b 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitTagDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitTagDialog.java
@@ -25,7 +25,8 @@ import com.intellij.ui.DocumentAdapter;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitHandlerUtil;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.GitUIUtil;
+import git4idea.util.StringScanner;
 import git4idea.i18n.GitBundle;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;

diff --git a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
index cd1366ea55c55eb507e2307a090abac828d37e34..f2eefbd1f9f2b5a00d2cb4c62da9ee4fd58d81f7 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
+++ b/plugins/git4idea/src/git4idea/ui/GitUnstashDialog.java
@@ -41,6 +41,7 @@ import git4idea.config.GitVersionSpecialty;
 import git4idea.i18n.GitBundle;
 import git4idea.merge.GitConflictResolver;
 import git4idea.stash.GitStashUtils;
+import git4idea.util.GitUIUtil;
 import git4idea.validators.GitBranchNameValidator;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java b/plugins/git4idea/src/git4idea/ui/branch/GitMultiRootBranchConfig.java
index 4e45aed7a5b4f2456c0c6195802c5b32d99f685a..4c73b972aac9c2ab0cb80bf32fd02627f383e934 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.branch.GitBranchesCollection;
 import git4idea.repo.GitRepository;
 import org.jetbrains.annotations.NotNull;

diff --git a/plugins/git4idea/src/git4idea/update/GitFetcher.java b/plugins/git4idea/src/git4idea/update/GitFetcher.java
index 31491f7fa65a4b88e9d3230cdfb0bfa64c105442..18ed54b6ef5df7306c898b58c2cbdfa8354b52b4 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitFetcher.java
+++ b/plugins/git4idea/src/git4idea/update/GitFetcher.java
@@ -27,7 +27,7 @@ import git4idea.jgit.GitHttpAdapter;
 import git4idea.repo.GitRemote;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 

diff --git a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
index 7106ba796bae465691d13b678d926fdde66bf968..e270122f511f8ea8ca97dc7cbf5d5fbfec7b6d33 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
+++ b/plugins/git4idea/src/git4idea/update/GitMergeUpdater.java
@@ -28,13 +28,13 @@ 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.branch.GitBranchPair;
 import git4idea.commands.*;
 import git4idea.merge.GitConflictResolver;
 import git4idea.merge.GitMerger;
 import git4idea.commands.GitMessageWithFilesDetector;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import git4idea.util.UntrackedFilesNotifier;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java b/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java
index 9a62e8c22170cde0711c5a71071f5e872b4d1a87..b8602acdc4b060acf4f82a41e4a1db91286bf3d4 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java
+++ b/plugins/git4idea/src/git4idea/update/GitRebaseUpdater.java
@@ -29,7 +29,7 @@ import git4idea.merge.GitConflictResolver;
 import git4idea.commands.GitMessageWithFilesDetector;
 import git4idea.rebase.GitRebaseProblemDetector;
 import git4idea.rebase.GitRebaser;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import git4idea.util.UntrackedFilesNotifier;
 
 import java.util.Collections;

diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java b/plugins/git4idea/src/git4idea/update/GitUpdateEnvironment.java
index b3a662ee9f33123b3fb36b5ced0b966135c559d7..69cc5c2a349f6bd887f09675c4951d75f19d9158 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.GitUtil;
+import git4idea.util.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 ef6e03150cba9a9e2d32e99d98faade9f1a05f94..2db9d9f47248ef4983fb5705e311f6a0d1be9872 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateLocallyModifiedDialog.java
@@ -23,13 +23,13 @@ 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.commands.GitCommand;
 import git4idea.commands.GitSimpleHandler;
-import git4idea.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.i18n.GitBundle;
 import git4idea.rollback.GitRollbackEnvironment;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;

diff --git a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
index 10ea5e2df3a4b39925f6d410493049bb1fd80649..6f3b1fff17c2cdc15b56167a0f9818287f66f59d 100644 (file)
--- a/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
+++ b/plugins/git4idea/src/git4idea/update/GitUpdateProcess.java
@@ -34,12 +34,12 @@ import git4idea.merge.GitConflictResolver;
 import git4idea.merge.GitMerger;
 import git4idea.rebase.GitRebaser;
 import git4idea.stash.GitChangesSaver;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
-import static git4idea.ui.GitUIUtil.*;
+import static git4idea.util.GitUIUtil.*;
 
 /**
  * Handles update process (pull via merge or rebase) for several roots.

diff --git a/plugins/git4idea/src/git4idea/update/GitUpdater.java b/plugins/git4idea/src/git4idea/update/GitUpdater.java
index ff64539a3a0c67454b2c322925aac0420609d802..055d3fe829efee283964010622d9269f3c8dc2a1 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.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.branch.GitBranchPair;
 import git4idea.config.GitConfigUtil;

diff --git a/plugins/git4idea/src/git4idea/commands/GitFileUtils.java b/plugins/git4idea/src/git4idea/util/GitFileUtils.java
similarity index 97%
rename from plugins/git4idea/src/git4idea/commands/GitFileUtils.java
rename to plugins/git4idea/src/git4idea/util/GitFileUtils.java
index ce463889805adadeb232b8e826c0e2b2c8724bf5..5873656fede6e5db2a8e26559dd4f1720867bd0d 100644 (file)
--- a/plugins/git4idea/src/git4idea/commands/GitFileUtils.java
+++ b/plugins/git4idea/src/git4idea/util/GitFileUtils.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.commands;
+package git4idea.util;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.SystemInfo;
@@ -21,6 +21,9 @@ import com.intellij.openapi.vcs.FilePath;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.vcsUtil.VcsFileUtil;
+import git4idea.commands.GitBinaryHandler;
+import git4idea.commands.GitCommand;
+import git4idea.commands.GitSimpleHandler;
 import git4idea.repo.GitRepository;
 import git4idea.repo.GitRepositoryManager;
 import git4idea.repo.GitUntrackedFilesHolder;

diff --git a/plugins/git4idea/src/git4idea/ui/GitUIUtil.java b/plugins/git4idea/src/git4idea/util/GitUIUtil.java
similarity index 99%
rename from plugins/git4idea/src/git4idea/ui/GitUIUtil.java
rename to plugins/git4idea/src/git4idea/util/GitUIUtil.java
index 166095a43a3e0cb8173ff9fb80a2f8f548b48a89..6758e4268202e7590333b56cf4abd456319c99b8 100644 (file)
--- a/plugins/git4idea/src/git4idea/ui/GitUIUtil.java
+++ b/plugins/git4idea/src/git4idea/util/GitUIUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.ui;
+package git4idea.util;
 
 import com.intellij.ide.ui.ListCellRendererWrapper;
 import com.intellij.notification.NotificationGroup;

diff --git a/plugins/git4idea/src/git4idea/GitUtil.java b/plugins/git4idea/src/git4idea/util/GitUtil.java
similarity index 99%
rename from plugins/git4idea/src/git4idea/GitUtil.java
rename to plugins/git4idea/src/git4idea/util/GitUtil.java
index 3ac5ba06aa9d90358242ba79da23e0a76c25bf8a..c60870eba110c427a74d41f777cc6a32ebbb3e50 100644 (file)
--- a/plugins/git4idea/src/git4idea/GitUtil.java
+++ b/plugins/git4idea/src/git4idea/util/GitUtil.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea;
+package git4idea.util;
 
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
@@ -29,12 +29,14 @@ 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.commands.StringScanner;
+import git4idea.util.StringScanner;
 import git4idea.config.GitConfigUtil;
 import git4idea.i18n.GitBundle;
 import git4idea.repo.GitRemote;
@@ -55,7 +57,7 @@ public class GitUtil {
   /**
    * The logger instance
    */
-  private final static Logger LOG = Logger.getInstance("#git4idea.GitUtil");
+  private final static Logger LOG = Logger.getInstance("#git4idea.util.GitUtil");
   /**
    * Comparator for virtual files by name
    */

diff --git a/plugins/git4idea/src/git4idea/commands/StringScanner.java b/plugins/git4idea/src/git4idea/util/StringScanner.java
similarity index 99%
rename from plugins/git4idea/src/git4idea/commands/StringScanner.java
rename to plugins/git4idea/src/git4idea/util/StringScanner.java
index 376bd4cc00a154eafc0e1afbb189db7f899d2b4a..2d7d1d1cf6da320ae9dc4a034c121a9bcf3dc7c3 100644 (file)
--- a/plugins/git4idea/src/git4idea/commands/StringScanner.java
+++ b/plugins/git4idea/src/git4idea/util/StringScanner.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package git4idea.commands;
+package git4idea.util;
 
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/src/git4idea/validators/GitNewBranchNameValidator.java b/plugins/git4idea/src/git4idea/validators/GitNewBranchNameValidator.java
index 607e749b0208a4eb06a2dba72cad4270d54fe70d..2e2dda9333d17d32114f188f613846c8a0c29db4 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.GitUtil;
+import git4idea.util.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 a4b9b156c156baed980d581cb4cac81c44998da2..16fc19c62306943b08dd84c54ca7cca62b0a78b3 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.GitUtil;
+import git4idea.util.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 e0a6577c1d5233169f3914c7e4a0fac810cf3b9e..2f40b55be5aa123dcb020384296f75ed8ce1849d 100644 (file)
--- a/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java
+++ b/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java
@@ -30,9 +30,9 @@ import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsFileUtil;
 import com.intellij.vcsUtil.VcsUtil;
 import git4idea.Git;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
-import git4idea.commands.GitFileUtils;
+import git4idea.util.GitFileUtils;
 import git4idea.i18n.GitBundle;
 import org.jetbrains.annotations.NotNull;
 

diff --git a/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java b/plugins/git4idea/tests/git4idea/history/GitLogParserTest.java
index 6c048bca9e8b8268b0042a51c556f9aa7e1bcda8..e7aa71c4fe869550edf976dbf3a709d5b5883232 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.GitUtil;
+import git4idea.util.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 7e90f054e25c5ba504f1def626462ecad8815e1f..93d08e2dab04ba4d0709176c6e70ba5b6a190862 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.GitUtil;
+import git4idea.util.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 e043f207ba3e6bf4042ad03e69b31f9fad5f4121..482ac1a56b753dba75981d747fd1b4bcf25c7b89 100644 (file)
--- a/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/GithubShareAction.java
@@ -26,14 +26,15 @@ import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.containers.HashSet;
 import git4idea.GitDeprecatedRemote;
-import git4idea.GitUtil;
+import git4idea.util.GitUtil;
 import git4idea.GitVcs;
 import git4idea.actions.BasicAction;
 import git4idea.actions.GitInit;
-import git4idea.checkin.GitPushUtils;
+import git4idea.push.GitPushUtils;
 import git4idea.commands.*;
 import git4idea.i18n.GitBundle;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
+import git4idea.util.GitFileUtils;
 import org.jetbrains.plugins.github.ui.GithubShareDialog;
 
 import java.io.IOException;

diff --git a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubRebaseDialog.java b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubRebaseDialog.java
index 9bce8d8ef355727af4c2e4272c892c9792c1ebb7..0b9b571509a92930d55910f459d14061f2656027 100644 (file)
--- a/plugins/github/src/org/jetbrains/plugins/github/ui/GithubRebaseDialog.java
+++ b/plugins/github/src/org/jetbrains/plugins/github/ui/GithubRebaseDialog.java
@@ -20,7 +20,7 @@ import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
 import git4idea.GitBranch;
 import git4idea.rebase.GitRebaseDialog;
-import git4idea.ui.GitUIUtil;
+import git4idea.util.GitUIUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;