Merge pull request #17 from Techsola/merge_and_delete

Support changesets that merge from a branch and delete it simultaneously

Author: jnm2

src/TfvcMigrator/Program.cs

@@ -1,6 +1,7 @@
 using System.CommandLine;
 using System.CommandLine.NamingConventionBinder;
 using System.Globalization;
+using System.Linq;
 using System.Text;
 using LibGit2Sharp;
 using Microsoft.TeamFoundation.SourceControl.WebApi;
@@ -526,7 +527,8 @@ private static async IAsyncEnumerable<MappingState> EnumerateMappingStatesAsync(
                     keySelector: mappingByBranch => mappingByBranch.Branch,
                     dependenciesSelector: mappingByBranch => additionalParents
                         .Where(b => b.Branch == mappingByBranch.Branch)
-                        .Select(b => b.ParentBranch))
+                        .Select(b => b.ParentBranch)
+                        .Where(branchMappings.ContainsKey)) // If the parent branch is also being deleted in the same commit, it doesn't affect the relative order
                 .ToImmutableArray();
 
             yield return new MappingState(

src/TfvcMigrator/TopologyAnalyzer.cs

@@ -62,18 +62,6 @@ public IEnumerable<TopologicalOperation> GetTopologicalOperations(IReadOnlyList<
             }
         }
 
-        foreach (var change in changesetChanges)
-        {
-            if (change.ChangeType.HasFlag(VersionControlChangeType.Delete) && currentBranchPaths.Remove(change.Item.Path))
-            {
-                if (change.ChangeType != VersionControlChangeType.Delete)
-                    throw new NotImplementedException("Poorly-understood combination");
-
-                var deletedBranch = branchIdentifier.Delete(changeset, change.Item.Path);
-                yield return new DeleteOperation(changeset, deletedBranch);
-            }
-        }
-
         branchIdentifier.NoFurtherChangesUpTo(changeset - 1);
 
         var (branches, merges) = GetBranchAndMergeOperations(changesetChanges, branchIdentifier);
@@ -89,6 +77,18 @@ public IEnumerable<TopologicalOperation> GetTopologicalOperations(IReadOnlyList<
         {
             yield return operation;
         }
+
+        foreach (var change in changesetChanges)
+        {
+            if (change.ChangeType.HasFlag(VersionControlChangeType.Delete) && currentBranchPaths.Remove(change.Item.Path))
+            {
+                if (change.ChangeType != VersionControlChangeType.Delete)
+                    throw new NotImplementedException("Poorly-understood combination");
+
+                var deletedBranch = branchIdentifier.Delete(changeset, change.Item.Path);
+                yield return new DeleteOperation(changeset, deletedBranch);
+            }
+        }
     }
 
     private static (ImmutableArray<BranchOperation> Branches, ImmutableArray<MergeOperation> Merges)