Merge branch 'refs/heads/master' into vs14

# Conflicts: # GitPlugin/Resgen/ResGen.exe # GitPlugin/Resgen/al.exe # GitPlugin/Resgen/al.exe.config
gitextensions · Dec 12, 2015 · d135926 · d135926
2 parents e3ed90c + 527cfc9
commit d135926
Show file tree

Hide file tree

Showing 60 changed files with 1,308 additions and 654 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,6 +2,8 @@ language: c
 
 os: linux
 
+sudo: required
+
 before_install:
   - sudo bash -c "echo deb http://badgerports.org precise main >> /etc/apt/sources.list"
   - sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 0E1FAD0C

diff --git a/Bin/ICSharpCode.TextEditor.dll b/Bin/ICSharpCode.TextEditor.dll
diff --git a/Externals/NBug b/Externals/NBug
diff --git a/GitCommands/Git/GitModule.cs b/GitCommands/Git/GitModule.cs
@@ -331,7 +331,7 @@ public Encoding LogOutputEncoding
         /// <summary>"(no branch)"</summary>
         public static readonly string DetachedBranch = "(no branch)";
 
-        private static readonly string[] DetachedPrefixes = { "(no branch", "(detached from " };
+        private static readonly string[] DetachedPrefixes = { "(no branch", "(detached from ", "(HEAD detached at " };
 
         public AppSettings.PullAction LastPullAction
         {

diff --git a/GitCommands/PathUtil.cs b/GitCommands/PathUtil.cs
@@ -101,5 +101,24 @@ public static IEqualityComparer<string> CreatePathEqualityComparer()
         {
             return new PathEqualityComparer();
         }
+
+        public static string GetRepositoryName(string repositoryUrl)
+        {
+            string name = "";
+
+            if (repositoryUrl != null)
+            {
+                const string standardRepositorySuffix = ".git";
+                string path = repositoryUrl.TrimEnd(new[] { '\\', '/' });
+
+                if (path.EndsWith(standardRepositorySuffix))
+                    path = path.Substring(0, path.Length - standardRepositorySuffix.Length);
+
+                if (path.Contains("\\") || path.Contains("/"))
+                    name = path.Substring(path.LastIndexOfAny(new[] { '\\', '/' }) + 1);
+            }
+
+            return name;
+        }
     }
 }
diff --git a/GitCommands/Settings/AppSettings.cs b/GitCommands/Settings/AppSettings.cs
@@ -1024,6 +1024,7 @@ public static void LoadSettings()
             addEncoding(new UnicodeEncoding());
             addEncoding(new UTF7Encoding());
             addEncoding(new UTF8Encoding(false));
