refactor: change the way to refresh repository's data.

love-linger · love-linger · commit a89760c7a57c · 2024-03-08T09:57:29.000+08:00
* mark dirty instead of calling refresh method directly
* force mark branches data dirty after remotes changed
diff --git a/src/Models/Watcher.cs b/src/Models/Watcher.cs
@@ -53,8 +53,12 @@ public void SetEnabled(bool enabled) {
             }
         }
 
-        public void MarkWorkingCopyRefreshed() {
-            _updateWC = 0;
+        public void MarkBranchDirtyManually() {
+            _updateBranch = DateTime.Now.ToFileTime() - 1;
+        }
+
+        public void MarkWorkingCopyDirtyManually() {
+            _updateWC = DateTime.Now.ToFileTime() - 1;
         }
 
         public void Dispose() {
diff --git a/src/ViewModels/AddRemote.cs b/src/ViewModels/AddRemote.cs
@@ -70,7 +70,10 @@ public override Task<bool> Sure() {
                         new Commands.Config(_repo.FullPath).Set($"remote.{_name}.sshkey", SSHKey);
                     }
                 }
-                CallUIThread(() => _repo.SetWatcherEnabled(true));
+                CallUIThread(() => {
+                    _repo.MarkBranchesDirtyManually();
+                    _repo.SetWatcherEnabled(true);
+                });
                 return succ;
             });
         }
diff --git a/src/ViewModels/DeleteRemote.cs b/src/ViewModels/DeleteRemote.cs
@@ -19,7 +19,10 @@ public override Task<bool> Sure() {
 
             return Task.Run(() => {
                 var succ = new Commands.Remote(_repo.FullPath).Delete(Remote.Name);
-                CallUIThread(() => _repo.SetWatcherEnabled(true));
+                CallUIThread(() => {
+                    _repo.MarkBranchesDirtyManually();
+                    _repo.SetWatcherEnabled(true);
+                });
                 return succ;
             });
         }
diff --git a/src/ViewModels/Repository.cs b/src/ViewModels/Repository.cs
@@ -306,6 +306,14 @@ public void SetWatcherEnabled(bool enabled) {
             if (_watcher != null) _watcher.SetEnabled(enabled);
         }
 
+        public void MarkBranchesDirtyManually() {
+            if (_watcher != null) _watcher.MarkBranchDirtyManually();
+        }
+
+        public void MarkWorkingCopyDirtyManually() {
+            if (_watcher != null) _watcher.MarkWorkingCopyDirtyManually();
+        }
+
         public void NavigateToCommit(string sha) {
             if (_histories != null) {
                 SelectedViewIndex = 0;
@@ -357,7 +365,7 @@ public async void ContinueMerge() {
             } else if (File.Exists(otherMerge)) {
                 mode = "merge";
             } else {
-                await Task.Run(RefreshWorkingCopyChanges);
+                MarkWorkingCopyDirtyManually();
                 return;
             }
 
@@ -394,7 +402,7 @@ public async void AbortMerge() {
             } else if (File.Exists(Path.Combine(_gitDir, "MERGE_HEAD"))) {
                 cmd.Args = "merge --abort";
             } else {
-                await Task.Run(RefreshWorkingCopyChanges);
+                MarkWorkingCopyDirtyManually();
                 return;
             }
 
@@ -491,8 +499,6 @@ public void RefreshWorkingCopyChanges() {
                 HasUnsolvedConflict = hasUnsolvedConflict;
                 OnPropertyChanged(nameof(WorkingCopyChangesCount));
             });
-
-            _watcher.MarkWorkingCopyRefreshed();
         }
 
         public void RefreshStashes() {
diff --git a/src/ViewModels/WorkingCopy.cs b/src/ViewModels/WorkingCopy.cs
@@ -246,7 +246,7 @@ public async void StageChanges(List<Models.Change> changes) {
                     await Task.Run(() => new Commands.Add(_repo.FullPath, step).Exec());
                 }
             }
