public/gotools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: public:0f8c2f76669ef12a3324720708cc700468bf1e84
Branches Tags
public:main
public:v0.0.11
public:v0.0.10
public:v0.0.9
public:v0.0.8
public:v0.0.7
public:v0.0.6
public:v0.0.5
public:v0.0.4
public:v0.0.3
public:v0.0.2
public:v0.0.1
..
compare: public:ec7a29598d469270ab085f2af03f1fa76584443b
Branches Tags
public:main
public:v0.0.11
public:v0.0.10
public:v0.0.9
public:v0.0.8
public:v0.0.7
public:v0.0.6
public:v0.0.5
public:v0.0.4
public:v0.0.3
public:v0.0.2
public:v0.0.1

No commits in common. "0f8c2f76669ef12a3324720708cc700468bf1e84" and "ec7a29598d469270ab085f2af03f1fa76584443b" have entirely different histories.
0f8c2f7666 ... ec7a29598d

1 changed files with 4 additions and 8 deletions
Show Stats Expand all files Collapse all files

12
cmd/yamldiff/yamldiff.go
View File

@ -61,19 +61,15 @@ func subtract(yaml2 yaml.MapSlice, yaml1 yaml.MapSlice) yaml.MapSlice {
v2 := item.Value v2 := item.Value
v1 := yaml1.ToMap()[k] v1 := yaml1.ToMap()[k]
switch { switch {
case v2 != nil && v1 == nil:
res = append(res, item)
case reflect.DeepEqual(v1, v2): case reflect.DeepEqual(v1, v2):
// delete is implicit by not copying to the output // delete is implicit by not copying to the output
case reflect.TypeOf(v1) == reflect.TypeOf(yaml.MapSlice{}) && case Type(v1) == Map && Type(v2) == Map:
reflect.TypeOf(v2) == reflect.TypeOf(yaml.MapSlice{}):
diff := subtract(v2.(yaml.MapSlice), v1.(yaml.MapSlice)) diff := subtract(v2.(yaml.MapSlice), v1.(yaml.MapSlice))
if len(diff) > 0 { if len(diff) > 0 {
mi := yaml.MapItem{Key: k, Value: diff} res = append(res, item)
res = append(res, mi)
} }
case Type(v1) == Slice && Type(v2) == Slice: case Type(v1) == Slice && Type(v2) == Slice:
// To be improved can be really confusing.
v2set := make(map[string]bool) v2set := make(map[string]bool)
v1set := make(map[string]bool) v1set := make(map[string]bool)
stringToValue := make(map[any]any) stringToValue := make(map[any]any)
@ -145,7 +141,7 @@ Shows the changes in <file2> compared to <file1>`,
} }
cmd.PersistentFlags().IntVarP(&VERBOSITY, "array-output-level", cmd.PersistentFlags().IntVarP(&VERBOSITY, "array-output-level",
"v", 1, "Array output level: , 1: only show changed/added values, 2 show identical as <UNMODIFIED>, 3: show all values") "v", 1, "Array output level: , 1: only show changed/added values, 2 (default) show identical as <UNMODIFIED>, 3: show all values")
cmd.Execute() cmd.Execute()
} }