Commit 619fc3c

committed

feature: auto-track remote branch when the remote branch is first time to checkout (#1616)

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

1 parent e2bf9cc commit 619fc3cCopy full SHA for 619fc3c

File tree

+33

-7

lines changed

+33

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -32,12 +32,12 @@ public async Task<bool> RenameAsync(string to)`
`32`	`32`	`return await ExecAsync().ConfigureAwait(false);`
`33`	`33`	`}`
`34`	`34`
`35`		`- public async Task<bool> SetUpstreamAsync(stringupstream)`
	`35`	`+ public async Task<bool> SetUpstreamAsync(Models.Branchtracking)`
`36`	`36`	`{`
`37`		`- if (string.IsNullOrEmpty(upstream))`
	`37`	`+ if (tracking==null)`
`38`	`38`	`Args = $"branch {_name} --unset-upstream";`
`39`	`39`	`else`
`40`		`- Args = $"branch {_name} -u {upstream}";`
	`40`	`+ Args = $"branch {_name} -u {tracking.FriendlyName}";`
`41`	`41`
`42`	`42`	`return await ExecAsync().ConfigureAwait(false);`
`43`	`43`	`}`

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -192,6 +192,24 @@ public override async Task<bool> Sure()`
`192`	`192`	`.CreateAsync(_baseOnRevision, _allowOverwrite);`
`193`	`193`	`}`
`194`	`194`
	`195`	`+ if (succ && BasedOn is Models.Branch { IsLocal: false } basedOn)`
	`196`	`+ {`
	`197`	`+ var autoSetUpstream = true;`
	`198`	`+ foreach (var b in _repo.Branches)`
	`199`	`+ {`
	`200`	`+ if (b.IsLocal && b.Upstream.Equals(basedOn.FullName, StringComparison.Ordinal))`
	`201`	`+ {`
	`202`	`+ autoSetUpstream = false;`
	`203`	`+ break;`
	`204`	`+ }`
	`205`	`+ }`
	`206`	`+`
	`207`	`+ if (autoSetUpstream)`
	`208`	`+ await new Commands.Branch(_repo.FullPath, fixedName)`
	`209`	`+ .Use(log)`
	`210`	`+ .SetUpstreamAsync(basedOn);`
	`211`	`+ }`
	`212`	`+`
`195`	`213`	`log.Complete();`
`196`	`214`
`197`	`215`	`if (succ && CheckoutAfterCreated)`

Lines changed: 12 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System.Collections.Generic;`
	`1`	`+using System;`
	`2`	`+using System.Collections.Generic;`
`2`	`3`	`using System.Threading.Tasks;`
`3`	`4`
`4`	`5`	`namespace SourceGit.ViewModels`
`@@ -53,17 +54,24 @@ public SetUpstream(Repository repo, Models.Branch local, List<Models.Branch> rem`
`53`	`54`	`public override async Task<bool> Sure()`
`54`	`55`	`{`
`55`	`56`	`ProgressDescription = "Setting upstream...";`
	`57`	`+ Models.Branch upstream = _unset ? null : SelectedRemoteBranch;`
`56`	`58`
`57`		`- var upstream = (_unset \|\| SelectedRemoteBranch == null) ? string.Empty : SelectedRemoteBranch.FullName;`
`58`		`- if (upstream == Local.Upstream)`
	`59`	`+ if (upstream == null)`
	`60`	`+ {`
	`61`	`+ if (string.IsNullOrEmpty(Local.Upstream))`
	`62`	`+ return true;`
	`63`	`+ }`
	`64`	`+ else if (upstream.FullName.Equals(Local.Upstream, StringComparison.Ordinal))`
	`65`	`+ {`
`59`	`66`	`return true;`
	`67`	`+ }`
`60`	`68`
`61`	`69`	`var log = _repo.CreateLog("Set Upstream");`
`62`	`70`	`Use(log);`
`63`	`71`
`64`	`72`	`var succ = await new Commands.Branch(_repo.FullPath, Local.Name)`
`65`	`73`	`.Use(log)`
`66`		`- .SetUpstreamAsync(upstream.Replace("refs/remotes/",""));`
	`74`	`+ .SetUpstreamAsync(upstream);`
`67`	`75`
`68`	`76`	`log.Complete();`
`69`	`77`	`if (succ)`

Comments

(0)