code_style: simplify code about conflicts

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/ViewModels/Conflict.cs

@@ -1,29 +1,8 @@
-using System;
+using System.IO;
 using System.Threading.Tasks;
 
 namespace SourceGit.ViewModels
 {
-    public class ConflictSourceBranch
-    {
-        public string Name { get; private set; }
-        public string Head { get; private set; }
-        public Models.Commit Revision { get; private set; }
-
-        public ConflictSourceBranch(string name, string head, Models.Commit revision)
-        {
-            Name = name;
-            Head = head;
-            Revision = revision;
-        }
-
-        public ConflictSourceBranch(Repository repo, Models.Branch branch)
-        {
-            Name = branch.Name;
-            Head = branch.Head;
-            Revision = new Commands.QuerySingleCommit(repo.FullPath, branch.Head).GetResult() ?? new Models.Commit() { SHA = branch.Head };
-        }
-    }
-
     public class Conflict
     {
         public string Marker
@@ -60,52 +39,28 @@ public bool CanMerge
             private set;
         } = false;
 
-        public string FilePath
-        {
-            get => _change.Path;
-        }
-
         public Conflict(Repository repo, WorkingCopy wc, Models.Change change)
         {
             _repo = repo;
             _wc = wc;
             _change = change;
 
-            var isSubmodule = repo.Submodules.Find(x => x.Path.Equals(change.Path, StringComparison.Ordinal)) != null;
-            if (!isSubmodule && (_change.ConflictReason is Models.ConflictReason.BothAdded or Models.ConflictReason.BothModified))
-            {
-                CanMerge = true;
+            CanMerge = _change.ConflictReason is Models.ConflictReason.BothAdded or Models.ConflictReason.BothModified;
+            if (CanMerge)
+                CanMerge = !Directory.Exists(Path.Combine(repo.FullPath, change.Path)); // Cannot merge directories (submodules)
+
+            if (CanMerge)
                 IsResolved = new Commands.IsConflictResolved(repo.FullPath, change).GetResult();
-            }
 
-            switch (wc.InProgressContext)
+            var head = new Commands.QuerySingleCommit(repo.FullPath, "HEAD").GetResult();
+            (Mine, Theirs) = wc.InProgressContext switch
             {
-                case CherryPickInProgress cherryPick:
-                    Theirs = cherryPick.Head;
-                    Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
-                    break;
-                case RebaseInProgress rebase:
-                    var b = repo.Branches.Find(x => x.IsLocal && x.Name == rebase.HeadName);
-                    if (b != null)
-                        Theirs = new ConflictSourceBranch(b.Name, b.Head, rebase.StoppedAt);
-                    else
-                        Theirs = new ConflictSourceBranch(rebase.HeadName, rebase.StoppedAt?.SHA ?? "----------", rebase.StoppedAt);
-
-                    Mine = rebase.Onto;
-                    break;
-                case RevertInProgress revert:
-                    Theirs = revert.Head;
-                    Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
-                    break;
-                case MergeInProgress merge:
-                    Theirs = merge.Source;
-                    Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
-                    break;
-                default:
-                    Theirs = "Stash or Patch";
-                    Mine = new ConflictSourceBranch(repo, repo.CurrentBranch);
-                    break;
-            }
+                CherryPickInProgress cherryPick => (head, cherryPick.Head),
+                RebaseInProgress rebase => (rebase.Onto, rebase.StoppedAt),
+                RevertInProgress revert => (head, revert.Head),
+                MergeInProgress merge => (head, merge.Source),
+                _ => (head, (object)"Stash or Patch"),
+            };
         }
 
         public async Task UseTheirsAsync()

src/Views/Conflict.axaml

@@ -25,40 +25,9 @@
 
         <Border Margin="16,0" Padding="8" CornerRadius="4" BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}">
           <Border.DataTemplates>
-            <DataTemplate DataType="vm:ConflictSourceBranch">
-              <StackPanel Orientation="Horizontal">
-                <Path Width="12" Height="12" Data="{StaticResource Icons.Branch}"/>
-                <TextBlock Margin="4,0,0,0" Text="{Binding Name}"/>
-                <TextBlock Margin="4,0,0,0"
-                           Text="{Binding Head, Converter={x:Static c:StringConverters.ToShortSHA}}"
-                           Foreground="DarkOrange"
-                           TextDecorations="Underline"
-                           Cursor="Hand"
-                           PointerPressed="OnPressedSHA"
-                           ToolTip.Tip="{Binding Revision}"
-                           ToolTip.ShowDelay="0">
-                  <TextBlock.DataTemplates>
-                    <DataTemplate DataType="m:Commit">
-                      <StackPanel MinWidth="400" Orientation="Vertical">
-                        <Grid ColumnDefinitions="Auto,*,Auto">
-                          <v:Avatar Grid.Column="0" Width="16" Height="16" VerticalAlignment="Center" IsHitTestVisible="False" User="{Binding Author}"/>
-                          <TextBlock Grid.Column="1" Text="{Binding Author.Name}" Margin="8,0,0,0"/>
-                          <TextBlock Grid.Column="2" Text="{Binding CommitterTimeStr}" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
-                        </Grid>
-
-                        <TextBlock Margin="0,8,0,0" Text="{Binding Subject}" TextWrapping="Wrap"/>
-                      </StackPanel>
-                    </DataTemplate>
-                  </TextBlock.DataTemplates>
-                </TextBlock>
-              </StackPanel>
-            </DataTemplate>
-
             <DataTemplate DataType="m:Commit">
               <StackPanel Orientation="Horizontal">
-                <Path Width="12" Height="12" Data="{StaticResource Icons.Commit}"/>
-                <v:CommitRefsPresenter Margin="8,0,0,0"
-                                       Foreground="{DynamicResource Brush.FG1}"
+                <v:CommitRefsPresenter Foreground="{DynamicResource Brush.FG1}"
                                        FontSize="12"
                                        VerticalAlignment="Center"
                                        UseGraphColor="False"/>