Merge upstream/master into portable

Author: AArnott

.travis.yml

@@ -10,6 +10,9 @@ os:
  - osx
  - linux
 
+# The newer image cannot find mono 3.12 in the PATH
+osx_image: xcode6.4
+
 env:
  global:
   - MONO_OPTIONS=--debug
@@ -30,6 +33,7 @@ script:
 branches:
  only:
    - master
+   - /^maint.*/
    - portable
 
 # Notify of build changes

CHANGES.md

@@ -10,19 +10,41 @@
   - Windows (x86/amd64): <https://ci.appveyor.com/project/libgit2/libgit2sharp>
   - Linux/Mac OS X: <https://travis-ci.org/libgit2/libgit2sharp>
 
-## v0.22 + 1
+## v0.23 + 1
 
 ### Additions
 
+### Changes
+
+### Fixes
+
+## v0.23 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.22..v0.23))
+
+### Additions
+
+ - Add `CherryPickCommit` and `RevertCommit` to `ObjectDatabase`.
+ - Add `IncludeIgnored` field to `SatusOptions`.
+ - Add `Commit.CreateBuffer` to write a commit object to a buffer and
+   `ObjectDatabase.CreateCommitWithSignature` to create commits which include a
+   signature.
+ - Add `Commit.ExtractSignature` to get a commit's signature.
+ - Add `ObjectDatabase.Write<T>` to write arbitrary objects to the object db.
+ - Add `Commit.PrettifyMessage`
+
+
 ### Changes
 
  - The native libraries are now expected to be in the `lib` directory,
    instead of `NativeBinaries` for improved mono compatibility.  In
    addition, the names of platform architectures now better reflect
    the vendor naming (eg, `x86_64` instead of `amd64` on Linux).
- - Obsolete the config paths in RepositoryOptions
-
-### Fixes
+ - Deprecate the config paths in RepositoryOptions
+ - Deprecate the `QueryBy` overload with `FollowFilter`.
+ - Deprecate `Branch.Remote` in favour of `Branch.RemoteName`
+ - `Remote` no longer implement the equality operator.
+ - `Remote.Update` takes a remote name instead of an instance.
+ - `Fetch`, `Pull`, `Move`, `Remove`, `Stage` are now in a commands namespace to
+   indicate what they represent.
 
 ## v0.22 - ([diff](https://github.com/libgit2/libgit2sharp/compare/v0.21.1...v0.22))
 

LibGit2Sharp.Shared/Core/GitDiff.cs

@@ -397,6 +397,7 @@ internal class GitDiffBinaryFile
     [StructLayout(LayoutKind.Sequential)]
     internal class GitDiffBinary
     {
+        public uint ContainsData;
         public GitDiffBinaryFile OldFile;
         public GitDiffBinaryFile NewFile;
     }

LibGit2Sharp.Shared/Core/GitOdbBackend.cs

@@ -34,6 +34,7 @@ static GitOdbBackend()
         public IntPtr Refresh;
         public foreach_callback Foreach;
         public IntPtr Writepack;
+        public IntPtr Freshen;
         public free_callback Free;
 
         /* The libgit2 structure definition ends here. Subsequent fields are for libgit2sharp bookkeeping. */

LibGit2Sharp.Shared/Core/Handles/Libgit2Object.cs

@@ -5,7 +5,7 @@
 //
 // Uncomment the line below or add a conditional symbol to activate this mode
 
-#define LEAKS_IDENTIFYING
+// #define LEAKS_IDENTIFYING
 
 // This activates a more throrough mode which will show the stack trace of the
 // allocation code path for each handle that has been improperly released.
@@ -15,7 +15,7 @@
 //
 // Uncomment the line below or add a conditional symbol to activate this mode
 
-#define LEAKS_TRACKING
+// #define LEAKS_TRACKING
 
 using System;
 using System.Linq;

LibGit2Sharp.Shared/GlobalSettings.cs

@@ -24,10 +24,31 @@ static GlobalSettings()
             if (Platform.OperatingSystem == OperatingSystemType.Windows)
             {
 #if NET40
-                string managedPath = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().EscapedCodeBase).LocalPath);
+                /* Assembly.CodeBase is not actually a correctly formatted
+                 * URI.  It's merely prefixed with `file:///` and has its
+                 * backslashes flipped.  This is superior to EscapedCodeBase,
+                 * which does not correctly escape things, and ambiguates a
+                 * space (%20) with a literal `%20` in the path.  Sigh.
+                 */
+                var managedPath = Assembly.GetExecutingAssembly().CodeBase;
+                if (managedPath == null)
+                {
+                    managedPath = Assembly.GetExecutingAssembly().Location;
+                }
+                else if (managedPath.StartsWith("file:///"))
+                {
+                    managedPath = managedPath.Substring(8).Replace('/', '\\');
+                }
+                else if (managedPath.StartsWith("file://"))
+                {
+                    managedPath = @"\\" + managedPath.Substring(7).Replace('/', '\\');
+                }
+
+                managedPath = Path.GetDirectoryName(managedPath);
 #else
                 string managedPath = AppContext.BaseDirectory;
 #endif
