Merge pull request #1237 from libgit2/cmn/lg2-update

Update to libgit2 6aa06b6

Author: Edward Thomson

LibGit2Sharp.Tests/MergeFixture.cs

@@ -295,6 +295,24 @@ public void ConflictingMergeReposBinary()
             }
         }
 
+        [Fact]
+        public void CanFailOnFirstMergeConflict()
+        {
+            string path = SandboxMergeTestRepo();
+            using (var repo = new Repository(path))
+            {
+                var mergeResult = repo.Merge("conflicts", Constants.Signature, new MergeOptions() { FailOnConflict = true, });
+                Assert.Equal(MergeStatus.Conflicts, mergeResult.Status);
+
+                var master = repo.Branches["master"];
+                var branch = repo.Branches["conflicts"];
+                var mergeTreeResult = repo.ObjectDatabase.MergeCommits(master.Tip, branch.Tip, new MergeTreeOptions() { FailOnConflict = true });
+                Assert.Equal(MergeTreeStatus.Conflicts, mergeTreeResult.Status);
+                Assert.Empty(mergeTreeResult.Conflicts);
+            }
+
+        }
+
         [Theory]
         [InlineData(true, FastForwardStrategy.Default, fastForwardBranchInitialId, MergeStatus.FastForward)]
         [InlineData(true, FastForwardStrategy.FastForwardOnly, fastForwardBranchInitialId, MergeStatus.FastForward)]

LibGit2Sharp/Core/GitDiff.cs

@@ -197,6 +197,12 @@ internal delegate int diff_notify_cb(
         IntPtr matched_pathspec,
         IntPtr payload);
 
+    internal delegate int diff_progress_cb(
+        IntPtr diff_so_far,
+        IntPtr old_path,
+        IntPtr new_path,
+        IntPtr payload);
+
     [StructLayout(LayoutKind.Sequential)]
     internal class GitDiffOptions : IDisposable
     {
@@ -208,7 +214,8 @@ internal class GitDiffOptions : IDisposable
         public SubmoduleIgnore IgnoreSubmodules;
         public GitStrArrayManaged PathSpec;
         public diff_notify_cb NotifyCallback;
-        public IntPtr NotifyPayload;
+        public diff_progress_cb ProgressCallback;
+        public IntPtr Payload;
 
         /* options controlling how to diff text is generated */
 

LibGit2Sharp/Core/GitMergeOpts.cs

@@ -8,7 +8,7 @@ internal struct GitMergeOpts
     {
         public uint Version;
 
-        public GitMergeTreeFlags MergeTreeFlags;
+        public GitMergeFlag MergeTreeFlags;
 
         /// <summary>
         /// Similarity to consider a file renamed.
@@ -27,6 +27,14 @@ internal struct GitMergeOpts
         /// </summary>
         public IntPtr SimilarityMetric;
 
+        /// <summary>
+        /// Maximum number of times to merge common ancestors to build a
+        /// virtual merge base when faced with criss-cross merges.  When this
+        /// limit is reached, the next ancestor will simply be used instead of
+        /// attempting to merge it.  The default is unlimited.
+        /// </summary>
+        public uint RecursionLimit;
+
         /// <summary>
         /// Flags for automerging content.
         /// </summary>
@@ -35,7 +43,7 @@ internal struct GitMergeOpts
         /// <summary>
         /// File merging flags.
         /// </summary>
-        public GitMergeFileFlags FileFlags;
+        public GitMergeFileFlag FileFlags;
     }
 
     /// <summary>
@@ -98,30 +106,43 @@ internal enum GitMergePreference
     }
 
     [Flags]
