From 486ed7fbb56e0984602c01ec7dc2a93ac4a7cd00 Mon Sep 17 00:00:00 2001 From: Tommy Williams Date: Sun, 2 Feb 2020 19:11:39 -0700 Subject: [PATCH] Fix misspelling of contributor --- ...buterTask.cs => RewriteContributorTask.cs} | 18 +++++----- GitRewrite/CommandLineOptions.cs | 33 +++++++++---------- GitRewrite/GitObjects/Commit.cs | 18 +++++----- GitRewrite/Program.cs | 12 +++---- 4 files changed, 40 insertions(+), 41 deletions(-) rename GitRewrite/CleanupTask/{RewriteContributerTask.cs => RewriteContributorTask.cs} (55%) diff --git a/GitRewrite/CleanupTask/RewriteContributerTask.cs b/GitRewrite/CleanupTask/RewriteContributorTask.cs similarity index 55% rename from GitRewrite/CleanupTask/RewriteContributerTask.cs rename to GitRewrite/CleanupTask/RewriteContributorTask.cs index d590ba9..cf7d0dd 100644 --- a/GitRewrite/CleanupTask/RewriteContributerTask.cs +++ b/GitRewrite/CleanupTask/RewriteContributorTask.cs @@ -6,21 +6,21 @@ namespace GitRewrite.CleanupTask { - class RewriteContributerTask : CleanupTaskBase + class RewriteContributorTask : CleanupTaskBase { - private readonly Dictionary _contributerMappings = new Dictionary(); + private readonly Dictionary _contributorMappings = new Dictionary(); - public RewriteContributerTask(string repositoryPath, string contributerMappingFile) : base(repositoryPath) + public RewriteContributorTask(string repositoryPath, string contributorMappingFile) : base(repositoryPath) { - var contributerMappingLines = File.ReadAllLines(contributerMappingFile); + var contributorMappingLines = File.ReadAllLines(contributorMappingFile); - foreach (var line in contributerMappingLines) + foreach (var line in contributorMappingLines) { - var contributerMapping = line.Split('=').Select(x => x.Trim()).ToList(); - if (contributerMapping.Count != 2) + var contributorMapping = line.Split('=').Select(x => x.Trim()).ToList(); + if (contributorMapping.Count != 2) throw new ArgumentException("Mapping is not formatted properly."); - _contributerMappings.Add(contributerMapping[0], contributerMapping[1]); + _contributorMappings.Add(contributorMapping[0], contributorMapping[1]); } } @@ -29,7 +29,7 @@ public RewriteContributerTask(string repositoryPath, string contributerMappingFi protected override void SynchronousStep(Commit commit) { var rewrittenParentHashes = GetRewrittenCommitHashes(commit.Parents); - var changedCommit = commit.WithChangedContributer(_contributerMappings, rewrittenParentHashes); + var changedCommit = commit.WithChangedContributor(_contributorMappings, rewrittenParentHashes); var resultBytes = GitObjectFactory.GetBytesWithHeader(GitObjectType.Commit, changedCommit); var newCommitHash = new ObjectHash(Hash.Create(resultBytes)); diff --git a/GitRewrite/CommandLineOptions.cs b/GitRewrite/CommandLineOptions.cs index 5110c30..3b553f4 100644 --- a/GitRewrite/CommandLineOptions.cs +++ b/GitRewrite/CommandLineOptions.cs @@ -10,7 +10,7 @@ private CommandLineOptions() { } - public bool ListContributerNames { get; private set; } + public bool ListContributorNames { get; private set; } public bool ShowHelp { get; private set; } @@ -24,7 +24,7 @@ private CommandLineOptions() public bool RemoveEmptyCommits { get; private set; } - public string ContributerMappingFile { get; private set; } + public string ContributorMappingFile { get; private set; } public bool ProtectRefs { get; private set; } @@ -33,7 +33,7 @@ internal static bool TryParse(string[] args, out CommandLineOptions options) options = new CommandLineOptions(); var deleteFilesStarted = false; var deleteFoldersStarted = false; - var rewriteContributersFileExpected = false; + var rewriteContributorsFileExpected = false; foreach (var arg in args) if (deleteFilesStarted) @@ -46,10 +46,10 @@ internal static bool TryParse(string[] args, out CommandLineOptions options) options.FoldersToDelete.AddRange(GetFiles(arg)); deleteFoldersStarted = false; } - else if (rewriteContributersFileExpected) + else if (rewriteContributorsFileExpected) { - options.ContributerMappingFile = arg; - rewriteContributersFileExpected = false; + options.ContributorMappingFile = arg; + rewriteContributorsFileExpected = false; } else { @@ -73,11 +73,11 @@ internal static bool TryParse(string[] args, out CommandLineOptions options) case "--help": options.ShowHelp = true; break; - case "--contributer-names": - options.ListContributerNames = true; + case "--contributor-names": + options.ListContributorNames = true; break; - case "--rewrite-contributers": - rewriteContributersFileExpected = true; + case "--rewrite-contributors": + rewriteContributorsFileExpected = true; break; case "--protect-refs": options.ProtectRefs = true; @@ -99,8 +99,8 @@ internal static bool TryParse(string[] args, out CommandLineOptions options) optionsSet += options.FixTrees ? 1 : 0; optionsSet += options.FilesToDelete.Any() || options.FoldersToDelete.Any() ? 1 : 0; optionsSet += options.RemoveEmptyCommits ? 1 : 0; - optionsSet += options.ListContributerNames ? 1 : 0; - optionsSet += !string.IsNullOrWhiteSpace(options.ContributerMappingFile) ? 1 : 0; + optionsSet += options.ListContributorNames ? 1 : 0; + optionsSet += !string.IsNullOrWhiteSpace(options.ContributorMappingFile) ? 1 : 0; if (optionsSet > 1) { @@ -150,15 +150,14 @@ public static void PrintHelp() Console.WriteLine(" Can be combined with deleting files."); Console.WriteLine(); - - Console.WriteLine("--rewrite-contributers [contributers.txt]"); + Console.WriteLine("--rewrite-contributors [contributors.txt]"); Console.WriteLine(" Rewrite author and committer information."); - Console.WriteLine(" contributers.txt is the mapping file for the names that should be replaced. Each line represents one contributer to replace."); + Console.WriteLine(" contributors.txt is the mapping file for the names that should be replaced. Each line represents one contributor to replace."); Console.WriteLine(" Format is "); Console.WriteLine(" Test User = New Test User "); Console.WriteLine(); - Console.WriteLine("--contributer-names"); + Console.WriteLine("--contributor-names"); Console.WriteLine(" Writes all authors and committers to stdout"); Console.WriteLine(); @@ -194,4 +193,4 @@ private static List GetFiles(string fileString) return result; } } -} \ No newline at end of file +} diff --git a/GitRewrite/GitObjects/Commit.cs b/GitRewrite/GitObjects/Commit.cs index 35835e0..e1b96f3 100644 --- a/GitRewrite/GitObjects/Commit.cs +++ b/GitRewrite/GitObjects/Commit.cs @@ -61,20 +61,20 @@ public Commit(ObjectHash hash, byte[] bytes) : base(hash, GitObjectType.Commit) private static readonly byte[] PgpSignatureEnd = "-----END PGP SIGNATURE-----".Select(c => (byte) c).ToArray(); - public ReadOnlySpan GetCommitterBytes() => GetContributerName(_committerLine.Slice(10)); + public ReadOnlySpan GetCommitterBytes() => GetContributorName(_committerLine.Slice(10)); public string GetCommitterName() => Encoding.UTF8.GetString(GetCommitterBytes()); - public ReadOnlySpan GetAuthorBytes() => GetContributerName(_authorLine.Slice(7)); + public ReadOnlySpan GetAuthorBytes() => GetContributorName(_authorLine.Slice(7)); public string GetAuthorName() => Encoding.UTF8.GetString(GetAuthorBytes()); - private ReadOnlySpan GetContributerName(in ReadOnlyMemory contributerWithTime) + private ReadOnlySpan GetContributorName(in ReadOnlyMemory contributorWithTime) { - var span = contributerWithTime.Span; + var span = contributorWithTime.Span; int spaces = 0; int index = 0; - for (int i = contributerWithTime.Length - 1; i >= 0; i--) + for (int i = contributorWithTime.Length - 1; i >= 0; i--) { if (span[i] == ' ' && ++spaces == 2) { @@ -83,7 +83,7 @@ private ReadOnlySpan GetContributerName(in ReadOnlyMemory contribute } } - return contributerWithTime.Span.Slice(0, index); + return contributorWithTime.Span.Slice(0, index); } public ObjectHash TreeHash => new ObjectHash(_treeHash.Span.Slice(5)); @@ -145,17 +145,17 @@ public static byte[] GetSerializedCommitWithChangedTreeAndParents(Commit commit, return resultBuffer; } - public byte[] WithChangedContributer(Dictionary contributerMapping, IEnumerable parents) + public byte[] WithChangedContributor(Dictionary contributorMapping, IEnumerable parents) { const int firstLineLength = 46; const int parentLineLength = 7 + 40 + 1; var author = GetAuthorName(); var committer = GetCommitterName(); - if (!contributerMapping.TryGetValue(author, out var newAuthor)) + if (!contributorMapping.TryGetValue(author, out var newAuthor)) newAuthor = author; - if (!contributerMapping.TryGetValue(this.GetCommitterName(), out var newCommitter)) + if (!contributorMapping.TryGetValue(this.GetCommitterName(), out var newCommitter)) newCommitter = committer; var authorLine = Encoding.UTF8.GetBytes(Encoding.UTF8.GetString(this._authorLine.Span).Replace(author, newAuthor)); diff --git a/GitRewrite/Program.cs b/GitRewrite/Program.cs index b8cf526..490c883 100644 --- a/GitRewrite/Program.cs +++ b/GitRewrite/Program.cs @@ -40,19 +40,19 @@ static void Main(string[] args) using (var removeEmptyCommitsTask = new RemoveEmptyCommitsTask(options.RepositoryPath)) removeEmptyCommitsTask.Run(); } - else if (!string.IsNullOrWhiteSpace(options.ContributerMappingFile)) + else if (!string.IsNullOrWhiteSpace(options.ContributorMappingFile)) { - using (var rewriteContributerTask = new RewriteContributerTask(options.RepositoryPath, options.ContributerMappingFile)) - rewriteContributerTask.Run(); + using (var rewriteContributorTask = new RewriteContributorTask(options.RepositoryPath, options.ContributorMappingFile)) + rewriteContributorTask.Run(); } - else if (options.ListContributerNames) + else if (options.ListContributorNames) { - foreach (var contributer in CommitWalker.CommitsRandomOrder(options.RepositoryPath) + foreach (var contributor in CommitWalker.CommitsRandomOrder(options.RepositoryPath) .SelectMany(commit => new[] {commit.GetAuthorName(), commit.GetCommitterName()}) .Distinct() .AsParallel() .OrderBy(x => x)) - Console.WriteLine(contributer); + Console.WriteLine(contributor); } }