diff --git a/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java b/plugins/git4idea/src/git4idea/GitBinaryContentRevision.java index acf62daf9c26..9adb39a90dd7 100644 --- 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 d9e18f73c130..f878b16ea1ee 100644 --- 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 a0043caf9504..40ba200159cf 100644 --- 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 7f51742cdbc1..a9a6a3e3683b 100644 --- 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 1f107db17ee9..0b7afd0b3bc9 100644 --- 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 30e098ade0dd..ed073ff9e338 100644 --- 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 c60870eba110..6fa5f09f2b45 100644 --- 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 a8f4654375cb..960ae602b6b9 100644 --- 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 8085e89207fd..516c131383aa 100644 --- 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 7ec5c87b2be4..1709c05d89c9 100644 --- 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 af22bfad8238..d2a370cb67cf 100644 --- 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 356dbe04fe32..a9fffc8cc91c 100644 --- 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 13ea34a7a9dd..ceb6ddaee938 100644 --- 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 ab0a1b372e21..d9490caf578d 100644 --- 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 13c3bc156406..ae3b8a239dab 100644 --- 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.
" + 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 b4cd83af43b3..b0c3403070f0 100644 --- 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 8317cc9db80b..c37f7eca50a6 100644 --- 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 b898452485ad..439afdf1fa62 100644 --- 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 3e6d81bd64c9..83a7d8ff526b 100644 --- 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 320ccd75bb75..6ef8e74e2f68 100644 --- 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 589175ae7e58..df3b5b125300 100644 --- 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 1483f76fb815..0e42072e2505 100644 --- 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 ee1fe916c4d4..0ff4989def66 100644 --- 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 e2813f2bee73..3225167b10aa 100644 --- 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 bca7f9501d55..3c79476025e1 100644 --- 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 6dbc53552186..4436abf6769d 100644 --- 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 15fe7c898733..d7903c386f19 100644 --- 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 09f7dbf6f756..2f3c716f5bdf 100644 --- 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 3b18a9305502..779546da35e0 100644 --- 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 cf665ac70280..84e169624db4 100644 --- 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 402299c515fb..96159428b801 100644 --- 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 fb357851a8c1..f8ada332cb7b 100644 --- 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 9c31ce88756e..5cb5542a358f 100644 --- 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 7006754ba301..8389b5b9a248 100644 --- 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 46b54972c073..fa9d72351f48 100644 --- 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 f2d8eabab233..d4611481830e 100644 --- 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 f92c4d75d29a..6afa4b40bc0c 100644 --- 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 0914a7383d47..1ee4146473ca 100644 --- 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 9fb659685a6c..82f35fc056f4 100644 --- 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 7da110893e5b..ae35fc82ad35 100644 --- 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 8669ddbd916a..92058bc189d0 100644 --- 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 42a2d15074fe..b719ffc5b672 100644 --- 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 1ccf37005178..8880d86b2cc0 100644 --- 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 4c73b972aac9..4e45aed7a5b4 100644 --- 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 e270122f511f..7d4f42b7afdf 100644 --- 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 69cc5c2a349f..b3a662ee9f33 100644 --- 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 2db9d9f47248..e597477eeb21 100644 --- 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 055d3fe829ef..ff64539a3a0c 100644 --- 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 2e2dda9333d1..607e749b0208 100644 --- 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 16fc19c62306..a4b9b156c156 100644 --- 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 796422f43542..99d84c60c9b4 100644 --- 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 e7aa71c4fe86..6c048bca9e8b 100644 --- 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 93d08e2dab04..7e90f054e25c 100644 --- 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 9619adee4361..1903933b61e2 100644 --- 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;