-            _repo.RefreshWorkingCopyChanges();
+            _repo.MarkWorkingCopyDirtyManually();
             _repo.SetWatcherEnabled(true);
             IsStaging = false;
         }
@@ -266,7 +266,7 @@ public async void UnstageChanges(List<Models.Change> changes) {
                     await Task.Run(() => new Commands.Reset(_repo.FullPath, step).Exec());
                 }
             }
-            _repo.RefreshWorkingCopyChanges();
+            _repo.MarkWorkingCopyDirtyManually();
             _repo.SetWatcherEnabled(true);
             IsUnstaging = false;
         }
@@ -296,7 +296,7 @@ public async void UseTheirs() {
                 if (succ) {
                     await Task.Run(() => new Commands.Add(_repo.FullPath, [ctx.Change]).Exec());
                 }
-                _repo.RefreshWorkingCopyChanges();
+                _repo.MarkWorkingCopyDirtyManually();
                 _repo.SetWatcherEnabled(true);
             }
         }
@@ -308,7 +308,7 @@ public async void UseMine() {
                 if (succ) {
                     await Task.Run(() => new Commands.Add(_repo.FullPath, [ctx.Change]).Exec());
                 }
-                _repo.RefreshWorkingCopyChanges();
+                _repo.MarkWorkingCopyDirtyManually();
                 _repo.SetWatcherEnabled(true);
             }
         }
@@ -362,7 +362,7 @@ public async void DoCommit(bool autoPush) {
                     PopupHost.ShowAndStartPopup(new Push(_repo, null));
                 }
             }
-            _repo.RefreshWorkingCopyChanges();
+            _repo.MarkWorkingCopyDirtyManually();
             _repo.SetWatcherEnabled(true);
             IsCommitting = false;
         }
diff --git a/src/Views/TextDiffView.axaml.cs b/src/Views/TextDiffView.axaml.cs
@@ -734,7 +734,7 @@ public void FillContextMenuForWorkingCopyChange(ContextMenu menu, int startLine,
                         new Commands.Apply(ctx.RepositoryPath, tmpFile, true, "nowarn", "--cache --index").Exec();
                         File.Delete(tmpFile);
 
-                        repo.RefreshWorkingCopyChanges();
+                        repo.MarkWorkingCopyDirtyManually();
                         repo.SetWatcherEnabled(true);
                         e.Handled = true;
                     };
@@ -760,7 +760,7 @@ public void FillContextMenuForWorkingCopyChange(ContextMenu menu, int startLine,
                         new Commands.Apply(ctx.RepositoryPath, tmpFile, true, "nowarn", "--reverse").Exec();
                         File.Delete(tmpFile);
 
-                        repo.RefreshWorkingCopyChanges();
+                        repo.MarkWorkingCopyDirtyManually();
                         repo.SetWatcherEnabled(true);
                         e.Handled = true;
                     };
@@ -788,7 +788,7 @@ public void FillContextMenuForWorkingCopyChange(ContextMenu menu, int startLine,
                         new Commands.Apply(ctx.RepositoryPath, tmpFile, true, "nowarn", "--cache --index --reverse").Exec();
                         File.Delete(tmpFile);
 
-                        repo.RefreshWorkingCopyChanges();
+                        repo.MarkWorkingCopyDirtyManually();
                         repo.SetWatcherEnabled(true);
                         e.Handled = true;
                     };
@@ -814,7 +814,7 @@ public void FillContextMenuForWorkingCopyChange(ContextMenu menu, int startLine,
                         new Commands.Apply(ctx.RepositoryPath, tmpFile, true, "nowarn", "--index --reverse").Exec();
                         File.Delete(tmpFile);
 
-                        repo.RefreshWorkingCopyChanges();
+                        repo.MarkWorkingCopyDirtyManually();
                         repo.SetWatcherEnabled(true);
                         e.Handled = true;
                     };

