Commit d0a32eb

committed

feature: makes Clone popup cancellable (#1012)

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

1 parent 328592f commit d0a32ebCopy full SHA for d0a32eb

File tree

-5

lines changed

-5

lines changed

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public bool Exec()`
`75`	`75`	`{`
`76`	`76`	`CancellationToken.Register(() =>`
`77`	`77`	`{`
`78`		`- if (_proc !=null&&!_isDone)`
	`78`	`+ if (_proc is{HasExited:false})`
`79`	`79`	`Native.OS.TerminateSafely(_proc);`
`80`	`80`	`});`
`81`	`81`	`}`
`@@ -92,7 +92,6 @@ public bool Exec()`
`92`	`92`	`return false;`
`93`	`93`	`}`
`94`	`94`
`95`		`- _isDone = false;`
`96`	`95`	`_proc = proc;`
`97`	`96`
`98`	`97`	`int exitCode;`
`@@ -102,7 +101,6 @@ public bool Exec()`
`102`	`101`	`proc.BeginErrorReadLine();`
`103`	`102`	`proc.WaitForExit();`
`104`	`103`
`105`		`- _isDone = true;`
`106`	`104`	`exitCode = proc.ExitCode;`
`107`	`105`	`proc.Close();`
`108`	`106`	`}`
`@@ -111,7 +109,10 @@ public bool Exec()`
`111`	`109`	`_proc = null;`
`112`	`110`	`}`
`113`	`111`
`114`		`- if (!CancellationToken.IsCancellationRequested && exitCode != 0)`
	`112`	`+ if (CancellationToken.IsCancellationRequested)`
	`113`	`+ return false;`
	`114`	`+`
	`115`	`+ if (exitCode != 0)`
`115`	`116`	`{`
`116`	`117`	`if (RaiseError)`
`117`	`118`	`{`
`@@ -223,6 +224,5 @@ private ProcessStartInfo CreateGitStartInfo()`
`223`	`224`	`private static partial Regex REG_PROGRESS();`
`224`	`225`
`225`	`226`	`private Process _proc = null;`
`226`		`- private bool _isDone = false;`
`227`	`227`	`}`
`228`	`228`	`}`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -62,6 +62,8 @@ public bool InitAndUpdateSubmodules`
`62`	`62`	`public Clone(string pageId)`
`63`	`63`	`{`
`64`	`64`	`_pageId = pageId;`
	`65`	`+`
	`66`	`+ CanCancelInProgress = true;`
`65`	`67`	`View = new Views.Clone() { DataContext = this };`
`66`	`68`
`67`	`69`	`Task.Run(async () =>`
`@@ -102,6 +104,7 @@ public override Task<bool> Sure()`
`102`	`104`	`return Task.Run(() =>`
`103`	`105`	`{`
`104`	`106`	`var cmd = new Commands.Clone(_pageId, _parentFolder, _remote, _local, _useSSH ? _sshKey : "", _extraArgs, SetProgressDescription);`
	`107`	`+ cmd.CancellationToken = CancelInProgressTokenSource.Token;`
`105`	`108`	`if (!cmd.Exec())`
`106`	`109`	`return false;`
`107`	`110`

Comments

(0)