mudhorn/oh-my-posh
1
0
Fork 0
mirror of https://github.com/JanDeDobbeleer/oh-my-posh.git synced 2025-03-05 20:49:04 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(fossil): add ADDED_BY_MERGE to status
Some checks are pending
Code QL / code-ql (push) Waiting to run
Details
Release / changelog (push) Waiting to run
Details
Release / artifacts (push) Blocked by required conditions
Details

Browse source 
resolves #5695
This commit is contained in:
Jan De Dobbeleer 2024-09-30 15:37:31 +02:00 committed by Jan De Dobbeleer
parent 9f4bd8d5b2
commit 06df61a1dc
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/segments/fossil.go
View file

@ -11,9 +11,9 @@ func (s *FossilStatus) add(code string) {
switch code { switch code {
case "CONFLICT": case "CONFLICT":
s.Conflicted++ s.Conflicted++
case "DELETED": case "DELETED", "MISSING":
s.Deleted++ s.Deleted++
case "ADDED", "ADDED_BY_INTEGRATE": case "ADDED", "ADDED_BY_INTEGRATE", "ADDED_BY_MERGE":
s.Added++ s.Added++
case "EDITED", "UPDATED", "UPDATED_BY_INTEGRATE", "UPDATED_BY_MERGE", "CHANGED": case "EDITED", "UPDATED", "UPDATED_BY_INTEGRATE", "UPDATED_BY_MERGE", "CHANGED":
s.Modified++ s.Modified++

4
src/segments/fossil_test.go
View file

@ -45,8 +45,10 @@ func TestFossilStatus(t *testing.T) {
comment: In the /setup_skin page, add a mention of/link to /skins, per request in the forum. (user: stephan) comment: In the /setup_skin page, add a mention of/link to /skins, per request in the forum. (user: stephan)
CONFLICT test.tst CONFLICT test.tst
DELETED test.tst DELETED test.tst
MISSING test.tst
ADDED test.tst ADDED test.tst
ADDED_BY_INTEGRATE test.tst ADDED_BY_INTEGRATE test.tst
ADDED_BY_MERGE test.tst
EDITED auto.def EDITED auto.def
UPDATED test.tst UPDATED test.tst
UPDATED_BY_INTEGRATE test.tst UPDATED_BY_INTEGRATE test.tst
@ -55,7 +57,7 @@ func TestFossilStatus(t *testing.T) {
RENAMED test.tst RENAMED test.tst
`, `,
ExpectedBranch: "trunk", ExpectedBranch: "trunk",
ExpectedStatus: "+2 ~5 -1 >1 !1", ExpectedStatus: "+3 ~5 -2 >1 !1",
}, },
} }
for _, tc := range cases { for _, tc := range cases {