fix: 无法正确唤起Merge的问题

Flawless.Client/Models/RepositoryResetMethod.cs

@@ -8,7 +8,7 @@ public enum RepositoryResetMethod
     Keep,
     
     /// <summary>
-    /// Tracked files will being reset, changes will being reset.
+    /// Tracked files will being reset, changes will being merged.
     /// </summary>
     Soft,
     
@@ -16,14 +16,4 @@ public enum RepositoryResetMethod
     /// All files will being reset, changes will being reset, changes list will being cleaned.
     /// </summary>
     Hard,
-    
-    /// <summary>
-    /// Tracked files will being reset, changes will being merged.
-    /// </summary>
-    Merge,
-    
-    /// <summary>
-    /// All files will being reset, changes will being merged.
-    /// </summary>
-    HardMerge
 }

Flawless.Client/Service/RepositoryService.cs

@@ -837,9 +837,9 @@ public class RepositoryService : BaseService<RepositoryService>
         
         try
         {
-            var mergeChanges = method is RepositoryResetMethod.Merge or RepositoryResetMethod.HardMerge;
+            var mergeChanges = method is RepositoryResetMethod.Soft;
             var resetChanges = method is RepositoryResetMethod.Soft or RepositoryResetMethod.Hard;
-            var hardMode = method is RepositoryResetMethod.Hard or RepositoryResetMethod.HardMerge;
+            var hardMode = method is RepositoryResetMethod.Hard;
             List<WorkspaceFile> unmerged = new();
             
             // Apply files excepts local changed.
@@ -892,7 +892,6 @@ public class RepositoryService : BaseService<RepositoryService>
             }
             catch (Exception exception) { Console.WriteLine(exception); }
             
-            
             UIHelper.NotifyError(e);
             Console.WriteLine(e);
             await DeleteFromDiskAsync(repo);
@@ -938,47 +937,45 @@ public class RepositoryService : BaseService<RepositoryService>
         }
     }
 
-    public async ValueTask MergeFilesAsync(RepositoryModel repo, RepositoryFileTreeAccessor repoAccessor, IEnumerable<WorkspaceFile> unmerged)
+    public async ValueTask<bool> MergeFilesAsync(RepositoryModel repo, RepositoryFileTreeAccessor repoAccessor, IEnumerable<WorkspaceFile> unmerged)
     {
         var root = PathUtility.GetWorkspaceManagerPath(Api.C.Username.Value, repo.OwnerName, repo.Name);
-        var srcTem = Path.Combine(root, "MergeInTemp");
+        var tempFolder = Path.Combine(root, "MergeInTemp");
+        var wsRoot = PathUtility.GetWorkspacePath(Api.C.Username.Value, repo.OwnerName, repo.Name);
+        var left = Path.Combine(tempFolder, "left");
+        var right = Path.Combine(tempFolder, "right");
 
-        using (Disposable.Create(srcTem, r => Directory.Delete(r, true)))
+        using (Disposable.Create(tempFolder, r => Directory.Delete(r, true)))
         {
             Directory.CreateDirectory(root);
 
-            // Prepare server files
+            foreach (var p in unmerged)
-            var wsRoot = PathUtility.GetWorkspacePath(Api.C.Username.Value, repo.OwnerName, repo.Name);
-            var vm = new MergeDialogViewModel(repo, unmerged, srcTem, wsRoot);
-
-            foreach (var f in vm.MergeFiles)
             {
-                var pf = WorkPath.ToPlatformPath(f.WorkPath, vm.SrcFolder);
+                try
-                Directory.CreateDirectory(Path.GetDirectoryName(pf)!);
+                {
-                await using var fs = File.Create(pf);
+                    // Prepare for left and right file
-                repoAccessor.TryWriteDataIntoDisk(f.WorkPath, fs, out _);
+                    var wfs = WorkPath.ToPlatformPath(wsRoot, p.WorkPath);
-            }
+                    File.Copy(wfs, left, true);
+                    await using var rightFs = File.Create(right);
+                    repoAccessor.TryWriteDataIntoDisk(p.WorkPath, rightFs, out _);
 
-            // Raise merge window
+                    // Raise dialog window
                     var opt = UIHelper.DefaultOverlayDialogOptionsYesNo();
-            opt.Buttons = DialogButton.OK;
+                    opt.Buttons = DialogButton.None;
                     opt.Title = "Merge files";
-            opt.FullScreen = true;
+                    opt.IsCloseButtonVisible = true;
-            opt.IsCloseButtonVisible = false;
 
+                    var vm = new MergeDialogViewModel(p.WorkPath, wfs, p.WorkPath, left, right);
                     await OverlayDialog.ShowModal<MergeDialogView, MergeDialogViewModel>(vm, AppDefaultValues.HostId, opt);
-            
+                }
-            // Rollback files
+                catch (Exception e)
-            foreach (var f in vm.MergeFiles)
                 {
-                var copyFrom = WorkPath.ToPlatformPath(f.WorkPath, vm.TmpFolder);
+                    Console.Error.WriteLine(e);
-                if (!File.Exists(copyFrom)) continue; // If file existed, override it.
+                }
+            }
+        }
 