Original file line number	Diff line number	Diff line change
`@@ -53,8 +53,12 @@ public void SetEnabled(bool enabled) {`
`53`	`53`	`}`
`54`	`54`	`}`
`55`	`55`
`56`		`- public void MarkWorkingCopyRefreshed() {`
`57`		`- _updateWC = 0;`
	`56`	`+ public void MarkBranchDirtyManually() {`
	`57`	`+ _updateBranch = DateTime.Now.ToFileTime() - 1;`
	`58`	`+ }`
	`59`	`+`
	`60`	`+ public void MarkWorkingCopyDirtyManually() {`
	`61`	`+ _updateWC = DateTime.Now.ToFileTime() - 1;`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`public void Dispose() {`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,10 @@ public override Task<bool> Sure() {`
`70`	`70`	`new Commands.Config(_repo.FullPath).Set($"remote.{_name}.sshkey", SSHKey);`
`71`	`71`	`}`
`72`	`72`	`}`
`73`		`- CallUIThread(() => _repo.SetWatcherEnabled(true));`
	`73`	`+ CallUIThread(() => {`
	`74`	`+ _repo.MarkBranchesDirtyManually();`
	`75`	`+ _repo.SetWatcherEnabled(true);`
	`76`	`+ });`
`74`	`77`	`return succ;`
`75`	`78`	`});`
`76`	`79`	`}`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public async void StageChanges(List<Models.Change> changes) {`
`246`	`246`	`await Task.Run(() => new Commands.Add(_repo.FullPath, step).Exec());`
`247`	`247`	`}`
`248`	`248`	`}`
`249`		`- _repo.RefreshWorkingCopyChanges();`
	`249`	`+ _repo.MarkWorkingCopyDirtyManually();`
`250`	`250`	`_repo.SetWatcherEnabled(true);`
`251`	`251`	`IsStaging = false;`
`252`	`252`	`}`
`@@ -266,7 +266,7 @@ public async void UnstageChanges(List<Models.Change> changes) {`
`266`	`266`	`await Task.Run(() => new Commands.Reset(_repo.FullPath, step).Exec());`
`267`	`267`	`}`
`268`	`268`	`}`
`269`		`- _repo.RefreshWorkingCopyChanges();`
	`269`	`+ _repo.MarkWorkingCopyDirtyManually();`
`270`	`270`	`_repo.SetWatcherEnabled(true);`
`271`	`271`	`IsUnstaging = false;`
`272`	`272`	`}`
`@@ -296,7 +296,7 @@ public async void UseTheirs() {`
`296`	`296`	`if (succ) {`
`297`	`297`	`await Task.Run(() => new Commands.Add(_repo.FullPath, [ctx.Change]).Exec());`
`298`	`298`	`}`
`299`		`- _repo.RefreshWorkingCopyChanges();`
	`299`	`+ _repo.MarkWorkingCopyDirtyManually();`
`300`	`300`	`_repo.SetWatcherEnabled(true);`
`301`	`301`	`}`
`302`	`302`	`}`
`@@ -308,7 +308,7 @@ public async void UseMine() {`
`308`	`308`	`if (succ) {`
`309`	`309`	`await Task.Run(() => new Commands.Add(_repo.FullPath, [ctx.Change]).Exec());`
`310`	`310`	`}`
`311`		`- _repo.RefreshWorkingCopyChanges();`
	`311`	`+ _repo.MarkWorkingCopyDirtyManually();`
`312`	`312`	`_repo.SetWatcherEnabled(true);`
`313`	`313`	`}`
`314`	`314`	`}`
`@@ -362,7 +362,7 @@ public async void DoCommit(bool autoPush) {`
`362`	`362`	`PopupHost.ShowAndStartPopup(new Push(_repo, null));`
`363`	`363`	`}`
`364`	`364`	`}`
`365`		`- _repo.RefreshWorkingCopyChanges();`
	`365`	`+ _repo.MarkWorkingCopyDirtyManually();`
`366`	`366`	`_repo.SetWatcherEnabled(true);`
`367`	`367`	`IsCommitting = false;`
`368`	`368`	`}`