chore: Correct namespace

nick-bulleid · Oct 13, 2019 · b4473df · b4473df
1 parent 7ef4833
commit b4473df
Show file tree

Hide file tree

Showing 46 changed files with 47 additions and 7 deletions.
diff --git a/GitCommands/ArgumentBuilderExtensions.cs b/GitCommands/ArgumentBuilderExtensions.cs
@@ -3,6 +3,7 @@
 using System.ComponentModel;
 using System.Linq;
 using GitCommands.Git;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;
 

diff --git a/GitCommands/CommitDataManager.cs b/GitCommands/CommitDataManager.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using GitCommands.Git.Extensions;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;
 

diff --git a/GitCommands/FileHelper.cs b/GitCommands/FileHelper.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using GitExtUtils;
 using JetBrains.Annotations;
 
 namespace GitCommands

diff --git a/GitCommands/Git/AheadBehindDataProvider.cs b/GitCommands/Git/AheadBehindDataProvider.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 using System.Text.RegularExpressions;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;
 

diff --git a/GitCommands/Git/ExecutableExtensions.cs b/GitCommands/Git/ExecutableExtensions.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;
 

diff --git a/GitCommands/Git/GitCheckoutBranchCmd.cs b/GitCommands/Git/GitCheckoutBranchCmd.cs
@@ -1,4 +1,5 @@
 using System;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 
 namespace GitCommands.Git

diff --git a/GitCommands/Git/GitCommandHelpers.cs b/GitCommands/Git/GitCommandHelpers.cs
@@ -10,6 +10,7 @@
 using GitCommands.Git.Extensions;
 using GitCommands.Patches;
 using GitCommands.Utils;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;
 using Microsoft.VisualStudio.Threading;

diff --git a/GitCommands/Git/GitDeleteBranchCmd.cs b/GitCommands/Git/GitDeleteBranchCmd.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 
 namespace GitCommands

diff --git a/GitCommands/Git/GitDeleteRemoteBranchesCmd.cs b/GitCommands/Git/GitDeleteRemoteBranchesCmd.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 
 namespace GitCommands.Git

diff --git a/GitCommands/Git/GitGpgController.cs b/GitCommands/Git/GitGpgController.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 
 namespace GitCommands.Gpg

diff --git a/GitCommands/Git/GitModule.cs b/GitCommands/Git/GitModule.cs
@@ -14,6 +14,7 @@
 using GitCommands.Patches;
 using GitCommands.Settings;
 using GitCommands.Utils;
+using GitExtUtils;
 using GitUI;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;