-                var copyTo = WorkPath.ToPlatformPath(f.WorkPath, vm.DstFolder);
+        return true;
-                Directory.CreateDirectory(Path.GetDirectoryName(copyTo)!);
-                File.Copy(copyFrom, copyTo, true);
-            }
-        }
     }
 
     public async ValueTask<bool> UpdateCommitsHistoryFromServerAsync(RepositoryModel repo)

Flawless.Client/ViewModels/ModalBox/MergeDialogViewModel.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using Flawless.Abstraction;
@@ -11,34 +12,42 @@ namespace Flawless.Client.ViewModels.ModalBox;
 
 public partial class MergeDialogViewModel : ViewModelBase
 {
-    public ObservableCollection<WorkspaceFile> MergeFiles { get; }
+    [Reactive] private string _ws;
     
-    public RepositoryModel Repository { get; }
+    [Reactive] private string _final;
     
-    public string SrcFolder { get; }
+    [Reactive] private string _leftFile; // Local file
     
-    public string DstFolder { get; }
+    [Reactive] private string _rightFile; // Remote file
 
-    public string TmpFolder { get; }
+    public MergeDialogViewModel(string ws, string final, string fileWorkPath, string leftFile, string rightFile)
-    
-
-    public MergeDialogViewModel(RepositoryModel repository, IEnumerable<WorkspaceFile> files,
-        string srcFolder, string dstFolder)
     {
-        Repository = repository;
+        _ws = ws;
-        MergeFiles = new ObservableCollection<WorkspaceFile>(files);
+        _final = final;
-        SrcFolder = srcFolder;
+        _leftFile = leftFile;
-        DstFolder = dstFolder;
+        _rightFile = rightFile;
-        TmpFolder = Directory.CreateTempSubdirectory("Flawless_Merge").Name;
     }
 
     [ReactiveCommand]
     private async Task RaiseMergeToolsAsync(string fileWorkPath)
     {
-        var srcFile = WorkPath.ToPlatformPath(fileWorkPath, SrcFolder);
+        var result = Process.Start($"meld \"{LeftFile}\" \"{RightFile}\"");
-        var dstFile = Path.Combine(fileWorkPath, DstFolder);
+    }
-        var tmpFile = Path.Combine(fileWorkPath, TmpFolder);
 
+    [ReactiveCommand]
+    private Task UseLeftFileAsync()
+    {
+        return UseFileAsync(LeftFile);
+    }
     
+    [ReactiveCommand]
+    private Task UseRightFileAsync()
+    {
+        return UseFileAsync(RightFile);
+    }
+
+    private async Task UseFileAsync(string path)
+    {
+        File.Copy(path, _final, true);
     }
 }

Flawless.Client/ViewModels/SettingViewModel.cs

@@ -235,15 +235,19 @@ public partial class SettingViewModel : RoutableViewModelBase
             Users.Clear();
             foreach (var user in users)
             {
-                Users.Add(new UserModel
+                var m = new UserModel
                 {
                     Username = user.Username,
                     Email = user.Email,
                     IsActive = user.IsActive,
                     IsAdmin = user.IsAdmin ?? false,
                     CanEdit = user.Username != Api.C.Username.Value!
-                });
+                };
+                
+                if (m.CanEdit) Users.Insert(0, m);
+                else Users.Add(m);
             }
