Merge branch 'dotdevelop' into dotdevelop1

Author: lytico

LibGit2Sharp/AuthenticationException.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Runtime.Serialization;
+using LibGit2Sharp.Core;
+
+namespace LibGit2Sharp
+{
+    /// <summary>
+    /// The exception that is thrown when an operation which requires an
+    /// authentication fails.
+    /// </summary>
+    [Serializable]
+    public class AuthenticationException : LibGit2SharpException
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LibGit2Sharp.AuthenticationException"/> class.
+        /// </summary>
+        public AuthenticationException()
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LibGit2Sharp.AuthenticationException"/> class with a specified error message.
+        /// </summary>
+        /// <param name="message">A message that describes the error.</param>
+        public AuthenticationException(string message)
+            : base(message)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LibGit2Sharp.AuthenticationException"/> class with a specified error message and a reference to the inner exception that is the cause of this exception.
+        /// </summary>
+        /// <param name="message">The error message that explains the reason for the exception.</param>
+        /// <param name="innerException">The exception that is the cause of the current exception. If the <paramref name="innerException"/> parameter is not a null reference, the current exception is raised in a catch block that handles the inner exception.</param>
+        public AuthenticationException(string message, Exception innerException)
+            : base(message, innerException)
+        {
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="LibGit2Sharp.AuthenticationException"/> class with a serialized data.
+        /// </summary>
+        /// <param name="info">The <see cref="SerializationInfo"/> that holds the serialized object data about the exception being thrown.</param>
+        /// <param name="context">The <see cref="StreamingContext"/> that contains contextual information about the source or destination.</param>
+        protected AuthenticationException(SerializationInfo info, StreamingContext context)
+            : base(info, context)
+        {
+        }
+
+        internal AuthenticationException(string message, GitErrorCode code, GitErrorCategory category)
+            : base(message, code, category)
+        {
+        }
+    }
+}

LibGit2Sharp/BlameHunkCollection.cs

@@ -28,11 +28,21 @@ internal unsafe BlameHunkCollection(Repository repo, RepositoryHandle repoHandle
             var rawopts = new git_blame_options
             {
                 version = 1,
+                FindOptions = new GitDiffFindOptions {
+                    Version = 1,
+                },
                 flags = options.Strategy.ToGitBlameOptionFlags(),
                 min_line = new UIntPtr((uint)options.MinLine),
                 max_line = new UIntPtr((uint)options.MaxLine),
             };
 
+            if (options.FindNoRenames)
+                rawopts.FindOptions.Flags = GitDiffFindFlags.GIT_DIFF_FIND_NO_RENAMES;
+            else if (options.FindExactRenames)
+                rawopts.FindOptions.Flags = GitDiffFindFlags.GIT_DIFF_FIND_EXACT_MATCH_ONLY;
+            else
+                rawopts.FindOptions.Flags = GitDiffFindFlags.GIT_DIFF_FIND_RENAMES;
+
             if (options.StartingAt != null)
             {
                 fixed (byte* p = rawopts.newest_commit.Id)

LibGit2Sharp/BlameOptions.cs

@@ -6,7 +6,7 @@
     public enum BlameStrategy
     {
         /// <summary>
-        /// Track renames of the file, but no block movement.
+        /// Track renames of the file using diff rename detection, but no block movement.
         /// </summary>
         Default,
 
@@ -58,5 +58,15 @@ public sealed class BlameOptions
         /// If this is set to 0, blame ends with the last line in the file.
         /// </summary>
         public int MaxLine { get; set; }
+
+        /// <summary>
+        /// Disables rename heuristics, only matching renames on unmodified files.
+        /// </summary>
+        public bool FindExactRenames { get; set; }
+
+        /// <summary>
+        /// Fully disable rename checking.
+        /// </summary>
+        public bool FindNoRenames { get; set; }
     }
 }

LibGit2Sharp/Core/Ensure.cs

@@ -127,14 +127,15 @@ private static readonly Dictionary<GitErrorCode, Func<string, GitErrorCode, GitE
                     { GitErrorCode.Conflict, (m, r, c) => new CheckoutConflictException(m, r, c) },
                     { GitErrorCode.LockedFile, (m, r, c) => new LockedFileException(m, r, c) },
                     { GitErrorCode.NotFound, (m, r, c) => new NotFoundException(m, r, c) },
-                    { GitErrorCode.Peel, (m, r, c) => new PeelException(m, r, c)  },
+                    { GitErrorCode.Peel, (m, r, c) => new PeelException(m, r, c) },
+                    { GitErrorCode.Auth, (m, r, c) => new AuthenticationException(m, r, c) },
                 };
 
         private static unsafe void HandleError(int result)
         {
             string errorMessage;
             GitErrorCategory errorCategory = GitErrorCategory.Unknown;
-            GitError* error = NativeMethods.git_error_last();
+            GitError* error = NativeMethods.giterr_last();
 
             if (error == null)
             {

LibGit2Sharp/Core/GitBlame.cs

@@ -44,6 +44,7 @@ internal enum GitBlameOptionFlags
     internal class git_blame_options
     {
         public uint version = 1;
+        public GitDiffFindOptions FindOptions;
         public GitBlameOptionFlags flags;
 
         public UInt16 min_match_characters;

LibGit2Sharp/Core/GitBuf.cs

@@ -12,7 +12,7 @@ internal class GitBuf : IDisposable
 
         public void Dispose()
         {
-            Proxy.git_buf_dispose(this);
+            Proxy.git_buf_free(this);
         }
     }
 }

LibGit2Sharp/Core/GitDiff.cs

@@ -350,6 +350,9 @@ enum GitDiffFindFlags
         // turn on all finding features
         GIT_DIFF_FIND_ALL = (0x0ff),
 
+        // does no work trying to find renames
+        GIT_DIFF_FIND_NO_RENAMES = (1 << 8),
+
         // measure similarity ignoring leading whitespace (default)
         GIT_DIFF_FIND_IGNORE_LEADING_WHITESPACE = 0,
         // measure similarity ignoring all whitespace
@@ -367,9 +370,9 @@ enum GitDiffFindFlags
     }
 
     [StructLayout(LayoutKind.Sequential)]