-    internal enum GitMergeTreeFlags
+    internal enum GitMergeFlag
     {
         /// <summary>
         /// No options.
         /// </summary>
-        GIT_MERGE_TREE_NORMAL = 0,
+        GIT_MERGE_NORMAL = 0,
 
         /// <summary>
         /// Detect renames that occur between the common ancestor and the "ours"
      	/// side or the common ancestor and the "theirs" side.  This will enable
  	    /// the ability to merge between a modified and renamed file.
         /// </summary>
-        GIT_MERGE_TREE_FIND_RENAMES = (1 << 0),
+        GIT_MERGE_FIND_RENAMES = (1 << 0),
 
         /// <summary>
         /// If a conflict occurs, exit immediately instead of attempting to
         /// continue resolving conflicts.  The merge operation will fail with
         /// GIT_EMERGECONFLICT and no index will be returned.
         ///</summary>
-        GIT_MERGE_TREE_FAIL_ON_CONFLICT = (1 << 1),
+        GIT_MERGE_FAIL_ON_CONFLICT = (1 << 1),
+
+        /// <summary>
+        /// Do not write the REUC extension on the generated index
+        /// </summary>
+        GIT_MERGE_SKIP_REUC = (1 << 2),
+
+        /// <summary>
+        /// If the commits being merged have multiple merge bases, do not build
+        /// a recursive merge base (by merging the multiple merge bases),
+        /// instead simply use the first base.  This flag provides a similar
+        /// merge base to `git-merge-resolve`.
+        /// </summary>
+        GIT_MERGE_NO_RECURSIVE = (1 << 3),
     }
 
     [Flags]
-    internal enum GitMergeFileFlags
+    internal enum GitMergeFileFlag
     {
         /// <summary>
         /// Defaults

LibGit2Sharp/Core/Proxy.cs

@@ -1101,11 +1101,19 @@ public static void git_index_clear(Index index)
 
         #region git_merge_
 
-        public static IndexSafeHandle git_merge_commits(RepositorySafeHandle repo, GitObjectSafeHandle ourCommit, GitObjectSafeHandle theirCommit, GitMergeOpts opts)
+        public static IndexSafeHandle git_merge_commits(RepositorySafeHandle repo, GitObjectSafeHandle ourCommit, GitObjectSafeHandle theirCommit, GitMergeOpts opts, out bool earlyStop)
         {
             IndexSafeHandle index;
             int res = NativeMethods.git_merge_commits(out index, repo, ourCommit, theirCommit, ref opts);
-            Ensure.ZeroResult(res);
+            if (res == (int)GitErrorCode.MergeConflict)
+            {
+                earlyStop = true;
+            }
+            else
+            {
+                earlyStop = false;
+                Ensure.ZeroResult(res);
+            }
 
             return index;
         }
@@ -1189,7 +1197,7 @@ public static ObjectId git_annotated_commit_id(GitAnnotatedCommitHandle mergeHea
             return NativeMethods.git_annotated_commit_id(mergeHead).MarshalAsObjectId();
         }
 
-        public static void git_merge(RepositorySafeHandle repo, GitAnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions)
+        public static void git_merge(RepositorySafeHandle repo, GitAnnotatedCommitHandle[] heads, GitMergeOpts mergeOptions, GitCheckoutOpts checkoutOptions, out bool earlyStop)
         {
             IntPtr[] their_heads = heads.Select(head => head.DangerousGetHandle()).ToArray();
 
@@ -1199,7 +1207,15 @@ public static void git_merge(RepositorySafeHandle repo, GitAnnotatedCommitHandle
                                               ref mergeOptions,
                                               ref checkoutOptions);
 
-            Ensure.ZeroResult(res);
+            if (res == (int)GitErrorCode.MergeConflict)
+            {
+                earlyStop = true;
+            }
+            else
+            {
+                earlyStop = false;
+                Ensure.ZeroResult(res);
+            }
         }
 
         public static void git_merge_analysis(

LibGit2Sharp/CurrentOperation.cs

@@ -21,39 +21,49 @@ public enum CurrentOperation
         /// </summary>
         Revert = 2,
 
+        /// <summary>
+        /// A sequencer revert is in progress.
+        /// </summary>
+        RevertSequence = 3,
+
         /// <summary>
         /// A cherry-pick is in progress.
         /// </summary>
-        CherryPick = 3,
+        CherryPick = 4,
+
+        /// <summary>
+        /// A sequencer cherry-pick is in progress.
+        /// </summary>
+        CherryPickSequence = 5,
 
         /// <summary>
         /// A bisect is in progress.
         /// </summary>
-        Bisect = 4,
+        Bisect = 6,
 
         /// <summary>
         /// A rebase is in progress.
         /// </summary>
-        Rebase = 5,
+        Rebase = 7,
 
         /// <summary>
         /// A rebase --interactive is in progress.
         /// </summary>
-        RebaseInteractive = 6,
+        RebaseInteractive = 8,
 
         /// <summary>
         /// A rebase --merge is in progress.
         /// </summary>
-        RebaseMerge = 7,
+        RebaseMerge = 9,
 
         /// <summary>
         /// A mailbox application (am) is in progress.
         /// </summary>
-        ApplyMailbox = 8,
+        ApplyMailbox = 10,
 
         /// <summary>
         /// A mailbox application (am) or rebase is in progress.
         /// </summary>
-        ApplyMailboxOrRebase = 9,
+        ApplyMailboxOrRebase = 11,
     }
 }

