mirror of
https://github.com/dolthub/dolt.git
synced 2026-04-24 19:49:43 -05:00
Aaron Boodman
2386afc7fb
* Move samples/go/*perf-reg to go/perf/ They aren't really samples. * Move samples/go/util/check_error.go to go/d * Remove samples/go/util/client_flags.go - unused * remove httpcache.go - unused * Remove samples/go/util/rungen.go - no generated code here anymore * move NomsValueFromJSON to go/util/jsontonoms
73 lines
1.6 KiB
Go
73 lines
1.6 KiB
Go
// Copyright 2016 The Noms Authors. All rights reserved.
|
|
// Licensed under the Apache License, version 2.0:
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
package main
|
|
|
|
import (
|
|
"bufio"
|
|
"errors"
|
|
"flag"
|
|
"fmt"
|
|
"os"
|
|
|
|
"github.com/attic-labs/noms/cmd/noms-diff/diff"
|
|
"github.com/attic-labs/noms/go/d"
|
|
"github.com/attic-labs/noms/go/spec"
|
|
"github.com/attic-labs/noms/go/util/outputpager"
|
|
)
|
|
|
|
const (
|
|
addPrefix = "+ "
|
|
subPrefix = "- "
|
|
)
|
|
|
|
var (
|
|
showHelp = flag.Bool("help", false, "show help text")
|
|
)
|
|
|
|
func main() {
|
|
flag.Usage = func() {
|
|
fmt.Fprintln(os.Stderr, "Shows the difference between two objects\n")
|
|
fmt.Fprintln(os.Stderr, "Usage: noms diff <object1> <object2>\n")
|
|
flag.PrintDefaults()
|
|
fmt.Fprintf(os.Stderr, "\nSee \"Spelling Objects\" at https://github.com/attic-labs/noms/blob/master/doc/spelling.md for details on the object argument.\n\n")
|
|
}
|
|
|
|
flag.Parse()
|
|
if *showHelp {
|
|
flag.Usage()
|
|
return
|
|
}
|
|
|
|
if len(flag.Args()) != 2 {
|
|
d.CheckErrorNoUsage(errors.New("Expected exactly two arguments"))
|
|
}
|
|
|
|
db1, value1, err := spec.GetPath(flag.Arg(0))
|
|
d.CheckErrorNoUsage(err)
|
|
if value1 == nil {
|
|
d.CheckErrorNoUsage(fmt.Errorf("Object not found: %s", flag.Arg(0)))
|
|
}
|
|
defer db1.Close()
|
|
|
|
db2, value2, err := spec.GetPath(flag.Arg(1))
|
|
d.CheckErrorNoUsage(err)
|
|
if value2 == nil {
|
|
d.CheckErrorNoUsage(fmt.Errorf("Object not found: %s", flag.Arg(1)))
|
|
}
|
|
defer db2.Close()
|
|
|
|
waitChan := outputpager.PageOutput(!*outputpager.NoPager)
|
|
|
|
w := bufio.NewWriter(os.Stdout)
|
|
diff.Diff(w, value1, value2)
|
|
fmt.Fprintf(w, "\n")
|
|
w.Flush()
|
|
|
|
if waitChan != nil {
|
|
os.Stdout.Close()
|
|
<-waitChan
|
|
}
|
|
}
|