+            addEncoding(System.Text.Encoding.GetEncoding("CP852"));
 
             try
             {

diff --git a/GitExtensions.VS2012.sln b/GitExtensions.VS2012.sln
@@ -109,6 +109,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TfsInterop.Vs2012", "Plugin
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitExtUtils", "GitExtUtils\GitExtUtils.csproj", "{0F1F1168-A4B2-4FA2-B17B-735140D17F39}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitExtensionsVSIX", "GitExtensionsVSIX\GitExtensionsVSIX.csproj", "{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VS", "VS", "{E3E7DA86-1090-48B5-A34A-E9A4B8E415F2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -498,6 +502,16 @@ Global
 		{0F1F1168-A4B2-4FA2-B17B-735140D17F39}.ReleaseTC|Any CPU.Build.0 = Release|Any CPU
 		{0F1F1168-A4B2-4FA2-B17B-735140D17F39}.ReleaseTC|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0F1F1168-A4B2-4FA2-B17B-735140D17F39}.ReleaseTC|Mixed Platforms.Build.0 = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.ReleaseTC|Any CPU.ActiveCfg = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.ReleaseTC|Mixed Platforms.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -520,6 +534,8 @@ Global
 		{50AEAB6C-83C4-45F8-AA01-90E1405C48AF} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
 		{92B57383-233E-46AE-8A86-6E98BF349A72} = {AF6D7B1B-FAF6-4793-AC05-00C63A5BC0F5}
 		{0B131F9D-BB10-4C3E-9656-5AB858158DE5} = {AF6D7B1B-FAF6-4793-AC05-00C63A5BC0F5}
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6} = {E3E7DA86-1090-48B5-A34A-E9A4B8E415F2}
+		{E996BE2D-B07D-472D-9D74-3EA2D48EF269} = {E3E7DA86-1090-48B5-A34A-E9A4B8E415F2}
 		{121965D1-4399-4538-B8BF-403EB5B847C3} = {F1B97F5D-CA42-4280-94A1-CE412BEA20DF}
 		{E6AAC693-815B-4D1A-83D7-F4DE36072793} = {F1B97F5D-CA42-4280-94A1-CE412BEA20DF}
 		{452CBBA1-8AF0-4F3B-8BEB-B8B31DC2B749} = {F1B97F5D-CA42-4280-94A1-CE412BEA20DF}

diff --git a/GitExtensions.VS2013.sln b/GitExtensions.VS2013.sln
@@ -115,6 +115,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TfsInterop.Vs2013", "Plugin
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitExtUtils", "GitExtUtils\GitExtUtils.csproj", "{0F1F1168-A4B2-4FA2-B17B-735140D17F39}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitExtensionsVSIX", "GitExtensionsVSIX\GitExtensionsVSIX.csproj", "{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VS", "VS", "{BA576F22-5035-4B75-8A0D-58DD067FD379}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -515,15 +519,28 @@ Global
 		{0F1F1168-A4B2-4FA2-B17B-735140D17F39}.ReleaseTC|Any CPU.Build.0 = Release|Any CPU
 		{0F1F1168-A4B2-4FA2-B17B-735140D17F39}.ReleaseTC|Mixed Platforms.ActiveCfg = Release|Any CPU
 		{0F1F1168-A4B2-4FA2-B17B-735140D17F39}.ReleaseTC|Mixed Platforms.Build.0 = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.ReleaseTC|Any CPU.ActiveCfg = Release|Any CPU
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6}.ReleaseTC|Mixed Platforms.ActiveCfg = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{AF6D7B1B-FAF6-4793-AC05-00C63A5BC0F5} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
+		{E996BE2D-B07D-472D-9D74-3EA2D48EF269} = {BA576F22-5035-4B75-8A0D-58DD067FD379}
 		{27559302-F35E-4B62-A6EC-11FF21A5FA6F} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
+		{92B57383-233E-46AE-8A86-6E98BF349A72} = {AF6D7B1B-FAF6-4793-AC05-00C63A5BC0F5}
 		{687A73BB-12A0-4AF7-B420-4A9C47DB75CB} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
 		{921F0443-C3A1-4A09-82E8-C4AFB9654943} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
+		{0B131F9D-BB10-4C3E-9656-5AB858158DE5} = {AF6D7B1B-FAF6-4793-AC05-00C63A5BC0F5}
 		{31D96116-16A6-45C2-9A6D-6DD5A1FC5F20} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
 		{F261BCD1-F5F7-4664-A229-E52032E6E9FD} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
 		{B1B0C273-AB3F-48BF-92C7-DE0BE90D5870} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
@@ -533,16 +550,15 @@ Global
 		{F261BCD1-F5F7-4664-A230-E52032E6E9FD} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
 		{7E5433F4-DD13-4D8E-95B2-59B4FFE7D636} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
 		{D4628A13-CD53-401F-A645-CB16FD15ABBB} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
+		{121965D1-4399-4538-B8BF-403EB5B847C3} = {F1B97F5D-CA42-4280-94A1-CE412BEA20DF}
 		{F1B97F5D-CA42-4280-94A1-CE412BEA20DF} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
+		{F50B1DBF-1C9F-4437-87EC-7ABA805CC446} = {0E859634-B3DF-46AC-A73C-D49734F19D6A}
+		{62CED1D5-F603-40DE-8BF5-3E49D3A392F4} = {0E859634-B3DF-46AC-A73C-D49734F19D6A}
 		{50AEAB6C-83C4-45F8-AA01-90E1405C48AF} = {3D5CA0E0-EF51-4488-A8B7-86CC330D7AD8}
-		{92B57383-233E-46AE-8A86-6E98BF349A72} = {AF6D7B1B-FAF6-4793-AC05-00C63A5BC0F5}
-		{0B131F9D-BB10-4C3E-9656-5AB858158DE5} = {AF6D7B1B-FAF6-4793-AC05-00C63A5BC0F5}
-		{121965D1-4399-4538-B8BF-403EB5B847C3} = {F1B97F5D-CA42-4280-94A1-CE412BEA20DF}
 		{E6AAC693-815B-4D1A-83D7-F4DE36072793} = {F1B97F5D-CA42-4280-94A1-CE412BEA20DF}
 		{452CBBA1-8AF0-4F3B-8BEB-B8B31DC2B749} = {F1B97F5D-CA42-4280-94A1-CE412BEA20DF}
 		{699CE23D-8BBD-4C15-82E9-7A628ACCA4C6} = {F1B97F5D-CA42-4280-94A1-CE412BEA20DF}
 		{101D3C78-27CC-446A-98EC-E2DE88BF0641} = {F1B97F5D-CA42-4280-94A1-CE412BEA20DF}
-		{F50B1DBF-1C9F-4437-87EC-7ABA805CC446} = {0E859634-B3DF-46AC-A73C-D49734F19D6A}
-		{62CED1D5-F603-40DE-8BF5-3E49D3A392F4} = {0E859634-B3DF-46AC-A73C-D49734F19D6A}
+		{F01BB9F8-40F5-4D19-A8C1-9ED8E30107B6} = {BA576F22-5035-4B75-8A0D-58DD067FD379}
 	EndGlobalSection
 EndGlobal
diff --git a/GitExtensions/GitExtensions.Mono.csproj b/GitExtensions/GitExtensions.Mono.csproj
@@ -105,6 +105,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <EmbeddedResource Include="AutoCompleteRegexes.txt" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Externals\NBug\NBug\NBug.csproj">

diff --git a/GitExtensionsTest/GitCommands/Helpers/PathUtilTest.cs b/GitExtensionsTest/GitCommands/Helpers/PathUtilTest.cs
@@ -73,5 +73,23 @@ public void EqualTest()
             Assert.AreEqual(PathUtil.Equal("C:\\Work\\GitExtensions\\", "C:/Work/GitExtensions/"), true);
             Assert.AreEqual(PathUtil.Equal("\\\\my-pc\\Work\\GitExtensions\\", "//my-pc/Work/GitExtensions/"), true);
         }
