enhance: remember last selected on common actions (#231)

love-linger · love-linger · commit f4f4a26a642c · 2024-07-03T14:42:21.000+08:00
* the way to deal with local changes on checkout branch page
* the way to deal with local changes and should checkout after created on new branch page
* should fetch without tags on fetch page
* the way to deal with local changes and should fetch without tags on pull page
* should push all tags on push
diff --git a/src/ViewModels/Checkout.cs b/src/ViewModels/Checkout.cs
@@ -12,8 +12,8 @@ public string Branch
 
         public Models.DealWithLocalChanges PreAction
         {
-            get => _preAction;
-            set => SetProperty(ref _preAction, value);
+            get => _repo.Settings.DealWithLocalChangesOnCheckoutBranch;
+            set => _repo.Settings.DealWithLocalChangesOnCheckoutBranch = value;
         }
 
         public Checkout(Repository repo, string branch)
@@ -34,7 +34,7 @@ public override Task<bool> Sure()
                 var needPopStash = false;
                 if (hasLocalChanges)
                 {
-                    if (_preAction == Models.DealWithLocalChanges.StashAndReaply)
+                    if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
                     {
                         SetProgressDescription("Adding untracked changes ...");
                         var succ = new Commands.Add(_repo.FullPath).Exec();
@@ -52,7 +52,7 @@ public override Task<bool> Sure()
 
                         needPopStash = true;
                     }
-                    else if (_preAction == Models.DealWithLocalChanges.Discard)
+                    else if (PreAction == Models.DealWithLocalChanges.Discard)
                     {
                         SetProgressDescription("Discard local changes ...");
                         Commands.Discard.All(_repo.FullPath);
@@ -78,6 +78,5 @@ public override Task<bool> Sure()
         }
 
         private readonly Repository _repo = null;
-        private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.DoNothing;
     }
 }
