Skip to content

Commit f49524a

Browse files
authored
Refactor date enforcement logic in TfsRevisionManagerTool
1 parent 1526321 commit f49524a

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

src/MigrationTools.Clients.TfsObjectModel/Tools/TfsRevisionManagerTool.cs

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,23 @@ public List<RevisionItem> GetRevisionsToMigrate(List<RevisionItem> sourceRevisio
7777
public void EnforceDatesMustBeIncreasing(List<RevisionItem> sortedRevisions)
7878
{
7979
Log.LogDebug("TfsRevisionManagerTool::EnforceDatesMustBeIncreasing");
80-
DateTime lastDateTime = DateTime.MinValue;
80+
DateTime lastChangedDateTime = DateTime.MinValue;
81+
DateTime lastCreatedDateTime = DateTime.MinValue;
8182
foreach (var revision in sortedRevisions)
8283
{
83-
if (revision.ChangedDate == lastDateTime || revision.OriginalChangedDate < lastDateTime)
84+
if (revision.ChangedDate == lastChangedDateTime || revision.OriginalChangedDate < lastChangedDateTime)
8485
{
85-
revision.ChangedDate = lastDateTime.AddSeconds(1);
86-
Log.LogDebug("TfsRevisionManagerTool::EnforceDatesMustBeIncreasing[{revision}]::Fix", revision.Number);
86+
revision.ChangedDate = lastChangedDateTime.AddSeconds(1);
87+
Log.LogDebug($"TfsRevisionManagerTool::EnforceDatesMustBeIncreasing[{revision.Number}]::Fix ChangedDate");
8788
}
88-
lastDateTime = revision.ChangedDate;
89+
lastChangedDateTime = revision.ChangedDate;
90+
91+
if (revision.CreatedDate == lastCreatedDateTime || revision.OriginalCreatedDate < lastCreatedDateTime)
92+
{
93+
revision.CreatedDate = lastCreatedDateTime.AddSeconds(1);
94+
Log.LogDebug($"TfsRevisionManagerTool::EnforceDatesMustBeIncreasing[{revision.Number}]::Fix CreatedDate");
95+
}
96+
lastCreatedDateTime = revision.CreatedDate;
8997
}
9098
}
9199

@@ -171,4 +179,4 @@ public void AttachSourceRevisionHistoryJsonToTarget(WorkItemData sourceWorkItem,
171179
});
172180
}
173181
}
174-
}
182+
}

0 commit comments

Comments
 (0)