Commit c7a01f6

committed

fix: GetCanStagedChanges should allow stage conflict that has been resolved manually (#1621)

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

1 parent d170bf6 commit c7a01f6Copy full SHA for c7a01f6

File tree

+16

-4

lines changed

+16

-4

lines changed

Lines changed: 16 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -345,7 +345,7 @@ public void StashAll(bool autoStart)`
`345`	`345`
`346`	`346`	`public async Task StageChangesAsync(List<Models.Change> changes, Models.Change next)`
`347`	`347`	`{`
`348`		`- var canStaged = GetCanStagedChanges(changes);`
	`348`	`+ var canStaged = awaitGetCanStageChangesAsync(changes);`
`349`	`349`	`var count = canStaged.Count;`
`350`	`350`	`if (count == 0)`
`351`	`351`	`return;`
`@@ -645,16 +645,28 @@ public void CommitWithPush()`
`645`	`645`	`return visible;`
`646`	`646`	`}`
`647`	`647`
`648`		`- private List<Models.Change>GetCanStagedChanges(List<Models.Change> changes)`
	`648`	`+ private asyncTask<List<Models.Change>>GetCanStageChangesAsync(List<Models.Change> changes)`
`649`	`649`	`{`
`650`	`650`	`if (!HasUnsolvedConflicts)`
`651`	`651`	`return changes;`
`652`	`652`
`653`	`653`	`var outs = new List<Models.Change>();`
`654`	`654`	`foreach (var c in changes)`
`655`	`655`	`{`
`656`		`- if (!c.IsConflicted)`
`657`		`- outs.Add(c);`
	`656`	`+ if (c.IsConflicted)`
	`657`	`+ {`
	`658`	`+ var isResolved = c.ConflictReason switch`
	`659`	`+ {`
	`660`	`+ Models.ConflictReason.BothAdded or Models.ConflictReason.BothModified =>`
	`661`	`+ await new Commands.IsConflictResolved(_repo.FullPath, c).GetResultAsync(),`
	`662`	`+ _ => false,`
	`663`	`+ };`
	`664`	`+`
	`665`	`+ if (!isResolved)`
	`666`	`+ continue;`
	`667`	`+ }`
	`668`	`+`
	`669`	`+ outs.Add(c);`
`658`	`670`	`}`
`659`	`671`
`660`	`672`	`return outs;`

Comments

(0)