LibGit2Sharp/LibGit2Sharp.csproj

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props')" />
+  <Import Project="..\packages\LibGit2Sharp.NativeBinaries.1.0.119\build\LibGit2Sharp.NativeBinaries.props" Condition="Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.119\build\LibGit2Sharp.NativeBinaries.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -405,7 +405,7 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.106\build\LibGit2Sharp.NativeBinaries.props'))" />
+    <Error Condition="!Exists('..\packages\LibGit2Sharp.NativeBinaries.1.0.119\build\LibGit2Sharp.NativeBinaries.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\LibGit2Sharp.NativeBinaries.1.0.119\build\LibGit2Sharp.NativeBinaries.props'))" />
   </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.

LibGit2Sharp/MergeOptionsBase.cs

@@ -22,6 +22,19 @@ protected MergeOptionsBase()
         /// </summary>
         public bool FindRenames { get; set; }
 
+        /// <summary>
+        /// If set, do not create or return conflict entries, but stop and return
+        /// an error result after finding the first conflict.
+        /// </summary>
+        public bool FailOnConflict { get; set; }
+
+        /// <summary>
+        /// Do not write the Resolve Undo Cache extension on the generated index. This can
+        /// be useful when no merge resolution will be presented to the user (e.g. a server-side
+        /// merge attempt).
+        /// </summary>
+        public bool SkipReuc { get; set; }
+
         /// <summary>
         /// Similarity to consider a file renamed.
         /// </summary>

LibGit2Sharp/ObjectDatabase.cs

@@ -522,7 +522,13 @@ public virtual bool CanMergeWithoutConflict(Commit one, Commit another)
             Ensure.ArgumentNotNull(one, "one");
             Ensure.ArgumentNotNull(another, "another");
 
-            var result = repo.ObjectDatabase.MergeCommits(one, another, null);
+            var opts = new MergeTreeOptions()
+            {
+                SkipReuc = true,
+                FailOnConflict = true,
+            };
+
+            var result = repo.ObjectDatabase.MergeCommits(one, another, opts);
             return (result.Status == MergeTreeStatus.Succeeded);
         }
 