diff --git a/src/ViewModels/CreateBranch.cs b/src/ViewModels/CreateBranch.cs
@@ -22,15 +22,15 @@ public object BasedOn
 
         public Models.DealWithLocalChanges PreAction
         {
-            get => _preAction;
-            set => SetProperty(ref _preAction, value);
+            get => _repo.Settings.DealWithLocalChangesOnCreateBranch;
+            set => _repo.Settings.DealWithLocalChangesOnCreateBranch = value;
         }
 
         public bool CheckoutAfterCreated
         {
-            get;
-            set;
-        } = true;
+            get => _repo.Settings.CheckoutBranchOnCreateBranch;
+            set => _repo.Settings.CheckoutBranchOnCreateBranch = value;
+        }
 
         public CreateBranch(Repository repo, Models.Branch branch)
         {
@@ -89,7 +89,7 @@ public override Task<bool> Sure()
                     bool needPopStash = false;
                     if (_repo.WorkingCopyChangesCount > 0)
                     {
-                        if (_preAction == Models.DealWithLocalChanges.StashAndReaply)
+                        if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
                         {
                             SetProgressDescription("Adding untracked changes...");
                             var succ = new Commands.Add(_repo.FullPath).Exec();
@@ -107,7 +107,7 @@ public override Task<bool> Sure()
 
                             needPopStash = true;
                         }
-                        else if (_preAction == Models.DealWithLocalChanges.Discard)
+                        else if (PreAction == Models.DealWithLocalChanges.Discard)
                         {
                             SetProgressDescription("Discard local changes...");
                             Commands.Discard.All(_repo.FullPath);
@@ -137,6 +137,5 @@ public override Task<bool> Sure()
         private readonly Repository _repo = null;
         private string _name = null;
         private readonly string _baseOnRevision = null;
-        private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.DoNothing;
     }
 }
diff --git a/src/ViewModels/Fetch.cs b/src/ViewModels/Fetch.cs
@@ -30,9 +30,9 @@ public bool Prune
 
         public bool NoTags
         {
-            get;
-            set;
-        } = false;
+            get => _repo.Settings.FetchWithoutTags;
+            set => _repo.Settings.FetchWithoutTags = value;
+        }
 
         public Fetch(Repository repo, Models.Remote preferedRemote = null)
         {
@@ -45,6 +45,7 @@ public Fetch(Repository repo, Models.Remote preferedRemote = null)
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
+
             return Task.Run(() =>
             {
                 if (FetchAllRemotes)
diff --git a/src/ViewModels/Pull.cs b/src/ViewModels/Pull.cs
@@ -49,8 +49,8 @@ public Models.Branch SelectedBranch
 
         public Models.DealWithLocalChanges PreAction
         {
-            get => _preAction;
-            set => SetProperty(ref _preAction, value);
+            get => _repo.Settings.DealWithLocalChangesOnPull;
+            set => _repo.Settings.DealWithLocalChangesOnPull = value;
         }
 
         public bool UseRebase
@@ -61,9 +61,9 @@ public bool UseRebase
 
         public bool NoTags
         {
-            get;
-            set;
-        } = false;
+            get => _repo.Settings.FetchWithoutTagsOnPull;
+            set => _repo.Settings.FetchWithoutTagsOnPull = value;
+        }
 
         public Pull(Repository repo, Models.Branch specifiedRemoteBranch)
         {
@@ -120,12 +120,13 @@ public Pull(Repository repo, Models.Branch specifiedRemoteBranch)
         public override Task<bool> Sure()
         {
             _repo.SetWatcherEnabled(false);
+
             return Task.Run(() =>
             {
                 var needPopStash = false;
                 if (_repo.WorkingCopyChangesCount > 0)
                 {
-                    if (_preAction == Models.DealWithLocalChanges.StashAndReaply)
+                    if (PreAction == Models.DealWithLocalChanges.StashAndReaply)
                     {
                         SetProgressDescription("Adding untracked changes...");
                         var succ = new Commands.Add(_repo.FullPath).Exec();
@@ -143,7 +144,7 @@ public override Task<bool> Sure()
 
                         needPopStash = true;
                     }
-                    else if (_preAction == Models.DealWithLocalChanges.Discard)
+                    else if (PreAction == Models.DealWithLocalChanges.Discard)
                     {
                         SetProgressDescription("Discard local changes ...");
                         Commands.Discard.All(_repo.FullPath);
@@ -168,6 +169,5 @@ public override Task<bool> Sure()
         private Models.Remote _selectedRemote = null;
         private List<Models.Branch> _remoteBranches = null;
         private Models.Branch _selectedBranch = null;
-        private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.DoNothing;
     }
 }
diff --git a/src/ViewModels/Push.cs b/src/ViewModels/Push.cs
@@ -64,8 +64,8 @@ public Models.Branch SelectedRemoteBranch
 
         public bool PushAllTags
         {
-            get;
-            set;
+            get => _repo.Settings.PushAllTags;
+            set => _repo.Settings.PushAllTags = value;
         }
 
         public bool IsSetTrackOptionVisible
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -14,14 +14,56 @@
 
 namespace SourceGit.ViewModels
 {
-    public class RepositorySettings : ObservableObject
+    public class RepositorySettings
     {
+        public Models.DealWithLocalChanges DealWithLocalChangesOnCheckoutBranch
+        {
+            get;
+            set;
+        } = Models.DealWithLocalChanges.DoNothing;
+
+        public bool FetchWithoutTags
+        {
+            get;
+            set;
+        } = false;
+
+        public Models.DealWithLocalChanges DealWithLocalChangesOnPull
+        {
+            get;
+            set;
+        } = Models.DealWithLocalChanges.DoNothing;
+
         public bool PreferRebaseInsteadOfMerge
         {
             get;
             set;
         } = true;
 
+        public bool FetchWithoutTagsOnPull
+        {
+            get;
+            set;
+        } = false;
+
+        public bool PushAllTags
+        {
+            get;
+            set;
+        } = false;
+
+        public Models.DealWithLocalChanges DealWithLocalChangesOnCreateBranch
+        {
+            get;
+            set;
+        } = Models.DealWithLocalChanges.DoNothing;
+
+        public bool CheckoutBranchOnCreateBranch
+        {
+            get;
+            set;
+        } = true;
+
         public AvaloniaList<string> Filters
         {
             get;

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@ public string Branch`
`12`	`12`
`13`	`13`	`public Models.DealWithLocalChanges PreAction`
`14`	`14`	`{`
`15`		`- get => _preAction;`
`16`		`- set => SetProperty(ref _preAction, value);`
	`15`	`+ get => _repo.Settings.DealWithLocalChangesOnCheckoutBranch;`
	`16`	`+ set => _repo.Settings.DealWithLocalChangesOnCheckoutBranch = value;`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public Checkout(Repository repo, string branch)`
`@@ -34,7 +34,7 @@ public override Task<bool> Sure()`
`34`	`34`	`var needPopStash = false;`
`35`	`35`	`if (hasLocalChanges)`
`36`	`36`	`{`
`37`		`- if (_preAction == Models.DealWithLocalChanges.StashAndReaply)`
	`37`	`+ if (PreAction == Models.DealWithLocalChanges.StashAndReaply)`
`38`	`38`	`{`
`39`	`39`	`SetProgressDescription("Adding untracked changes ...");`
`40`	`40`	`var succ = new Commands.Add(_repo.FullPath).Exec();`
`@@ -52,7 +52,7 @@ public override Task<bool> Sure()`
`52`	`52`
`53`	`53`	`needPopStash = true;`
`54`	`54`	`}`
`55`		`- else if (_preAction == Models.DealWithLocalChanges.Discard)`
	`55`	`+ else if (PreAction == Models.DealWithLocalChanges.Discard)`
`56`	`56`	`{`
`57`	`57`	`SetProgressDescription("Discard local changes ...");`
`58`	`58`	`Commands.Discard.All(_repo.FullPath);`
`@@ -78,6 +78,5 @@ public override Task<bool> Sure()`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`private readonly Repository _repo = null;`
`81`		`- private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.DoNothing;`
`82`	`81`	`}`
`83`	`82`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,15 +22,15 @@ public object BasedOn`
`22`	`22`
`23`	`23`	`public Models.DealWithLocalChanges PreAction`
`24`	`24`	`{`
`25`		`- get => _preAction;`
`26`		`- set => SetProperty(ref _preAction, value);`
	`25`	`+ get => _repo.Settings.DealWithLocalChangesOnCreateBranch;`
	`26`	`+ set => _repo.Settings.DealWithLocalChangesOnCreateBranch = value;`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`public bool CheckoutAfterCreated`
`30`	`30`	`{`
`31`		`- get;`
`32`		`- set;`
`33`		`- } = true;`
	`31`	`+ get => _repo.Settings.CheckoutBranchOnCreateBranch;`
	`32`	`+ set => _repo.Settings.CheckoutBranchOnCreateBranch = value;`
	`33`	`+ }`
`34`	`34`
`35`	`35`	`public CreateBranch(Repository repo, Models.Branch branch)`
`36`	`36`	`{`
`@@ -89,7 +89,7 @@ public override Task<bool> Sure()`
`89`	`89`	`bool needPopStash = false;`
`90`	`90`	`if (_repo.WorkingCopyChangesCount > 0)`
`91`	`91`	`{`
`92`		`- if (_preAction == Models.DealWithLocalChanges.StashAndReaply)`
	`92`	`+ if (PreAction == Models.DealWithLocalChanges.StashAndReaply)`
`93`	`93`	`{`
`94`	`94`	`SetProgressDescription("Adding untracked changes...");`
`95`	`95`	`var succ = new Commands.Add(_repo.FullPath).Exec();`
`@@ -107,7 +107,7 @@ public override Task<bool> Sure()`
`107`	`107`
`108`	`108`	`needPopStash = true;`
`109`	`109`	`}`
`110`		`- else if (_preAction == Models.DealWithLocalChanges.Discard)`
	`110`	`+ else if (PreAction == Models.DealWithLocalChanges.Discard)`
`111`	`111`	`{`
`112`	`112`	`SetProgressDescription("Discard local changes...");`
`113`	`113`	`Commands.Discard.All(_repo.FullPath);`
`@@ -137,6 +137,5 @@ public override Task<bool> Sure()`
`137`	`137`	`private readonly Repository _repo = null;`
`138`	`138`	`private string _name = null;`
`139`	`139`	`private readonly string _baseOnRevision = null;`
`140`		`- private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.DoNothing;`
`141`	`140`	`}`
`142`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,9 +30,9 @@ public bool Prune`
`30`	`30`
`31`	`31`	`public bool NoTags`
`32`	`32`	`{`
`33`		`- get;`
`34`		`- set;`
`35`		`- } = false;`
	`33`	`+ get => _repo.Settings.FetchWithoutTags;`
	`34`	`+ set => _repo.Settings.FetchWithoutTags = value;`
	`35`	`+ }`
`36`	`36`
`37`	`37`	`public Fetch(Repository repo, Models.Remote preferedRemote = null)`
`38`	`38`	`{`
`@@ -45,6 +45,7 @@ public Fetch(Repository repo, Models.Remote preferedRemote = null)`
`45`	`45`	`public override Task<bool> Sure()`
`46`	`46`	`{`
`47`	`47`	`_repo.SetWatcherEnabled(false);`
	`48`	`+`
`48`	`49`	`return Task.Run(() =>`
`49`	`50`	`{`
`50`	`51`	`if (FetchAllRemotes)`
Original file line number	Diff line number	Diff line change
`@@ -49,8 +49,8 @@ public Models.Branch SelectedBranch`
`49`	`49`
`50`	`50`	`public Models.DealWithLocalChanges PreAction`
`51`	`51`	`{`
`52`		`- get => _preAction;`
`53`		`- set => SetProperty(ref _preAction, value);`
	`52`	`+ get => _repo.Settings.DealWithLocalChangesOnPull;`
	`53`	`+ set => _repo.Settings.DealWithLocalChangesOnPull = value;`
`54`	`54`	`}`
`55`	`55`
`56`	`56`	`public bool UseRebase`
`@@ -61,9 +61,9 @@ public bool UseRebase`
`61`	`61`
`62`	`62`	`public bool NoTags`
`63`	`63`	`{`
`64`		`- get;`
`65`		`- set;`
`66`		`- } = false;`
	`64`	`+ get => _repo.Settings.FetchWithoutTagsOnPull;`
	`65`	`+ set => _repo.Settings.FetchWithoutTagsOnPull = value;`
	`66`	`+ }`
`67`	`67`
`68`	`68`	`public Pull(Repository repo, Models.Branch specifiedRemoteBranch)`
`69`	`69`	`{`
`@@ -120,12 +120,13 @@ public Pull(Repository repo, Models.Branch specifiedRemoteBranch)`
`120`	`120`	`public override Task<bool> Sure()`
`121`	`121`	`{`
`122`	`122`	`_repo.SetWatcherEnabled(false);`
	`123`	`+`
`123`	`124`	`return Task.Run(() =>`
`124`	`125`	`{`
`125`	`126`	`var needPopStash = false;`
`126`	`127`	`if (_repo.WorkingCopyChangesCount > 0)`
`127`	`128`	`{`
`128`		`- if (_preAction == Models.DealWithLocalChanges.StashAndReaply)`
	`129`	`+ if (PreAction == Models.DealWithLocalChanges.StashAndReaply)`
`129`	`130`	`{`
`130`	`131`	`SetProgressDescription("Adding untracked changes...");`
`131`	`132`	`var succ = new Commands.Add(_repo.FullPath).Exec();`
`@@ -143,7 +144,7 @@ public override Task<bool> Sure()`
`143`	`144`
`144`	`145`	`needPopStash = true;`
`145`	`146`	`}`
`146`		`- else if (_preAction == Models.DealWithLocalChanges.Discard)`
	`147`	`+ else if (PreAction == Models.DealWithLocalChanges.Discard)`
`147`	`148`	`{`
`148`	`149`	`SetProgressDescription("Discard local changes ...");`
`149`	`150`	`Commands.Discard.All(_repo.FullPath);`
`@@ -168,6 +169,5 @@ public override Task<bool> Sure()`
`168`	`169`	`private Models.Remote _selectedRemote = null;`
`169`	`170`	`private List<Models.Branch> _remoteBranches = null;`
`170`	`171`	`private Models.Branch _selectedBranch = null;`
`171`		`- private Models.DealWithLocalChanges _preAction = Models.DealWithLocalChanges.DoNothing;`
`172`	`172`	`}`
`173`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,8 +64,8 @@ public Models.Branch SelectedRemoteBranch`
`64`	`64`
`65`	`65`	`public bool PushAllTags`
`66`	`66`	`{`
`67`		`- get;`
`68`		`- set;`
	`67`	`+ get => _repo.Settings.PushAllTags;`
	`68`	`+ set => _repo.Settings.PushAllTags = value;`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`public bool IsSetTrackOptionVisible`