code_review: PR #589

* do not using namespace `SourceGit.*` * should use branch instead of repository
sourcegit-scm · Oct 22, 2024 · 728d003 · 728d003
1 parent 1855b43
commit 728d003
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/Models/CommitTemplate.cs b/src/Models/CommitTemplate.cs
@@ -4,7 +4,6 @@
 using System.Text.RegularExpressions;
 
 using CommunityToolkit.Mvvm.ComponentModel;
-using SourceGit.ViewModels;
 
 namespace SourceGit.Models
 {
@@ -25,11 +24,11 @@ public string Content
             set => SetProperty(ref _content, value);
         }
 
-        public string Apply(Repository repo, List<Change> changes)
+        public string Apply(Branch branch, List<Change> changes)
         {
             var content = _content
                 .Replace("${files_num}", $"{changes.Count}")
-                .Replace("${branch_name}", repo.CurrentBranch.Name);
+                .Replace("${branch_name}", branch.Name);
 
             var matches = REG_COMMIT_TEMPLATE_FILES().Matches(content);
             if (matches.Count == 0)

diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -1157,7 +1157,7 @@ public ContextMenu CreateContextMenuForCommitMessages()
                     item.Icon = App.CreateMenuIcon("Icons.Code");
                     item.Click += (_, e) =>
                     {
-                        CommitMessage = template.Apply(_repo, _staged);
+                        CommitMessage = template.Apply(_repo.CurrentBranch, _staged);
                         e.Handled = true;
                     };
                     menu.Items.Add(item);