diff options
Diffstat (limited to 'memex/main.go')
| -rw-r--r-- | memex/main.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/memex/main.go b/memex/main.go index c14ca7c..300b0ad 100644 --- a/memex/main.go +++ b/memex/main.go @@ -481,6 +481,7 @@ type diffArgs struct { arev string brev string paths []string + fast bool norec bool shush bool } @@ -503,7 +504,7 @@ func diffCmd(args diffArgs) int { var wa, wb Walker wa = walkRevAt(rd, args.arev, args.cur) if args.brev == "" { - wb = MakeFsDirWalker(args.cur, true) + wb = MakeFsDirWalker(args.cur, !args.fast) } else { wb = walkRevAt(rd, args.brev, args.cur) } @@ -1075,6 +1076,8 @@ var docs = map[string][]UsageAlt{ compared; if '-a' is missing REVB^ is used; if both are missing '-a' is taken to be . + -f fast mode, do not checksum file + contents -S shallow diff (stop on directories) -s silent mode, exit with code 1 if revisions differ, 0 if they @@ -1226,6 +1229,7 @@ func main() { cmd := flag.NewFlagSet("diff", flag.ContinueOnError) cmd.StringVar(&args.arev, "a", "", "") cmd.StringVar(&args.brev, "b", "", "") + cmd.BoolVar(&args.fast, "f", false, "") cmd.BoolVar(&args.norec, "S", false, "") cmd.BoolVar(&args.shush, "s", false, "") parseArgs("diff", cmd) |