mirror of
https://github.com/kopia/kopia.git
synced 2026-01-17 19:07:51 -05:00
d3f324f59b
- Use it to compare the entry attributes for all entry types. Allows comparing differences in file attributes among the contents of two directories. This is useful for verifying restored contents in end-to-end tests. - Print message about modified entries only when both entries are files and they are being compared.
75 lines
1.9 KiB
Go
75 lines
1.9 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/kopia/kopia/internal/diff"
|
|
"github.com/kopia/kopia/repo"
|
|
"github.com/kopia/kopia/snapshot/snapshotfs"
|
|
)
|
|
|
|
var (
|
|
diffCommand = app.Command("diff", "Displays differences between two repository objects (files or directories)").Alias("compare")
|
|
diffFirstObjectPath = diffCommand.Arg("object-path1", "First object/path").Required().String()
|
|
diffSecondObjectPath = diffCommand.Arg("object-path2", "Second object/path").Required().String()
|
|
diffCompareFiles = diffCommand.Flag("files", "Compare files by launching diff command for all pairs of (old,new)").Short('f').Bool()
|
|
diffCommandCommand = diffCommand.Flag("diff-command", "Displays differences between two repository objects (files or directories)").Default(defaultDiffCommand()).Envar("KOPIA_DIFF").String()
|
|
)
|
|
|
|
func runDiffCommand(ctx context.Context, rep *repo.Repository) error {
|
|
oid1, err := parseObjectID(ctx, rep, *diffFirstObjectPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
oid2, err := parseObjectID(ctx, rep, *diffSecondObjectPath)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
isDir1 := strings.HasPrefix(string(oid1), "k")
|
|
isDir2 := strings.HasPrefix(string(oid2), "k")
|
|
|
|
if isDir1 != isDir2 {
|
|
return errors.New("arguments do diff must both be directories or both non-directories")
|
|
}
|
|
|
|
d, err := diff.NewComparer(os.Stdout)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
defer d.Close() //nolint:errcheck
|
|
|
|
if *diffCompareFiles {
|
|
parts := strings.Split(*diffCommandCommand, " ")
|
|
d.DiffCommand = parts[0]
|
|
d.DiffArguments = parts[1:]
|
|
}
|
|
|
|
if isDir1 {
|
|
return d.Compare(
|
|
ctx,
|
|
snapshotfs.DirectoryEntry(rep, oid1, nil),
|
|
snapshotfs.DirectoryEntry(rep, oid2, nil),
|
|
)
|
|
}
|
|
|
|
return errors.New("comparing files not implemented yet")
|
|
}
|
|
|
|
func defaultDiffCommand() string {
|
|
if isWindows() {
|
|
return "cmp"
|
|
}
|
|
|
|
return "diff -u"
|
|
}
|
|
|
|
func init() {
|
|
diffCommand.Action(repositoryAction(runDiffCommand))
|
|
}
|