@@ -603,22 +609,41 @@ public virtual MergeTreeResult MergeCommits(Commit ours, Commit theirs, MergeTre
 
             options = options ?? new MergeTreeOptions();
 
+            // We throw away the index after looking at the conflicts, so we'll never need the REUC
+            // entries to be there
+            GitMergeFlag mergeFlags = GitMergeFlag.GIT_MERGE_NORMAL | GitMergeFlag.GIT_MERGE_SKIP_REUC;
+            if (options.FindRenames)
+            {
+                mergeFlags |= GitMergeFlag.GIT_MERGE_FIND_RENAMES;
+            }
+            if (options.FailOnConflict)
+            {
+                mergeFlags |= GitMergeFlag.GIT_MERGE_FAIL_ON_CONFLICT;
+            }
+
+
             var mergeOptions = new GitMergeOpts
             {
                 Version = 1,
                 MergeFileFavorFlags = options.MergeFileFavor,
-                MergeTreeFlags = options.FindRenames ? GitMergeTreeFlags.GIT_MERGE_TREE_FIND_RENAMES
-                                                     : GitMergeTreeFlags.GIT_MERGE_TREE_NORMAL,
+                MergeTreeFlags = mergeFlags,
                 RenameThreshold = (uint)options.RenameThreshold,
                 TargetLimit = (uint)options.TargetLimit,
             };
 
+            bool earlyStop;
             using (var oneHandle = Proxy.git_object_lookup(repo.Handle, ours.Id, GitObjectType.Commit))
             using (var twoHandle = Proxy.git_object_lookup(repo.Handle, theirs.Id, GitObjectType.Commit))
-            using (var indexHandle = Proxy.git_merge_commits(repo.Handle, oneHandle, twoHandle, mergeOptions))
+            using (var indexHandle = Proxy.git_merge_commits(repo.Handle, oneHandle, twoHandle, mergeOptions, out earlyStop))
             {
                 MergeTreeResult mergeResult;
 
+                // Stopped due to FailOnConflict so there's no index or conflict list
+                if (earlyStop)
+                {
+                    return new MergeTreeResult(new Conflict[] { });
+                }
+
                 if (Proxy.git_index_has_conflicts(indexHandle))
                 {
                     List<Conflict> conflicts = new List<Conflict>();

LibGit2Sharp/Repository.cs

@@ -1329,8 +1329,8 @@ public RevertResult Revert(Commit commit, Signature reverter, RevertOptions opti
                 {
                     Version = 1,
                     MergeFileFavorFlags = options.MergeFileFavor,
-                    MergeTreeFlags = options.FindRenames ? GitMergeTreeFlags.GIT_MERGE_TREE_FIND_RENAMES :
-                                                           GitMergeTreeFlags.GIT_MERGE_TREE_NORMAL,
+                    MergeTreeFlags = options.FindRenames ? GitMergeFlag.GIT_MERGE_FIND_RENAMES :
+                                                           GitMergeFlag.GIT_MERGE_NORMAL,
                     RenameThreshold = (uint)options.RenameThreshold,
                     TargetLimit = (uint)options.TargetLimit,
                 };
@@ -1413,8 +1413,8 @@ public CherryPickResult CherryPick(Commit commit, Signature committer, CherryPic
                 {
                     Version = 1,
                     MergeFileFavorFlags = options.MergeFileFavor,
-                    MergeTreeFlags = options.FindRenames ? GitMergeTreeFlags.GIT_MERGE_TREE_FIND_RENAMES :
-                                                           GitMergeTreeFlags.GIT_MERGE_TREE_NORMAL,
+                    MergeTreeFlags = options.FindRenames ? GitMergeFlag.GIT_MERGE_FIND_RENAMES :
+                                                           GitMergeFlag.GIT_MERGE_NORMAL,
                     RenameThreshold = (uint)options.RenameThreshold,
                     TargetLimit = (uint)options.TargetLimit,
                 };
@@ -1553,21 +1553,39 @@ private MergeResult Merge(GitAnnotatedCommitHandle[] annotatedCommits, Signature
         private MergeResult NormalMerge(GitAnnotatedCommitHandle[] annotatedCommits, Signature merger, MergeOptions options)
         {
             MergeResult mergeResult;
+            GitMergeFlag treeFlags = options.FindRenames ? GitMergeFlag.GIT_MERGE_FIND_RENAMES
+                                                              : GitMergeFlag.GIT_MERGE_NORMAL;
+
+            if (options.FailOnConflict)
+            {
+                treeFlags |= GitMergeFlag.GIT_MERGE_FAIL_ON_CONFLICT;
+            }
+
+            if (options.SkipReuc)
+            {
+                treeFlags |= GitMergeFlag.GIT_MERGE_SKIP_REUC;
+            }
+
             var mergeOptions = new GitMergeOpts
             {
                 Version = 1,
                 MergeFileFavorFlags = options.MergeFileFavor,
-                MergeTreeFlags = options.FindRenames ? GitMergeTreeFlags.GIT_MERGE_TREE_FIND_RENAMES
-                                                     : GitMergeTreeFlags.GIT_MERGE_TREE_NORMAL,
+                MergeTreeFlags = treeFlags,
                 RenameThreshold = (uint)options.RenameThreshold,
                 TargetLimit = (uint)options.TargetLimit,
             };
 
+            bool earlyStop;
             using (GitCheckoutOptsWrapper checkoutOptionsWrapper = new GitCheckoutOptsWrapper(options))
             {
                 var checkoutOpts = checkoutOptionsWrapper.Options;
 
-                Proxy.git_merge(Handle, annotatedCommits, mergeOptions, checkoutOpts);
+                Proxy.git_merge(Handle, annotatedCommits, mergeOptions, checkoutOpts, out earlyStop);
+            }
+
+            if (earlyStop)
+            {
+                return new MergeResult(MergeStatus.Conflicts);
             }
 
             if (Index.IsFullyMerged)