mirror of
https://github.com/kopia/kopia.git
synced 2026-01-26 07:18:02 -05:00
0758a92c58
* restore: improved user experience * 'snapshot restore' is now the same as 'restore' and both will support restoring by manifest ID, root ID or root ID + subdirectory * added support for restoring individual files * implemented PR feedback and refactored object ID parsing Moving helpers inside the snapshot/ package helped clean up the code a lot.
72 lines
1.9 KiB
Go
72 lines
1.9 KiB
Go
package cli
|
|
|
|
import (
|
|
"context"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/pkg/errors"
|
|
|
|
"github.com/kopia/kopia/fs"
|
|
"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 {
|
|
ent1, err := snapshotfs.FilesystemEntryFromIDWithPath(ctx, rep, *diffFirstObjectPath, false)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
ent2, err := snapshotfs.FilesystemEntryFromIDWithPath(ctx, rep, *diffSecondObjectPath, false)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
_, isDir1 := ent1.(fs.Directory)
|
|
_, isDir2 := ent2.(fs.Directory)
|
|
|
|
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, ent1, ent2)
|
|
}
|
|
|
|
return errors.New("comparing files not implemented yet")
|
|
}
|
|
|
|
func defaultDiffCommand() string {
|
|
if isWindows() {
|
|
return "cmp"
|
|
}
|
|
|
|
return "diff -u"
|
|
}
|
|
|
|
func init() {
|
|
diffCommand.Action(repositoryAction(runDiffCommand))
|
|
}
|