+
                 nativeLibraryPath = Path.Combine(managedPath, "lib", "win32");
             }
 

LibGit2Sharp.Tests.Shared/ConfigurationFixture.cs

@@ -455,15 +455,6 @@ public void CanSetAndGetMultipleSearchPaths()
         [Fact]
         public void CanResetSearchPaths()
         {
-            // all of these calls should reset the config path to the default
-            Action[] resetActions =
-            {
-                () => GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global),
-                () => GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, null),
-                () => GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, string.Empty),
-                () => GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, new string[] { }),
-            };
-
             // record the default search path
             GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, null);
             var oldPaths = GlobalSettings.GetConfigSearchPaths(ConfigurationLevel.Global);
@@ -472,19 +463,13 @@ public void CanResetSearchPaths()
             // generate a non-default path to set
             var newPaths = new string[] { Path.Combine(Constants.TemporaryReposPath, Path.GetRandomFileName()) };
 
-            foreach (var tryToReset in resetActions)
-            {
-                // change to the non-default path
-                GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, newPaths);
-                Assert.Equal(newPaths, GlobalSettings.GetConfigSearchPaths(ConfigurationLevel.Global));
-
-                // set it back to the default
-                tryToReset();
-                Assert.Equal(oldPaths, GlobalSettings.GetConfigSearchPaths(ConfigurationLevel.Global));
-            }
+            // change to the non-default path
+            GlobalSettings.SetConfigSearchPaths (ConfigurationLevel.Global, newPaths);
+            Assert.Equal (newPaths, GlobalSettings.GetConfigSearchPaths (ConfigurationLevel.Global));
 
-            // make sure the config paths are reset after the test ends
-            GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, null);
+            // set it back to the default
+            GlobalSettings.SetConfigSearchPaths (ConfigurationLevel.Global, null);
+            Assert.Equal (oldPaths, GlobalSettings.GetConfigSearchPaths (ConfigurationLevel.Global));
         }
 
         [Fact]
@@ -497,7 +482,7 @@ public void CanAppendToSearchPaths()
             GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, "$PATH", appendMe);
 
             var currentPaths = GlobalSettings.GetConfigSearchPaths(ConfigurationLevel.Global);
-            Assert.Equal(currentPaths, prevPaths.Concat(new[] { appendMe }));
+            Assert.Equal(prevPaths.Concat(new[] { appendMe }), currentPaths);
 
             // set it back to the default
             GlobalSettings.SetConfigSearchPaths(ConfigurationLevel.Global, null);

LibGit2Sharp.Tests.Shared/FileHistoryFixture.cs

@@ -161,7 +161,8 @@ public void CanTellComplexCommitHistory()
                 var commit4 = MakeAndCommitChange(repo, repoPath, newPath1, "I have done it again!");
 
                 // Perform tests.
-                var fileHistoryEntries = repo.Commits.QueryBy(newPath1).ToList();
+                var commitFilter = new CommitFilter () { SortBy = CommitSortStrategies.Topological };
+                var fileHistoryEntries = repo.Commits.QueryBy(newPath1, commitFilter).ToList();
                 var changedBlobs = fileHistoryEntries.Blobs().Distinct().ToList();
 
                 Assert.Equal(4, fileHistoryEntries.Count());

LibGit2Sharp/project.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "LibGit2Sharp.NativeBinaries": "[1.0.160]",
+    "LibGit2Sharp.NativeBinaries": "[1.0.164]",
     "Nerdbank.GitVersioning": "1.5.51"
   },
   "frameworks": {

appveyor.yml

@@ -5,6 +5,7 @@ os: Visual Studio 2015
 branches:
   only:
   - master
+  - /^maint.*/
   - portable
 
 skip_tags: true
@@ -18,7 +19,7 @@ environment:
     secure: nuzUT+HecXGIi3KaPd/1hgFEZJan/j6+oNbPV75JKjk=
   coverity_email:
     secure: eGVilNg1Yuq+Xj+SW8r3WCtjnzhoDV0sNJkma4NRq7A=
-  version : 0.23.0
+  version : 0.24.0
   matrix:
   - xunit_runner: xunit.console.x86.exe
     Arch: 32