+            
         }
         catch (ApiException ex)
         {

Flawless.Client/Views/ModalBox/MergeDialogView.axaml

@@ -6,19 +6,15 @@
              xmlns:u="https://irihi.tech/ursa"
              x:DataType="vm:MergeDialogViewModel"
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
-             MinWidth="400"
+             MinWidth="600"
              x:Class="Flawless.Client.Views.ModalBox.MergeDialogView">
-    <ListBox HorizontalAlignment="Stretch" ItemsSource="{Binding MergeFiles}">
+    <StackPanel Orientation="Vertical" HorizontalAlignment="Stretch" Spacing="12">
-        <ListBox.ItemTemplate>
+        <Label Content="{Binding Ws, StringFormat='Conflict on file:\n {0}'}"/>
-            <DataTemplate>
+        <Label Content="{Binding Ws, StringFormat='Left is local and right is remote'}"/>
-                <ListBoxItem>
+        <StackPanel Orientation="Horizontal" Spacing="4" HorizontalAlignment="Center">
-                    <Grid ColumnDefinitions="Auto, *, Auto">
+            <Button Content="Use Left" Command="{Binding UseLeftFileCommand}"/>
-                        <Label Grid.Column="0" Content="{Binding WorkPath}"/>
+            <Button Content="Merge" Command="{Binding RaiseMergeToolsCommand}"/>
-                        <u:IconButton Command="{Binding $parent[ItemsControl].((vm:MergeDialogViewModel)DataContext).RaiseMergeToolsCommand}"
+            <Button Content="Use Right" Command="{Binding UseRightFileCommand}"/>
-                                      CommandParameter="{Binding WorkPath}"/>
+        </StackPanel>
-                    </Grid>
+    </StackPanel>
-                </ListBoxItem>
-            </DataTemplate>
-        </ListBox.ItemTemplate>
-    </ListBox>
 </UserControl>

Flawless.Client/Views/SettingView.axaml

@@ -36,22 +36,22 @@
                     </u:Form>
                 </ScrollViewer>
             </TabItem>
-            <TabItem Header="Preference">
+            <!-- <TabItem Header="Preference"> -->
-                <ScrollViewer Width="600" HorizontalAlignment="Left" Margin="6">
+            <!--     <ScrollViewer Width="600" HorizontalAlignment="Left" Margin="6"> -->
-                    <u:Form HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+            <!--         <u:Form HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> -->
-                        <!-- <u:FormItem Label="Default Storage Location"> -->
+            <!--             ~1~ <u:FormItem Label="Default Storage Location"> @1@ -->
-                        <!--     <u:PathPicker/> -->
+            <!--             ~1~     <u:PathPicker/> @1@ -->
-                        <!-- </u:FormItem> -->
+            <!--             ~1~ </u:FormItem> @1@ -->
-                        <u:FormGroup Header="Extern Tools">
+            <!--             <u:FormGroup Header="Extern Tools"> -->
-                            <u:PathPicker u:FormItem.Label="Diff Tool"/>
+            <!--                 <u:PathPicker u:FormItem.Label="Diff Tool"/> -->
-                        </u:FormGroup>
+            <!--             </u:FormGroup> -->
-                        <StackPanel Orientation="Horizontal" Spacing="4">
+            <!--             <StackPanel Orientation="Horizontal" Spacing="4"> -->
-                            <u:IconButton Content="Save" Command="{Binding SaveClientPreferenceCommand}"/>
+            <!--                 <u:IconButton Content="Save" Command="{Binding SaveClientPreferenceCommand}"/> -->
-                            <u:IconButton Classes="Danger" Content="Reset" Command="{Binding ResetClientPreferenceCommand}"/>
+            <!--                 <u:IconButton Classes="Danger" Content="Reset" Command="{Binding ResetClientPreferenceCommand}"/> -->
-                        </StackPanel>
+            <!--             </StackPanel> -->
-                    </u:Form>
+            <!--         </u:Form> -->
-                </ScrollViewer>
+            <!--     </ScrollViewer> -->
-            </TabItem>
+            <!-- </TabItem> -->
             <TabItem IsVisible="{Binding LoginUser.IsAdmin}" Header="Server">
                 <ScrollViewer Width="600" HorizontalAlignment="Left" Margin="6">
                     <u:Form HorizontalAlignment="Stretch" VerticalAlignment="Stretch">