diff --git a/GitCommands/Git/GitPushAction.cs b/GitCommands/Git/GitPushAction.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using GitExtUtils;
 
 namespace GitCommands
 {

diff --git a/GitCommands/Git/RevisionDiffProvider.cs b/GitCommands/Git/RevisionDiffProvider.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Diagnostics;
-using GitUIPluginInterfaces;
+using GitExtUtils;
 using JetBrains.Annotations;
 
 namespace GitCommands.Git

diff --git a/GitCommands/Git/SystemEncodingReader.cs b/GitCommands/Git/SystemEncodingReader.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Text;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 
 namespace GitCommands.Git

diff --git a/GitCommands/Git/Tag/GitCreateTagCmd.cs b/GitCommands/Git/Tag/GitCreateTagCmd.cs
@@ -1,4 +1,5 @@
 using System;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;
 

diff --git a/GitCommands/RevisionReader.cs b/GitCommands/RevisionReader.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using GitExtUtils;
 using GitUI;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;

diff --git a/GitExtUtils/ArgumentBuilder.cs b/GitExtUtils/ArgumentBuilder.cs
@@ -5,7 +5,7 @@
 using System.Text;
 using JetBrains.Annotations;
 
-namespace GitCommands
+namespace GitExtUtils
 {
     /// <summary>
     /// Builds a command line argument string from zero or more arguments.

diff --git a/GitExtUtils/ArgumentString.cs b/GitExtUtils/ArgumentString.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Diagnostics;
+using GitExtUtils;
 using JetBrains.Annotations;
 
 namespace GitCommands

diff --git a/GitExtUtils/GitArgumentBuilder.cs b/GitExtUtils/GitArgumentBuilder.cs
@@ -4,9 +4,10 @@
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
+using GitCommands;
 using JetBrains.Annotations;
 
-namespace GitCommands
+namespace GitExtUtils
 {
     /// <summary>
     /// Builds a git command line string from config items, a command name and that command's arguments.

diff --git a/GitUI/CommandsDialogs/FormCherryPick.cs b/GitUI/CommandsDialogs/FormCherryPick.cs
@@ -2,6 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitUI.HelperDialogs;
 using JetBrains.Annotations;
 using ResourceManager;

diff --git a/GitUI/CommandsDialogs/FormFileHistory.cs b/GitUI/CommandsDialogs/FormFileHistory.cs
@@ -8,6 +8,7 @@
 using System.Text;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitExtUtils.GitUI;
 using GitUI.Properties;
 using JetBrains.Annotations;

diff --git a/GitUI/CommandsDialogs/FormMergeSubmodule.cs b/GitUI/CommandsDialogs/FormMergeSubmodule.cs
@@ -2,6 +2,7 @@
 using System.Diagnostics;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using ResourceManager;
 

diff --git a/GitUI/CommandsDialogs/FormPull.cs b/GitUI/CommandsDialogs/FormPull.cs
@@ -11,6 +11,7 @@
 using GitCommands.Git;
 using GitCommands.Remotes;
 using GitCommands.UserRepositoryHistory;
+using GitExtUtils;
 using GitExtUtils.GitUI;
 using GitUI.Properties;
 using GitUI.Script;

diff --git a/GitUI/CommandsDialogs/FormResolveConflicts.cs b/GitUI/CommandsDialogs/FormResolveConflicts.cs
@@ -8,6 +8,7 @@
 using GitCommands;
 using GitCommands.Git;
 using GitCommands.Utils;
+using GitExtUtils;
 using GitUI.CommandsDialogs.ResolveConflictsDialog;
 using GitUI.Hotkey;
 using ResourceManager;

diff --git a/GitUI/CommandsDialogs/FormVerify.LostObject.cs b/GitUI/CommandsDialogs/FormVerify.LostObject.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using GitCommands;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;
 

diff --git a/GitUI/CommandsDialogs/WorktreeDialog/FormCreateWorktree.cs b/GitUI/CommandsDialogs/WorktreeDialog/FormCreateWorktree.cs
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 
 namespace GitUI.CommandsDialogs.WorktreeDialog

diff --git a/GitUI/GitUICommands.cs b/GitUI/GitUICommands.cs
@@ -7,6 +7,7 @@
 using GitCommands;
 using GitCommands.Git;
 using GitCommands.Settings;
+using GitExtUtils;
 using GitUI.CommandsDialogs;
 using GitUI.CommandsDialogs.RepoHosting;
 using GitUI.CommandsDialogs.SettingsDialog;

diff --git a/GitUI/UserControls/ConsoleEmulatorOutputControl.cs b/GitUI/UserControls/ConsoleEmulatorOutputControl.cs
@@ -6,6 +6,7 @@
 using GitCommands;
 using GitCommands.Logging;
 using GitCommands.Utils;
+using GitExtUtils;
 
 namespace GitUI.UserControls
 {

diff --git a/GitUI/UserControls/RevisionGrid/FormRevisionFilter.cs b/GitUI/UserControls/RevisionGrid/FormRevisionFilter.cs
@@ -1,6 +1,6 @@
 using System;
 using GitCommands;
-using GitUIPluginInterfaces;
+using GitExtUtils;
 
 namespace GitUI.UserControls.RevisionGrid
 {

diff --git a/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs b/GitUI/UserControls/RevisionGrid/RevisionGridControl.cs
@@ -14,6 +14,7 @@
 using GitCommands;
 using GitCommands.Config;
 using GitCommands.Git;
+using GitExtUtils;
 using GitExtUtils.GitUI;
 using GitUI.Avatars;
 using GitUI.BuildServerIntegration;

diff --git a/Plugins/BackgroundFetch/BackgroundFetchPlugin.cs b/Plugins/BackgroundFetch/BackgroundFetchPlugin.cs
@@ -6,6 +6,7 @@
 using System.Reactive.Linq;
 using BackgroundFetch.Properties;
 using GitCommands;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using ResourceManager;
 

diff --git a/Plugins/CreateLocalBranches/CreateLocalBranchesForm.cs b/Plugins/CreateLocalBranches/CreateLocalBranchesForm.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 
 namespace CreateLocalBranches

diff --git a/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.cs b/Plugins/DeleteUnusedBranches/DeleteUnusedBranchesForm.cs
@@ -7,6 +7,7 @@
 using System.Windows.Forms;
 using DeleteUnusedBranches.Properties;
 using GitCommands;
+using GitExtUtils;
 using GitExtUtils.GitUI;
 using GitUI;
 using GitUIPluginInterfaces;

diff --git a/Plugins/FindLargeFiles/FindLargeFilesForm.cs b/Plugins/FindLargeFiles/FindLargeFilesForm.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitExtUtils.GitUI;
 using GitUI;
 using GitUIPluginInterfaces;

diff --git a/Plugins/Gerrit/FormGerritPublish.cs b/Plugins/Gerrit/FormGerritPublish.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitUI.Properties;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;

diff --git a/Plugins/Gerrit/GerritUtil.cs b/Plugins/Gerrit/GerritUtil.cs
@@ -5,6 +5,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitUI;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;

diff --git a/Plugins/GitFlow/GitFlowForm.cs b/Plugins/GitFlow/GitFlowForm.cs
@@ -5,6 +5,7 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitExtUtils.GitUI;
 using GitFlow.Properties;
 using GitUIPluginInterfaces;

diff --git a/Plugins/Gource/GourceStart.cs b/Plugins/Gource/GourceStart.cs
@@ -6,6 +6,7 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitUI;
 using GitUI.Avatars;
 using GitUIPluginInterfaces;

diff --git a/Plugins/ProxySwitcher/ProxySwitcherForm.cs b/Plugins/ProxySwitcher/ProxySwitcherForm.cs
@@ -3,6 +3,7 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using GitCommands;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using ResourceManager;
 

diff --git a/UnitTests/GitCommandsTests/ArgumentBuilderExtensionsTests.cs b/UnitTests/GitCommandsTests/ArgumentBuilderExtensionsTests.cs
@@ -5,6 +5,7 @@
 using FluentAssertions;
 using GitCommands;
 using GitCommands.Git;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using NUnit.Framework;
 

diff --git a/UnitTests/GitCommandsTests/Config/ConfigFileTest.cs b/UnitTests/GitCommandsTests/Config/ConfigFileTest.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using GitCommands;
 using GitCommands.Config;
+using GitExtUtils;
 using NUnit.Framework;
 
 namespace GitCommandsTests.Config

diff --git a/UnitTests/GitCommandsTests/Git/ExecutableExtensionsTests.cs b/UnitTests/GitCommandsTests/Git/ExecutableExtensionsTests.cs
@@ -3,11 +3,10 @@
 using System.IO;
 using System.Reflection;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using CommonTestUtils;
 using GitCommands;
 using GitCommands.Settings;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using NUnit.Framework;
 

diff --git a/UnitTests/GitCommandsTests/Git/Gpg/GitGpgControllerTests.cs b/UnitTests/GitCommandsTests/Git/Gpg/GitGpgControllerTests.cs
@@ -4,6 +4,7 @@
 using FluentAssertions;
 using GitCommands;
 using GitCommands.Gpg;
+using GitExtUtils;
 using GitUIPluginInterfaces;
 using NSubstitute;
 using NUnit.Framework;

diff --git a/UnitTests/GitCommandsTests/GitModuleTests.cs b/UnitTests/GitCommandsTests/GitModuleTests.cs
@@ -7,6 +7,7 @@
 using FluentAssertions;
 using GitCommands;
 using GitCommands.Git;
+using GitExtUtils;
 using GitUI;
 using GitUIPluginInterfaces;
 using JetBrains.Annotations;

diff --git a/UnitTests/GitExtUtils/ArgumentBuilderTests.cs b/UnitTests/GitExtUtils/ArgumentBuilderTests.cs
@@ -1,5 +1,5 @@
 using FluentAssertions;
-using GitCommands;
+using GitExtUtils;
 using NUnit.Framework;
 
 namespace GitExtUtilsTests

diff --git a/UnitTests/GitExtUtils/GitArgumentBuilderTests.cs b/UnitTests/GitExtUtils/GitArgumentBuilderTests.cs
@@ -1,5 +1,6 @@
 using System;
 using GitCommands;
+using GitExtUtils;
 using NUnit.Framework;
 
 namespace GitExtUtilsTests