+
+        [TestMethod]
+        public void GetRepositoryNameTest()
+        {
+            Assert.AreEqual(PathUtil.GetRepositoryName("https://github.com/gitextensions/gitextensions.git"), "gitextensions");
+            Assert.AreEqual(PathUtil.GetRepositoryName("https://github.com/jeffqc/gitextensions"), "gitextensions");
+            Assert.AreEqual(PathUtil.GetRepositoryName("git://mygitserver/git/test.git"), "test");
+            Assert.AreEqual(PathUtil.GetRepositoryName("ssh://mygitserver/git/test.git"), "test");
+            Assert.AreEqual(PathUtil.GetRepositoryName("ssh://john.doe@mygitserver/git/test.git"), "test");
+            Assert.AreEqual(PathUtil.GetRepositoryName("ssh://john-abraham.doe@mygitserver/git/MyAwesomeRepo.git"), "MyAwesomeRepo");
+            Assert.AreEqual(PathUtil.GetRepositoryName("git@anotherserver.mysubnet.com:project/somerepo.git"), "somerepo");
+            Assert.AreEqual(PathUtil.GetRepositoryName("http://anotherserver.mysubnet.com/project/somerepo.git"), "somerepo");
+            Assert.AreEqual(PathUtil.GetRepositoryName(@"C:\dev\my_repo"), "my_repo");
+            Assert.AreEqual(PathUtil.GetRepositoryName(@"\\networkshare\folder1\folder2\gitextensions"), "gitextensions");
+
+            Assert.AreEqual(PathUtil.GetRepositoryName(""), "");
+            Assert.AreEqual(PathUtil.GetRepositoryName(null), "");
+        }
     }
 }
diff --git a/GitExtensionsTest/GitExtensionsTest.csproj b/GitExtensionsTest/GitExtensionsTest.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -45,6 +45,14 @@
     <Reference Include="FluentAssertions.Core">
       <HintPath>..\packages\FluentAssertions.3.3.0\lib\net40\FluentAssertions.Core.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.core, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="nunit.core.interfaces, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
@@ -53,6 +61,14 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.Mocks.2.6.4\lib\nunit.mocks.dll</HintPath>
     </Reference>
+    <Reference Include="nunit.util, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NUnit.VisualStudio.TestAdapter, Version=2.0.0.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Core" />
@@ -135,4 +151,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/GitExtensionsTest/packages.config b/GitExtensionsTest/packages.config
@@ -1,6 +1,7 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="FluentAssertions" version="3.3.0" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
   <package id="NUnit.Mocks" version="2.6.4" targetFramework="net40" />
-</packages>
+  <package id="NUnitTestAdapter" version="2.0.0" targetFramework="net40" />
+</packages>