-    internal class GitDiffFindOptions
+    internal struct GitDiffFindOptions
     {
-        public uint Version = 1;
+        public uint Version;
         public GitDiffFindFlags Flags;
         public UInt16 RenameThreshold;
         public UInt16 RenameFromRewriteThreshold;

LibGit2Sharp/Core/NativeMethods.cs

@@ -216,15 +216,15 @@ private sealed class NativeShutdownObject : CriticalFinalizerObject
         }
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern unsafe GitError* git_error_last();
+        internal static extern unsafe GitError* giterr_last();
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern void git_error_set_str(
+        internal static extern void giterr_set_str(
             GitErrorCategory error_class,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string errorString);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern void git_error_set_oom();
+        internal static extern void giterr_set_oom();
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe UInt32 git_blame_get_hunk_count(git_blame* blame);
@@ -406,7 +406,7 @@ internal static extern unsafe int git_branch_upstream_name(
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string referenceName);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
-        internal static extern void git_buf_dispose(GitBuf buf);
+        internal static extern void git_buf_free(GitBuf buf);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe int git_checkout_tree(
@@ -646,6 +646,24 @@ internal static extern int git_cred_userpass_plaintext_new(
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string username,
             [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string password);
 
+        [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int git_cred_ssh_key_new(
+            out IntPtr cred,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string username,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string publickey,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string privatekey,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string passphrase);
+
+        [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int git_cred_ssh_key_from_agent(
+            out IntPtr cred,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string username);
+
+        [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
+        internal static extern int git_cred_username_new(
+            out IntPtr cred,
+            [MarshalAs(UnmanagedType.CustomMarshaler, MarshalCookie = UniqueId.UniqueIdentifier, MarshalTypeRef = typeof(StrictUtf8Marshaler))] string username);
+
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern void git_cred_free(IntPtr cred);
 
@@ -752,7 +770,12 @@ internal static extern unsafe int git_diff_foreach(
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe int git_diff_find_similar(
             git_diff* diff,
-            GitDiffFindOptions options);
+            IntPtr options);
+
+        [DllImport(libgit2)]
+        internal static extern unsafe int git_diff_find_similar(
+            git_diff* diff,
+            ref GitDiffFindOptions options);
 
         [DllImport(libgit2, CallingConvention = CallingConvention.Cdecl)]
         internal static extern unsafe UIntPtr git_diff_num_deltas(git_diff* diff);