diff --git a/cmd/bisync/bisync_test.go b/cmd/bisync/bisync_test.go index 42130ca26..d16e7d6a6 100644 --- a/cmd/bisync/bisync_test.go +++ b/cmd/bisync/bisync_test.go @@ -80,6 +80,12 @@ var logReplacements = []string{ `^INFO : .*?: Crypt detected! Using cryptcheck instead of check. \(Use --size-only or --ignore-checksum to disable\)$`, dropMe, // ignore drive info messages `^NOTICE:.*?Files of unknown size \(such as Google Docs\) do not sync reliably with --checksum or --size-only\. Consider using modtime instead \(the default\) or --drive-skip-gdocs.*?$`, dropMe, + // ignore differences in backend features + `^.*?"HashType1":.*?$`, dropMe, + `^.*?"HashType2":.*?$`, dropMe, + `^.*?"SlowHashDetected":.*?$`, dropMe, + `^.*? for same-side diffs on .*?$`, dropMe, + `^.*?Downloading hashes.*?$`, dropMe, } // Some dry-run messages differ depending on the particular remote. @@ -118,7 +124,7 @@ var logHoppers = []string{ // converted to "/" in every matching token to match golden logs. var logLinesWithSlash = []string{ `.*\(\d\d\) :.*(fix-names|touch-glob|touch-copy|copy-file|copy-as|copy-dir|delete-file) `, - `INFO : - .*Path[12].* +.*Queue copy to Path[12].*`, + `INFO : - .*Path[12].* +.*Queue copy to.* Path[12].*`, `INFO : Synching Path1 .*? with Path2 `, `INFO : Validating listings for `, } @@ -820,6 +826,14 @@ func (b *bisyncTest) runBisync(ctx context.Context, args []string) (err error) { require.NoError(b.t, err, "parsing max-delete=%q", val) case "size-only": ci.SizeOnly = true + case "ignore-size": + ci.IgnoreSize = true + case "checksum": + ci.CheckSum = true + opt.Compare.DownloadHash = true // allows us to test crypt and the like + case "compare-all": + opt.CompareFlag = "size,modtime,checksum" + opt.Compare.DownloadHash = true // allows us to test crypt and the like case "subdir": fs1 = addSubdir(b.path1, val) fs2 = addSubdir(b.path2, val) diff --git a/cmd/bisync/checkfn.go b/cmd/bisync/checkfn.go index a097ec559..c5d5c12b5 100644 --- a/cmd/bisync/checkfn.go +++ b/cmd/bisync/checkfn.go @@ -192,3 +192,44 @@ func WhichEqual(ctx context.Context, src, dst fs.Object, Fsrc, Fdst fs.Fs) bool } return !differ } + +// Replaces the standard Equal func with one that also considers checksum +// Note that it also updates the modtime the same way as Sync +func (b *bisyncRun) EqualFn(ctx context.Context) context.Context { + ci := fs.GetConfig(ctx) + ci.CheckSum = false // force checksum off so modtime is evaluated if needed + // modtime and size settings should already be set correctly for Equal + var equalFn operations.EqualFn = func(ctx context.Context, src fs.ObjectInfo, dst fs.Object) bool { + fs.Debugf(src, "evaluating...") + equal := false + logger, _ := operations.GetLogger(ctx) + // temporarily unset logger, we don't want Equal to duplicate it + noop := func(ctx context.Context, sigil operations.Sigil, src, dst fs.DirEntry, err error) { + fs.Debugf(src, "equal skipped") + } + ctxNoLogger := operations.WithLogger(ctx, noop) + if operations.Equal(ctxNoLogger, src, dst) { + whichHashType := func(f fs.Info) hash.Type { + ht := getHashType(f.Name()) + if ht == hash.None && b.opt.Compare.SlowHashSyncOnly && !b.opt.Resync { + ht = f.Hashes().GetOne() + } + return ht + } + srcHash, _ := src.Hash(ctx, whichHashType(src.Fs())) + dstHash, _ := dst.Hash(ctx, whichHashType(dst.Fs())) + srcHash, _ = tryDownloadHash(ctx, src, srcHash) + dstHash, _ = tryDownloadHash(ctx, dst, dstHash) + equal = !hashDiffers(srcHash, dstHash, whichHashType(src.Fs()), whichHashType(dst.Fs()), src.Size(), dst.Size()) + } + if equal { + logger(ctx, operations.Match, src, dst, nil) + fs.Debugf(src, "EqualFn: files are equal") + return true + } + logger(ctx, operations.Differ, src, dst, nil) + fs.Debugf(src, "EqualFn: files are NOT equal") + return false + } + return operations.WithEqualFn(ctx, equalFn) +} diff --git a/cmd/bisync/cmd.go b/cmd/bisync/cmd.go index 76768248e..03fabc199 100644 --- a/cmd/bisync/cmd.go +++ b/cmd/bisync/cmd.go @@ -50,6 +50,8 @@ type Options struct { Resilient bool TestFn TestFunc // test-only option, for mocking errors Retries int + Compare CompareOpt + CompareFlag string } // Default values @@ -128,6 +130,10 @@ func init() { flags.BoolVarP(cmdFlags, &Opt.IgnoreListingChecksum, "ignore-listing-checksum", "", Opt.IgnoreListingChecksum, "Do not use checksums for listings (add --ignore-checksum to additionally skip post-copy checksum checks)", "") flags.BoolVarP(cmdFlags, &Opt.Resilient, "resilient", "", Opt.Resilient, "Allow future runs to retry after certain less-serious errors, instead of requiring --resync. Use at your own risk!", "") flags.IntVarP(cmdFlags, &Opt.Retries, "retries", "", Opt.Retries, "Retry operations this many times if they fail", "") + flags.StringVarP(cmdFlags, &Opt.CompareFlag, "compare", "", Opt.CompareFlag, "Comma-separated list of bisync-specific compare options ex. 'size,modtime,checksum' (default: 'size,modtime')", "") + flags.BoolVarP(cmdFlags, &Opt.Compare.NoSlowHash, "no-slow-hash", "", Opt.Compare.NoSlowHash, "Ignore listing checksums only on backends where they are slow", "") + flags.BoolVarP(cmdFlags, &Opt.Compare.SlowHashSyncOnly, "slow-hash-sync-only", "", Opt.Compare.SlowHashSyncOnly, "Ignore slow checksums for listings and deltas, but still consider them during sync calls.", "") + flags.BoolVarP(cmdFlags, &Opt.Compare.DownloadHash, "download-hash", "", Opt.Compare.DownloadHash, "Compute hash by downloading when otherwise unavailable. (warning: may be slow and use lots of data!)", "") } // bisync command definition diff --git a/cmd/bisync/compare.go b/cmd/bisync/compare.go new file mode 100644 index 000000000..de7a41ac2 --- /dev/null +++ b/cmd/bisync/compare.go @@ -0,0 +1,309 @@ +package bisync + +import ( + "context" + "errors" + "fmt" + "strings" + mutex "sync" + "time" + + "github.com/rclone/rclone/fs" + "github.com/rclone/rclone/fs/accounting" + "github.com/rclone/rclone/fs/hash" + "github.com/rclone/rclone/fs/operations" + "github.com/rclone/rclone/lib/terminal" +) + +// CompareOpt describes the Compare options in force +type CompareOpt = struct { + Modtime bool + Size bool + Checksum bool + HashType1 hash.Type + HashType2 hash.Type + NoSlowHash bool + SlowHashSyncOnly bool + SlowHashDetected bool + DownloadHash bool +} + +func (b *bisyncRun) setCompareDefaults(ctx context.Context) error { + ci := fs.GetConfig(ctx) + + // defaults + b.opt.Compare.Size = true + b.opt.Compare.Modtime = true + b.opt.Compare.Checksum = false + + if ci.SizeOnly { + b.opt.Compare.Size = true + b.opt.Compare.Modtime = false + b.opt.Compare.Checksum = false + } else if ci.CheckSum && !b.opt.IgnoreListingChecksum { + b.opt.Compare.Size = true + b.opt.Compare.Modtime = false + b.opt.Compare.Checksum = true + } + + if ci.IgnoreSize { + b.opt.Compare.Size = false + } + + err = b.setFromCompareFlag(ctx) + if err != nil { + return err + } + + if b.fs1.Features().SlowHash || b.fs2.Features().SlowHash { + b.opt.Compare.SlowHashDetected = true + } + if b.opt.Compare.Checksum && !b.opt.IgnoreListingChecksum { + b.setHashType(ci) + } + + // Checks and Warnings + if b.opt.Compare.SlowHashSyncOnly && b.opt.Compare.SlowHashDetected && b.opt.Resync { + fs.Logf(nil, Color(terminal.Dim, "Ignoring checksums during --resync as --slow-hash-sync-only is set.")) + ci.CheckSum = false + // note not setting b.opt.Compare.Checksum = false as we still want to build listings on the non-slow side, if any + } else if b.opt.Compare.Checksum && !ci.CheckSum { + fs.Logf(nil, Color(terminal.YellowFg, "WARNING: Checksums will be compared for deltas but not during sync as --checksum is not set.")) + } + if b.opt.Compare.Modtime && (b.fs1.Precision() == fs.ModTimeNotSupported || b.fs2.Precision() == fs.ModTimeNotSupported) { + fs.Logf(nil, Color(terminal.YellowFg, "WARNING: Modtime compare was requested but at least one remote does not support it. It is recommended to use --checksum or --size-only instead.")) + } + if (ci.CheckSum || b.opt.Compare.Checksum) && b.opt.IgnoreListingChecksum { + if (b.opt.Compare.HashType1 == hash.None || b.opt.Compare.HashType2 == hash.None) && !b.opt.Compare.DownloadHash { + fs.Logf(nil, Color(terminal.YellowFg, `WARNING: Checksum compare was requested but at least one remote does not support checksums (or checksums are being ignored) and --ignore-listing-checksum is set. + Ignoring Checksums globally and falling back to --compare modtime,size for sync. (Use --compare size or --size-only to ignore modtime). Path1 (%s): %s, Path2 (%s): %s`), + b.fs1.String(), b.opt.Compare.HashType1.String(), b.fs2.String(), b.opt.Compare.HashType2.String()) + b.opt.Compare.Modtime = true + b.opt.Compare.Size = true + ci.CheckSum = false + b.opt.Compare.Checksum = false + } else { + fs.Logf(nil, Color(terminal.YellowFg, "WARNING: Ignoring checksum for deltas as --ignore-listing-checksum is set")) + // note: --checksum will still affect the internal sync calls + } + } + if !ci.CheckSum && !b.opt.Compare.Checksum && !b.opt.IgnoreListingChecksum { + fs.Infof(nil, Color(terminal.Dim, "Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.")) + b.opt.IgnoreListingChecksum = true + } + if !b.opt.Compare.Size && !b.opt.Compare.Modtime && !b.opt.Compare.Checksum { + return errors.New(Color(terminal.RedFg, "must set a Compare method. (size, modtime, and checksum can't all be false.)")) + } + + notSupported := func(label string, value bool, opt *bool) { + if value { + fs.Logf(nil, Color(terminal.YellowFg, "WARNING: %s is set but bisync does not support it. It will be ignored."), label) + *opt = false + } + } + notSupported("--update", ci.UpdateOlder, &ci.UpdateOlder) + notSupported("--no-check-dest", ci.NoCheckDest, &ci.NoCheckDest) + notSupported("--no-traverse", ci.NoTraverse, &ci.NoTraverse) + // TODO: thorough search for other flags that should be on this list... + + prettyprint(b.opt.Compare, "Bisyncing with Comparison Settings", fs.LogLevelInfo) + return nil +} + +// returns true if the sizes are definitely different. +// returns false if equal, or if either is unknown. +func sizeDiffers(a, b int64) bool { + if a < 0 || b < 0 { + return false + } + return a != b +} + +// returns true if the hashes are definitely different. +// returns false if equal, or if either is unknown. +func hashDiffers(a, b string, ht1, ht2 hash.Type, size1, size2 int64) bool { + if a == "" || b == "" { + if ht1 != hash.None && ht2 != hash.None && !(size1 <= 0 || size2 <= 0) { + fs.Logf(nil, Color(terminal.YellowFg, "WARNING: hash unexpectedly blank despite Fs support (%s, %s) (you may need to --resync!)"), a, b) + } + return false + } + if ht1 != ht2 { + if !(downloadHash && ((ht1 == hash.MD5 && ht2 == hash.None) || (ht1 == hash.None && ht2 == hash.MD5))) { + fs.Infof(nil, Color(terminal.YellowFg, "WARNING: Can't compare hashes of different types (%s, %s)"), ht1.String(), ht2.String()) + return false + } + } + return a != b +} + +// chooses hash type, giving priority to types both sides have in common +func (b *bisyncRun) setHashType(ci *fs.ConfigInfo) { + downloadHash = b.opt.Compare.DownloadHash + if b.opt.Compare.NoSlowHash && b.opt.Compare.SlowHashDetected { + fs.Infof(nil, "Not checking for common hash as at least one slow hash detected.") + } else { + common := b.fs1.Hashes().Overlap(b.fs2.Hashes()) + if common.Count() > 0 && common.GetOne() != hash.None { + ht := common.GetOne() + b.opt.Compare.HashType1 = ht + b.opt.Compare.HashType2 = ht + if !b.opt.Compare.SlowHashSyncOnly || !b.opt.Compare.SlowHashDetected { + return + } + } else if b.opt.Compare.SlowHashSyncOnly && b.opt.Compare.SlowHashDetected { + fs.Logf(b.fs2, Color(terminal.YellowFg, "Ignoring --slow-hash-sync-only and falling back to --no-slow-hash as Path1 and Path2 have no hashes in common.")) + b.opt.Compare.SlowHashSyncOnly = false + b.opt.Compare.NoSlowHash = true + ci.CheckSum = false + } + } + + if !b.opt.Compare.DownloadHash && !b.opt.Compare.SlowHashSyncOnly { + fs.Logf(b.fs2, Color(terminal.YellowFg, "--checksum is in use but Path1 and Path2 have no hashes in common; falling back to --compare modtime,size for sync. (Use --compare size or --size-only to ignore modtime)")) + fs.Infof("Path1 hashes", "%v", b.fs1.Hashes().String()) + fs.Infof("Path2 hashes", "%v", b.fs2.Hashes().String()) + b.opt.Compare.Modtime = true + b.opt.Compare.Size = true + ci.CheckSum = false + } + if (b.opt.Compare.NoSlowHash || b.opt.Compare.SlowHashSyncOnly) && b.fs1.Features().SlowHash { + fs.Infof(nil, Color(terminal.YellowFg, "Slow hash detected on Path1. Will ignore checksum due to slow-hash settings")) + b.opt.Compare.HashType1 = hash.None + } else { + b.opt.Compare.HashType1 = b.fs1.Hashes().GetOne() + if b.opt.Compare.HashType1 != hash.None { + fs.Logf(b.fs1, Color(terminal.YellowFg, "will use %s for same-side diffs on Path1 only"), b.opt.Compare.HashType1) + } + } + if (b.opt.Compare.NoSlowHash || b.opt.Compare.SlowHashSyncOnly) && b.fs2.Features().SlowHash { + fs.Infof(nil, Color(terminal.YellowFg, "Slow hash detected on Path2. Will ignore checksum due to slow-hash settings")) + b.opt.Compare.HashType1 = hash.None + } else { + b.opt.Compare.HashType2 = b.fs2.Hashes().GetOne() + if b.opt.Compare.HashType2 != hash.None { + fs.Logf(b.fs2, Color(terminal.YellowFg, "will use %s for same-side diffs on Path2 only"), b.opt.Compare.HashType2) + } + } + if b.opt.Compare.HashType1 == hash.None && b.opt.Compare.HashType2 == hash.None && !b.opt.Compare.DownloadHash { + fs.Logf(nil, Color(terminal.YellowFg, "WARNING: Ignoring checksums globally as hashes are ignored or unavailable on both sides.")) + b.opt.Compare.Checksum = false + ci.CheckSum = false + b.opt.IgnoreListingChecksum = true + } +} + +// returns true if the times are definitely different (by more than the modify window). +// returns false if equal, within modify window, or if either is unknown. +// considers precision per-Fs. +func timeDiffers(ctx context.Context, a, b time.Time, fsA, fsB fs.Info) bool { + modifyWindow := fs.GetModifyWindow(ctx, fsA, fsB) + if modifyWindow == fs.ModTimeNotSupported { + return false + } + if a.IsZero() || b.IsZero() { + fs.Logf(fsA, "Fs supports modtime, but modtime is missing") + return false + } + dt := b.Sub(a) + if dt < modifyWindow && dt > -modifyWindow { + fs.Debugf(a, "modification time the same (differ by %s, within tolerance %s)", dt, modifyWindow) + return false + } + + fs.Debugf(a, "Modification times differ by %s: %v, %v", dt, a, b) + return true +} + +func (b *bisyncRun) setFromCompareFlag(ctx context.Context) error { + if b.opt.CompareFlag == "" { + return nil + } + var CompareFlag CompareOpt // for exlcusions + opts := strings.Split(b.opt.CompareFlag, ",") + for _, opt := range opts { + switch strings.ToLower(strings.TrimSpace(opt)) { + case "size": + b.opt.Compare.Size = true + CompareFlag.Size = true + case "modtime": + b.opt.Compare.Modtime = true + CompareFlag.Modtime = true + case "checksum": + b.opt.Compare.Checksum = true + CompareFlag.Checksum = true + default: + return fmt.Errorf(Color(terminal.RedFg, "unknown compare option: %s (must be size, modtime, or checksum)"), opt) + } + } + + // exclusions (override defaults, only if --compare != "") + if !CompareFlag.Size { + b.opt.Compare.Size = false + } + if !CompareFlag.Modtime { + b.opt.Compare.Modtime = false + } + if !CompareFlag.Checksum { + b.opt.Compare.Checksum = false + } + + // override sync flags to match + ci := fs.GetConfig(ctx) + if b.opt.Compare.Checksum { + ci.CheckSum = true + } + if b.opt.Compare.Modtime && !b.opt.Compare.Checksum { + ci.CheckSum = false + } + if !b.opt.Compare.Size { + ci.IgnoreSize = true + } + if !b.opt.Compare.Modtime { + ci.UseServerModTime = true + } + if b.opt.Compare.Size && !b.opt.Compare.Modtime && !b.opt.Compare.Checksum { + ci.SizeOnly = true + } + + return nil +} + +// downloadHash is true if we should attempt to compute hash by downloading when otherwise unavailable +var downloadHash bool +var downloadHashWarn mutex.Once +var firstDownloadHash mutex.Once + +func tryDownloadHash(ctx context.Context, o fs.DirEntry, hashVal string) (string, error) { + if hashVal != "" || !downloadHash { + return hashVal, nil + } + obj, ok := o.(fs.Object) + if !ok { + fs.Infof(o, "failed to download hash -- not an fs.Object") + return hashVal, fs.ErrorObjectNotFound + } + if o.Size() < 0 { + downloadHashWarn.Do(func() { + fs.Logf(o, Color(terminal.YellowFg, "Skipping hash download as checksum not reliable with files of unknown length.")) + }) + fs.Debugf(o, "Skipping hash download as checksum not reliable with files of unknown length.") + return hashVal, hash.ErrUnsupported + } + + firstDownloadHash.Do(func() { + fs.Infof(obj.Fs().Name(), Color(terminal.Dim, "Downloading hashes...")) + }) + tr := accounting.Stats(ctx).NewCheckingTransfer(o, "computing hash with --download-hash") + defer func() { + tr.Done(ctx, nil) + }() + + sum, err := operations.HashSum(ctx, hash.MD5, false, true, obj) + if err != nil { + fs.Infof(o, "DownloadHash -- hash: %v, err: %v", sum, err) + } else { + fs.Debugf(o, "DownloadHash -- hash: %v", sum) + } + return sum, err +} diff --git a/cmd/bisync/deltas.go b/cmd/bisync/deltas.go index d441ca404..9a93bd7b7 100644 --- a/cmd/bisync/deltas.go +++ b/cmd/bisync/deltas.go @@ -13,6 +13,7 @@ import ( "github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs/filter" "github.com/rclone/rclone/fs/operations" + "github.com/rclone/rclone/lib/terminal" "golang.org/x/text/unicode/norm" ) @@ -24,14 +25,17 @@ const ( deltaNew delta = 1 << iota deltaNewer deltaOlder - deltaSize + deltaLarger + deltaSmaller deltaHash deltaDeleted ) const ( - deltaModified delta = deltaNewer | deltaOlder | deltaSize | deltaHash | deltaDeleted - deltaOther delta = deltaNew | deltaNewer | deltaOlder + deltaSize delta = deltaLarger | deltaSmaller + deltaTime delta = deltaNewer | deltaOlder + deltaModified delta = deltaTime | deltaSize | deltaHash + deltaOther delta = deltaNew | deltaTime | deltaSize | deltaHash ) func (d delta) is(cond delta) bool { @@ -41,6 +45,8 @@ func (d delta) is(cond delta) bool { // deltaSet type deltaSet struct { deltas map[string]delta + size map[string]int64 + hash map[string]string opt *Options fs fs.Fs // base filesystem msg string // filesystem name for logging @@ -72,25 +78,71 @@ func (ds *deltaSet) printStats() { } nAll := len(ds.deltas) nNew := 0 + nMod := 0 + nTime := 0 nNewer := 0 nOlder := 0 + nSize := 0 + nLarger := 0 + nSmaller := 0 + nHash := 0 nDeleted := 0 for _, d := range ds.deltas { if d.is(deltaNew) { nNew++ } + if d.is(deltaModified) { + nMod++ + } + if d.is(deltaTime) { + nTime++ + } if d.is(deltaNewer) { nNewer++ } if d.is(deltaOlder) { nOlder++ } + if d.is(deltaSize) { + nSize++ + } + if d.is(deltaLarger) { + nLarger++ + } + if d.is(deltaSmaller) { + nSmaller++ + } + if d.is(deltaHash) { + nHash++ + } if d.is(deltaDeleted) { nDeleted++ } } - fs.Infof(nil, "%s: %4d changes: %4d new, %4d newer, %4d older, %4d deleted", - ds.msg, nAll, nNew, nNewer, nOlder, nDeleted) + if nAll != nNew+nMod+nDeleted { + fs.Errorf(nil, "something doesn't add up! %4d != %4d + %4d + %4d", nAll, nNew, nMod, nDeleted) + } + fs.Infof(nil, "%s: %4d changes: "+Color(terminal.GreenFg, "%4d new")+", "+Color(terminal.YellowFg, "%4d modified")+", "+Color(terminal.RedFg, "%4d deleted"), + ds.msg, nAll, nNew, nMod, nDeleted) + if nMod > 0 { + details := []string{} + if nTime > 0 { + details = append(details, fmt.Sprintf(Color(terminal.CyanFg, "%4d newer"), nNewer)) + details = append(details, fmt.Sprintf(Color(terminal.BlueFg, "%4d older"), nOlder)) + } + if nSize > 0 { + details = append(details, fmt.Sprintf(Color(terminal.CyanFg, "%4d larger"), nLarger)) + details = append(details, fmt.Sprintf(Color(terminal.BlueFg, "%4d smaller"), nSmaller)) + } + if nHash > 0 { + details = append(details, fmt.Sprintf(Color(terminal.CyanFg, "%4d hash differs"), nHash)) + } + if (nNewer+nOlder != nTime) || (nLarger+nSmaller != nSize) || (nMod > nTime+nSize+nHash) { + fs.Errorf(nil, "something doesn't add up!") + } + + fs.Infof(nil, "(%s: %s)", Color(terminal.YellowFg, "Modified"), strings.Join(details, ", ")) + } } // findDeltas @@ -117,6 +169,8 @@ func (b *bisyncRun) findDeltas(fctx context.Context, f fs.Fs, oldListing string, ds = &deltaSet{ deltas: map[string]delta{}, + size: map[string]int64{}, + hash: map[string]string{}, fs: f, msg: msg, oldCount: len(old.list), @@ -125,31 +179,70 @@ func (b *bisyncRun) findDeltas(fctx context.Context, f fs.Fs, oldListing string, } for _, file := range old.list { + // REMEMBER: this section is only concerned with comparing listings from the same side (not different sides) d := deltaZero + s := int64(0) + h := "" if !now.has(file) { - b.indent(msg, file, "File was deleted") + b.indent(msg, file, Color(terminal.RedFg, "File was deleted")) ds.deleted++ d |= deltaDeleted } else { // skip dirs here, as we only care if they are new/deleted, not newer/older if !now.isDir(file) { - if old.getTime(file) != now.getTime(file) { - if old.beforeOther(now, file) { - fs.Debugf(file, "(old: %v current: %v", old.getTime(file), now.getTime(file)) - b.indent(msg, file, "File is newer") - d |= deltaNewer - } else { // Current version is older than prior sync. - fs.Debugf(file, "(old: %v current: %v", old.getTime(file), now.getTime(file)) - b.indent(msg, file, "File is OLDER") - d |= deltaOlder + whatchanged := []string{} + if b.opt.Compare.Size { + if sizeDiffers(old.getSize(file), now.getSize(file)) { + fs.Debugf(file, "(old: %v current: %v)", old.getSize(file), now.getSize(file)) + if now.getSize(file) > old.getSize(file) { + whatchanged = append(whatchanged, Color(terminal.MagentaFg, "size (larger)")) + d |= deltaLarger + } else { + whatchanged = append(whatchanged, Color(terminal.MagentaFg, "size (smaller)")) + d |= deltaSmaller + } + s = now.getSize(file) } } - // TODO Compare sizes and hashes + if b.opt.Compare.Modtime { + if timeDiffers(fctx, old.getTime(file), now.getTime(file), f, f) { + if old.beforeOther(now, file) { + fs.Debugf(file, "(old: %v current: %v)", old.getTime(file), now.getTime(file)) + whatchanged = append(whatchanged, Color(terminal.MagentaFg, "time (newer)")) + d |= deltaNewer + } else { // Current version is older than prior sync. + fs.Debugf(file, "(old: %v current: %v)", old.getTime(file), now.getTime(file)) + whatchanged = append(whatchanged, Color(terminal.MagentaFg, "time (older)")) + d |= deltaOlder + } + } + } + if b.opt.Compare.Checksum { + if hashDiffers(old.getHash(file), now.getHash(file), old.hash, now.hash, old.getSize(file), now.getSize(file)) { + fs.Debugf(file, "(old: %v current: %v)", old.getHash(file), now.getHash(file)) + whatchanged = append(whatchanged, Color(terminal.MagentaFg, "hash")) + d |= deltaHash + h = now.getHash(file) + } + } + // concat changes and print log + if d.is(deltaModified) { + summary := fmt.Sprintf(Color(terminal.YellowFg, "File changed: %s"), strings.Join(whatchanged, ", ")) + b.indent(msg, file, summary) + } } } if d.is(deltaModified) { ds.deltas[file] = d + if b.opt.Compare.Size { + ds.size[file] = s + } + if b.opt.Compare.Checksum { + ds.hash[file] = h + } + } else if d.is(deltaDeleted) { + ds.deltas[file] = d } else { // Once we've found at least one unchanged file, // we know that not everything has changed, @@ -160,8 +253,14 @@ func (b *bisyncRun) findDeltas(fctx context.Context, f fs.Fs, oldListing string, for _, file := range now.list { if !old.has(file) { - b.indent(msg, file, "File is new") + b.indent(msg, file, Color(terminal.GreenFg, "File is new")) ds.deltas[file] = deltaNew + if b.opt.Compare.Size { + ds.size[file] = now.getSize(file) + } + if b.opt.Compare.Checksum { + ds.hash[file] = now.getHash(file) + } } } @@ -234,20 +333,28 @@ func (b *bisyncRun) applyDeltas(ctx context.Context, ds1, ds2 *deltaSet) (change d1 := ds1.deltas[file] if d1.is(deltaOther) { d2, in2 := ds2.deltas[file] + file2 := file if !in2 && file != alias { d2 = ds2.deltas[alias] + file2 = alias } if d2.is(deltaOther) { - checkit := func(filename string) { - if err := filterCheck.AddFile(filename); err != nil { - fs.Debugf(nil, "Non-critical error adding file to list of potential conflicts to check: %s", err) - } else { - fs.Debugf(nil, "Added file to list of potential conflicts to check: %s", filename) + // if size or hash differ, skip this, as we already know they're not equal + if (b.opt.Compare.Size && sizeDiffers(ds1.size[file], ds2.size[file2])) || + (b.opt.Compare.Checksum && hashDiffers(ds1.hash[file], ds2.hash[file2], b.opt.Compare.HashType1, b.opt.Compare.HashType2, ds1.size[file], ds2.size[file2])) { + fs.Debugf(file, "skipping equality check as size/hash definitely differ") + } else { + checkit := func(filename string) { + if err := filterCheck.AddFile(filename); err != nil { + fs.Debugf(nil, "Non-critical error adding file to list of potential conflicts to check: %s", err) + } else { + fs.Debugf(nil, "Added file to list of potential conflicts to check: %s", filename) + } + } + checkit(file) + if file != alias { + checkit(alias) } - } - checkit(file) - if file != alias { - checkit(alias) } } } @@ -294,6 +401,17 @@ func (b *bisyncRun) applyDeltas(ctx context.Context, ds1, ds2 *deltaSet) (change // the Path1 version is deemed "correct" in this scenario fs.Infof(alias, "Files are equal but will copy anyway to fix case to %s", file) copy1to2.Add(file) + } else if b.opt.Compare.Modtime && timeDiffers(ctx, ls1.getTime(ls1.getTryAlias(file, alias)), ls2.getTime(ls2.getTryAlias(file, alias)), b.fs1, b.fs2) { + fs.Infof(file, "Files are equal but will copy anyway to update modtime (will not rename)") + if ls1.getTime(ls1.getTryAlias(file, alias)).Before(ls2.getTime(ls2.getTryAlias(file, alias))) { + // Path2 is newer + b.indent("Path2", p1, "Queue copy to Path1") + copy2to1.Add(ls2.getTryAlias(file, alias)) + } else { + // Path1 is newer + b.indent("Path1", p2, "Queue copy to Path2") + copy1to2.Add(ls1.getTryAlias(file, alias)) + } } else { fs.Infof(nil, "Files are equal! Skipping: %s", file) renameSkipped.Add(file) diff --git a/cmd/bisync/listing.go b/cmd/bisync/listing.go index 20f2fa00b..c037f7162 100644 --- a/cmd/bisync/listing.go +++ b/cmd/bisync/listing.go @@ -141,6 +141,15 @@ func (ls *fileList) put(file string, size int64, modtime time.Time, hash, id str } } +func (ls *fileList) getTryAlias(file, alias string) string { + if ls.has(file) { + return file + } else if ls.has(alias) { + return alias + } + return "" +} + func (ls *fileList) getTime(file string) time.Time { fi := ls.get(file) if fi == nil { @@ -149,6 +158,48 @@ func (ls *fileList) getTime(file string) time.Time { return fi.time } +func (ls *fileList) getSize(file string) int64 { + fi := ls.get(file) + if fi == nil { + return 0 + } + return fi.size +} + +func (ls *fileList) getHash(file string) string { + fi := ls.get(file) + if fi == nil { + return "" + } + return fi.hash +} + +func (b *bisyncRun) fileInfoEqual(file1, file2 string, ls1, ls2 *fileList) bool { + equal := true + if ls1.isDir(file1) && ls2.isDir(file2) { + return equal + } + if b.opt.Compare.Size { + if sizeDiffers(ls1.getSize(file1), ls2.getSize(file2)) { + b.indent("ERROR", file1, fmt.Sprintf("Size not equal in listing. Path1: %v, Path2: %v", ls1.getSize(file1), ls2.getSize(file2))) + equal = false + } + } + if b.opt.Compare.Modtime { + if timeDiffers(b.fctx, ls1.getTime(file1), ls2.getTime(file2), b.fs1, b.fs2) { + b.indent("ERROR", file1, fmt.Sprintf("Modtime not equal in listing. Path1: %v, Path2: %v", ls1.getTime(file1), ls2.getTime(file2))) + equal = false + } + } + if b.opt.Compare.Checksum && !ignoreListingChecksum { + if hashDiffers(ls1.getHash(file1), ls2.getHash(file2), b.opt.Compare.HashType1, b.opt.Compare.HashType2, ls1.getSize(file1), ls2.getSize(file2)) { + b.indent("ERROR", file1, fmt.Sprintf("Checksum not equal in listing. Path1: %v, Path2: %v", ls1.getHash(file1), ls2.getHash(file2))) + equal = false + } + } + return equal +} + // also returns false if not found func (ls *fileList) isDir(file string) bool { fi := ls.get(file) @@ -418,8 +469,8 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res } fs.Debugf(nil, "updating %s", direction) - fs.Debugf(nil, "RESULTS: %v", results) - fs.Debugf(nil, "QUEUE: %v", queue) + prettyprint(results, "results", fs.LogLevelDebug) + prettyprint(queue, "queue", fs.LogLevelDebug) srcListing, dstListing := b.getListingNames(is1to2) srcList, err := b.loadListing(srcListing) @@ -432,8 +483,19 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res } // set list hash type if b.opt.Resync && !b.opt.IgnoreListingChecksum { - srcList.hash = src.Hashes().GetOne() - dstList.hash = dst.Hashes().GetOne() + if is1to2 { + srcList.hash = b.opt.Compare.HashType1 + dstList.hash = b.opt.Compare.HashType2 + } else { + srcList.hash = b.opt.Compare.HashType2 + dstList.hash = b.opt.Compare.HashType1 + } + if b.opt.Compare.DownloadHash && srcList.hash == hash.None { + srcList.hash = hash.MD5 + } + if b.opt.Compare.DownloadHash && dstList.hash == hash.None { + dstList.hash = hash.MD5 + } } srcWinners := newFileList() @@ -457,13 +519,13 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res // build src winners list if result.IsSrc && result.Src != "" && (result.Winner.Err == nil || result.Flags == "d") { srcWinners.put(result.Name, result.Size, ConvertPrecision(result.Modtime, src), result.Hash, "-", result.Flags) - fs.Debugf(nil, "winner: copy to src: %v", result) + prettyprint(result, "winner: copy to src", fs.LogLevelDebug) } // build dst winners list if result.IsWinner && result.Winner.Side != "none" && (result.Winner.Err == nil || result.Flags == "d") { dstWinners.put(result.Name, result.Size, ConvertPrecision(result.Modtime, dst), result.Hash, "-", result.Flags) - fs.Debugf(nil, "winner: copy to dst: %v", result) + prettyprint(result, "winner: copy to dst", fs.LogLevelDebug) } // build errors list @@ -597,13 +659,9 @@ func (b *bisyncRun) modifyListing(ctx context.Context, src fs.Fs, dst fs.Fs, res // update files err = srcList.save(ctx, srcListing) - if err != nil { - b.abort = true - } + b.handleErr(srcList, "error saving srcList from modifyListing", err, true, true) err = dstList.save(ctx, dstListing) - if err != nil { - b.abort = true - } + b.handleErr(dstList, "error saving dstList from modifyListing", err, true, true) return err } @@ -626,15 +684,20 @@ func (b *bisyncRun) recheck(ctxRecheck context.Context, src, dst fs.Fs, srcList, fs.Debugf(dst, "error recchecking dst obj: %v", err) } - putObj := func(obj fs.Object, f fs.Fs, list *fileList) { + putObj := func(obj fs.Object, list *fileList) { hashVal := "" if !b.opt.IgnoreListingChecksum { - hashType := f.Hashes().GetOne() + hashType := list.hash if hashType != hash.None { hashVal, _ = obj.Hash(ctxRecheck, hashType) } + hashVal, _ = tryDownloadHash(ctxRecheck, obj, hashVal) } - list.put(obj.Remote(), obj.Size(), obj.ModTime(ctxRecheck), hashVal, "-", "-") + var modtime time.Time + if b.opt.Compare.Modtime { + modtime = obj.ModTime(ctxRecheck).In(TZ) + } + list.put(obj.Remote(), obj.Size(), modtime, hashVal, "-", "-") } for _, srcObj := range srcObjs { @@ -643,8 +706,8 @@ func (b *bisyncRun) recheck(ctxRecheck context.Context, src, dst fs.Fs, srcList, if srcObj.Remote() == dstObj.Remote() || srcObj.Remote() == b.aliases.Alias(dstObj.Remote()) { // note: unlike Equal(), WhichEqual() does not update the modtime in dest if sums match but modtimes don't. if b.opt.DryRun || WhichEqual(ctxRecheck, srcObj, dstObj, src, dst) { - putObj(srcObj, src, srcList) - putObj(dstObj, dst, dstList) + putObj(srcObj, srcList) + putObj(dstObj, dstList) resolved = append(resolved, srcObj.Remote()) } else { fs.Infof(srcObj, "files not equal on recheck: %v %v", srcObj, dstObj) diff --git a/cmd/bisync/log.go b/cmd/bisync/log.go index 29bf51338..efc91eaed 100644 --- a/cmd/bisync/log.go +++ b/cmd/bisync/log.go @@ -1,6 +1,7 @@ package bisync import ( + "encoding/json" "fmt" "runtime" "strconv" @@ -28,8 +29,14 @@ func (b *bisyncRun) indent(tag, file, msg string) { logf = fs.Logf } - tag = Color(terminal.BlueFg, tag) + if tag == "Path1" { + tag = Color(terminal.CyanFg, "Path1") + } else { + tag = Color(terminal.BlueFg, tag) + } msg = Color(terminal.MagentaFg, msg) + msg = strings.Replace(msg, "Queue copy to", Color(terminal.GreenFg, "Queue copy to"), -1) + msg = strings.Replace(msg, "Queue delete", Color(terminal.RedFg, "Queue delete"), -1) file = Color(terminal.CyanFg, escapePath(file, false)) logf(nil, "- %-18s%-43s - %s", tag, msg, file) } @@ -64,3 +71,16 @@ func Color(style string, s string) string { func encode(s string) string { return encoder.OS.ToStandardPath(encoder.OS.FromStandardPath(s)) } + +// prettyprint formats JSON for improved readability in debug logs +func prettyprint(in any, label string, level fs.LogLevel) { + inBytes, err := json.MarshalIndent(in, "", "\t") + if err != nil { + fs.Debugf(nil, "failed to marshal input: %v", err) + } + if level == fs.LogLevelDebug { + fs.Debugf(nil, "%s: \n%s\n", label, string(inBytes)) + } else if level == fs.LogLevelInfo { + fs.Infof(nil, "%s: \n%s\n", label, string(inBytes)) + } +} diff --git a/cmd/bisync/march.go b/cmd/bisync/march.go index 95f4efeb9..79784fc41 100644 --- a/cmd/bisync/march.go +++ b/cmd/bisync/march.go @@ -3,6 +3,7 @@ package bisync import ( "context" "sync" + "time" "github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs/accounting" @@ -45,18 +46,21 @@ func (b *bisyncRun) makeMarchListing(ctx context.Context) (*fileList, *fileList, err = firstErr } if err != nil { + b.handleErr("march", "error during march", err, true, true) b.abort = true } // save files + if b.opt.Compare.DownloadHash && ls1.hash == hash.None { + ls1.hash = hash.MD5 + } + if b.opt.Compare.DownloadHash && ls2.hash == hash.None { + ls2.hash = hash.MD5 + } err = ls1.save(ctx, b.newListing1) - if err != nil { - b.abort = true - } + b.handleErr(ls1, "error saving ls1 from march", err, true, true) err = ls2.save(ctx, b.newListing2) - if err != nil { - b.abort = true - } + b.handleErr(ls2, "error saving ls2 from march", err, true, true) return ls1, ls2, err } @@ -117,18 +121,10 @@ func (b *bisyncRun) setupListing() { ls1 = newFileList() ls2 = newFileList() - hashType1 := hash.None - hashType2 := hash.None - if !b.opt.IgnoreListingChecksum { - // Currently bisync just honors --ignore-listing-checksum - // (note that this is different from --ignore-checksum) - // TODO add full support for checksums and related flags - hashType1 = b.fs1.Hashes().GetOne() - hashType2 = b.fs2.Hashes().GetOne() - } - - ls1.hash = hashType1 - ls2.hash = hashType2 + // note that --ignore-listing-checksum is different from --ignore-checksum + // and we already checked it when we set b.opt.Compare.HashType1 and 2 + ls1.hash = b.opt.Compare.HashType1 + ls2.hash = b.opt.Compare.HashType2 } func (b *bisyncRun) ForObject(o fs.Object, isPath1 bool) { @@ -150,11 +146,24 @@ func (b *bisyncRun) ForObject(o fs.Object, isPath1 bool) { } marchErrLock.Unlock() } - time := o.ModTime(marchCtx).In(TZ) + hashVal, hashErr = tryDownloadHash(marchCtx, o, hashVal) + marchErrLock.Lock() + if firstErr == nil { + firstErr = hashErr + } + if firstErr != nil { + b.handleErr(hashType, "error hashing during march", firstErr, false, true) + } + marchErrLock.Unlock() + + var modtime time.Time + if b.opt.Compare.Modtime { + modtime = o.ModTime(marchCtx).In(TZ) + } id := "" // TODO flags := "-" // "-" for a file and "d" for a directory marchLsLock.Lock() - ls.put(o.Remote(), o.Size(), time, hashVal, id, flags) + ls.put(o.Remote(), o.Size(), modtime, hashVal, id, flags) marchLsLock.Unlock() } @@ -164,11 +173,14 @@ func (b *bisyncRun) ForDir(o fs.Directory, isPath1 bool) { tr.Done(marchCtx, nil) }() ls := whichLs(isPath1) - time := o.ModTime(marchCtx).In(TZ) + var modtime time.Time + if b.opt.Compare.Modtime { + modtime = o.ModTime(marchCtx).In(TZ) + } id := "" // TODO flags := "d" // "-" for a file and "d" for a directory marchLsLock.Lock() - ls.put(o.Remote(), -1, time, "", id, flags) + ls.put(o.Remote(), -1, modtime, "", id, flags) marchLsLock.Unlock() } @@ -217,6 +229,7 @@ func (b *bisyncRun) findCheckFiles(ctx context.Context) (*fileList, *fileList, e err = firstErr } if err != nil { + b.handleErr("march", "error during findCheckFiles", err, true, true) b.abort = true } diff --git a/cmd/bisync/operations.go b/cmd/bisync/operations.go index e7c56c2f3..893b9ca86 100644 --- a/cmd/bisync/operations.go +++ b/cmd/bisync/operations.go @@ -55,6 +55,7 @@ type queues struct { // Bisync handles lock file, performs bisync run and checks exit status func Bisync(ctx context.Context, fs1, fs2 fs.Fs, optArg *Options) (err error) { + defer resetGlobals() opt := *optArg // ensure that input is never changed b := &bisyncRun{ fs1: fs1, @@ -71,13 +72,9 @@ func Bisync(ctx context.Context, fs1, fs2 fs.Fs, optArg *Options) (err error) { ci := fs.GetConfig(ctx) opt.OrigBackupDir = ci.BackupDir - if !opt.DryRun && !opt.Force { - if fs1.Precision() == fs.ModTimeNotSupported { - return errors.New("modification time support is missing on path1") - } - if fs2.Precision() == fs.ModTimeNotSupported { - return errors.New("modification time support is missing on path2") - } + err = b.setCompareDefaults(ctx) + if err != nil { + return err } if b.workDir, err = filepath.Abs(opt.Workdir); err != nil { @@ -389,10 +386,12 @@ func (b *bisyncRun) resync(octx, fctx context.Context) error { var ls2 = newFileList() err = ls1.save(fctx, b.newListing1) if err != nil { + b.handleErr(ls1, "error saving ls1 from resync", err, true, true) b.abort = true } err = ls2.save(fctx, b.newListing2) if err != nil { + b.handleErr(ls2, "error saving ls2 from resync", err, true, true) b.abort = true } @@ -519,6 +518,10 @@ func (b *bisyncRun) checkSync(listing1, listing2 string) error { if !files2.has(file) && !files2.has(b.aliases.Alias(file)) { b.indent("ERROR", file, "Path1 file not found in Path2") ok = false + } else { + if !b.fileInfoEqual(file, files2.getTryAlias(file, b.aliases.Alias(file)), files1, files2) { + ok = false + } } } for _, file := range files2.list { @@ -527,6 +530,7 @@ func (b *bisyncRun) checkSync(listing1, listing2 string) error { ok = false } } + if !ok { return errors.New("path1 and path2 are out of sync, run --resync to recover") } @@ -583,6 +587,7 @@ func (b *bisyncRun) handleErr(o interface{}, msg string, err error, critical, re } if critical { b.critical = true + b.abort = true fs.Errorf(o, "%s: %v", msg, err) } else { fs.Infof(o, "%s: %v", msg, err) @@ -603,3 +608,25 @@ func (b *bisyncRun) setBackupDir(ctx context.Context, destPath int) context.Cont fs.Debugf(ci.BackupDir, "updated backup-dir for Path%d", destPath) return ctx } + +// mainly to make sure tests don't interfere with each other when running more than one +func resetGlobals() { + downloadHash = false + logger = operations.NewLoggerOpt() + ignoreListingChecksum = false + ignoreListingModtime = false + hashTypes = nil + queueCI = nil + hashType = 0 + fsrc, fdst = nil, nil + fcrypt = nil + Opt = Options{} + once = gosync.Once{} + downloadHashWarn = gosync.Once{} + firstDownloadHash = gosync.Once{} + ls1 = newFileList() + ls2 = newFileList() + err = nil + firstErr = nil + marchCtx = nil +} diff --git a/cmd/bisync/queue.go b/cmd/bisync/queue.go index a0411253d..6f181e1a9 100644 --- a/cmd/bisync/queue.go +++ b/cmd/bisync/queue.go @@ -12,6 +12,7 @@ import ( "github.com/rclone/rclone/cmd/bisync/bilib" "github.com/rclone/rclone/fs" "github.com/rclone/rclone/fs/filter" + "github.com/rclone/rclone/fs/hash" "github.com/rclone/rclone/fs/operations" "github.com/rclone/rclone/fs/sync" "github.com/rclone/rclone/lib/terminal" @@ -40,7 +41,18 @@ var logger = operations.NewLoggerOpt() var lock mutex.Mutex var once mutex.Once var ignoreListingChecksum bool -var ci *fs.ConfigInfo +var ignoreListingModtime bool +var hashTypes map[string]hash.Type +var queueCI *fs.ConfigInfo + +// allows us to get the right hashtype during the LoggerFn without knowing whether it's Path1/Path2 +func getHashType(fname string) hash.Type { + ht, ok := hashTypes[fname] + if ok { + return ht + } + return hash.None +} // FsPathIfAny handles type assertions and returns a formatted bilib.FsPath if valid, otherwise "" func FsPathIfAny(x fs.DirEntry) string { @@ -102,13 +114,16 @@ func WriteResults(ctx context.Context, sigil operations.Sigil, src, dst fs.DirEn result.Flags = "-" if side != nil { result.Size = side.Size() - result.Modtime = side.ModTime(ctx).In(time.UTC) - + if !ignoreListingModtime { + result.Modtime = side.ModTime(ctx).In(TZ) + } if !ignoreListingChecksum { sideObj, ok := side.(fs.ObjectInfo) if ok { - result.Hash, _ = sideObj.Hash(ctx, sideObj.Fs().Hashes().GetOne()) + result.Hash, _ = sideObj.Hash(ctx, getHashType(sideObj.Fs().Name())) + result.Hash, _ = tryDownloadHash(ctx, sideObj, result.Hash) } + } } result.IsWinner = result.Winner.Obj == side @@ -126,13 +141,13 @@ func WriteResults(ctx context.Context, sigil operations.Sigil, src, dst fs.DirEn result.Size = -1 } - if result.Size < 0 && result.Flags != "d" && (ci.CheckSum || ci.SizeOnly) { + prettyprint(result, "writing result", fs.LogLevelDebug) + if result.Size < 0 && result.Flags != "d" && ((queueCI.CheckSum && !downloadHash) || queueCI.SizeOnly) { once.Do(func() { fs.Logf(result.Name, Color(terminal.YellowFg, "Files of unknown size (such as Google Docs) do not sync reliably with --checksum or --size-only. Consider using modtime instead (the default) or --drive-skip-gdocs")) }) } - fs.Debugf(nil, "writing result: %v", result) err := json.NewEncoder(opt.JSON).Encode(result) if err != nil { fs.Errorf(result, "Error encoding JSON: %v", err) @@ -149,13 +164,45 @@ func ReadResults(results io.Reader) []Results { if err := dec.Decode(&r); err == io.EOF { break } - fs.Debugf(nil, "result: %v", r) + prettyprint(r, "result", fs.LogLevelDebug) slice = append(slice, r) } return slice } +// for setup code shared by both fastCopy and resyncDir +func (b *bisyncRun) preCopy(ctx context.Context) context.Context { + queueCI = fs.GetConfig(ctx) + ignoreListingChecksum = b.opt.IgnoreListingChecksum + ignoreListingModtime = !b.opt.Compare.Modtime + hashTypes = map[string]hash.Type{ + b.fs1.Name(): b.opt.Compare.HashType1, + b.fs2.Name(): b.opt.Compare.HashType2, + } + logger.LoggerFn = WriteResults + overridingEqual := false + if (b.opt.Compare.Modtime && b.opt.Compare.Checksum) || b.opt.Compare.DownloadHash { + overridingEqual = true + fs.Debugf(nil, "overriding equal") + // otherwise impossible in Sync, so override Equal + ctx = b.EqualFn(ctx) + } + ctxCopyLogger := operations.WithSyncLogger(ctx, logger) + if b.opt.Compare.Checksum && (b.opt.Compare.NoSlowHash || b.opt.Compare.SlowHashSyncOnly) && b.opt.Compare.SlowHashDetected { + // set here in case !b.opt.Compare.Modtime + queueCI = fs.GetConfig(ctxCopyLogger) + if b.opt.Compare.NoSlowHash { + queueCI.CheckSum = false + } + if b.opt.Compare.SlowHashSyncOnly && !overridingEqual { + queueCI.CheckSum = true + } + } + return ctxCopyLogger +} + func (b *bisyncRun) fastCopy(ctx context.Context, fsrc, fdst fs.Fs, files bilib.Names, queueName string) ([]Results, error) { + ctx = b.preCopy(ctx) if err := b.saveQueue(files, queueName); err != nil { return nil, err } @@ -173,13 +220,9 @@ func (b *bisyncRun) fastCopy(ctx context.Context, fsrc, fdst fs.Fs, files bilib. } } - ignoreListingChecksum = b.opt.IgnoreListingChecksum - ci = fs.GetConfig(ctx) - logger.LoggerFn = WriteResults - ctxCopyLogger := operations.WithSyncLogger(ctxCopy, logger) b.testFn() - err := sync.Sync(ctxCopyLogger, fdst, fsrc, b.opt.CreateEmptySrcDirs) - fs.Debugf(nil, "logger is: %v", logger) + err := sync.Sync(ctxCopy, fdst, fsrc, b.opt.CreateEmptySrcDirs) + prettyprint(logger, "logger", fs.LogLevelDebug) getResults := ReadResults(logger.JSON) fs.Debugf(nil, "Got %v results for %v", len(getResults), queueName) @@ -203,12 +246,10 @@ func (b *bisyncRun) retryFastCopy(ctx context.Context, fsrc, fdst fs.Fs, files b } func (b *bisyncRun) resyncDir(ctx context.Context, fsrc, fdst fs.Fs) ([]Results, error) { - ci = fs.GetConfig(ctx) - ignoreListingChecksum = b.opt.IgnoreListingChecksum - logger.LoggerFn = WriteResults - ctxCopyLogger := operations.WithSyncLogger(ctx, logger) - err := sync.CopyDir(ctxCopyLogger, fdst, fsrc, b.opt.CreateEmptySrcDirs) - fs.Debugf(nil, "logger is: %v", logger) + ctx = b.preCopy(ctx) + + err := sync.CopyDir(ctx, fdst, fsrc, b.opt.CreateEmptySrcDirs) + prettyprint(logger, "logger", fs.LogLevelDebug) getResults := ReadResults(logger.JSON) fs.Debugf(nil, "Got %v results for %v", len(getResults), "resync") diff --git a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst index b570eb902..f391e1d4a 100644 --- a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-new index b570eb902..f391e1d4a 100644 --- a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-old index 2f8714b93..79bf229a1 100644 --- a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst index b570eb902..f391e1d4a 100644 --- a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2004-01-02T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2004-01-02T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-new index 2f8714b93..79bf229a1 100644 --- a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-old index 2f8714b93..79bf229a1 100644 --- a/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_all_changed/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2005-01-02T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_all_changed/golden/test.log b/cmd/bisync/testdata/test_all_changed/golden/test.log index ccd2c47b2..f340d12c2 100644 --- a/cmd/bisync/testdata/test_all_changed/golden/test.log +++ b/cmd/bisync/testdata/test_all_changed/golden/test.log @@ -3,10 +3,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -16,27 +26,38 @@ INFO : Bisync successful (07) : test sync should pass (08) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - file1.copy1.txt -INFO : - Path1 File is newer - file1.copy2.txt -INFO : - Path1 File is newer - file1.copy3.txt -INFO : - Path1 File is newer - file1.copy4.txt -INFO : - Path1 File is newer - file1.copy5.txt -INFO : - Path1 File is newer - file1.txt -INFO : - Path1 File is newer - subdir/file20.txt -INFO : Path1: 7 changes: 0 new, 7 newer, 0 older, 0 deleted +INFO : - Path1 File changed: time (newer) - file1.copy1.txt +INFO : - Path1 File changed: time (newer) - file1.copy2.txt +INFO : - Path1 File changed: time (newer) - file1.copy3.txt +INFO : - Path1 File changed: time (newer) - file1.copy4.txt +INFO : - Path1 File changed: time (newer) - file1.copy5.txt +INFO : - Path1 File changed: time (newer) - file1.txt +INFO : - Path1 File changed: time (newer) - subdir/file20.txt +INFO : Path1: 7 changes:  0 new,  7 modified,  0 deleted +INFO : (Modified:  7 newer,  0 older) INFO : Path2 checking for diffs INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy1.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy2.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy3.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy4.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy5.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt -INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy1.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy2.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy3.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy4.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy5.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt +INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful @@ -47,18 +68,29 @@ INFO : Bisync successful (12) : test sync should fail (13) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - RCLONE_TEST -INFO : - Path1 File is OLDER - file1.copy1.txt -INFO : - Path1 File is OLDER - file1.copy2.txt -INFO : - Path1 File is OLDER - file1.copy3.txt -INFO : - Path1 File is OLDER - file1.copy4.txt -INFO : - Path1 File is OLDER - file1.copy5.txt -INFO : - Path1 File is OLDER - file1.txt -INFO : - Path1 File is OLDER - subdir/file20.txt -INFO : Path1: 8 changes: 0 new, 1 newer, 7 older, 0 deleted +INFO : - Path1 File changed: time (newer) - RCLONE_TEST +INFO : - Path1 File changed: time (older) - file1.copy1.txt +INFO : - Path1 File changed: time (older) - file1.copy2.txt +INFO : - Path1 File changed: time (older) - file1.copy3.txt +INFO : - Path1 File changed: time (older) - file1.copy4.txt +INFO : - Path1 File changed: time (older) - file1.copy5.txt +INFO : - Path1 File changed: time (older) - file1.txt +INFO : - Path1 File changed: time (older) - subdir/file20.txt +INFO : Path1: 8 changes:  0 new,  8 modified,  0 deleted +INFO : (Modified:  1 newer,  7 older) INFO : Path2 checking for diffs ERROR : Safety abort: all files were changed on Path1 "{path1/}". Run with --force if desired. NOTICE: Bisync aborted. Please try again. @@ -66,29 +98,40 @@ Bisync error: all files were changed (14) : test sync with force should pass (15) : bisync force +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - RCLONE_TEST -INFO : - Path1 File is OLDER - file1.copy1.txt -INFO : - Path1 File is OLDER - file1.copy2.txt -INFO : - Path1 File is OLDER - file1.copy3.txt -INFO : - Path1 File is OLDER - file1.copy4.txt -INFO : - Path1 File is OLDER - file1.copy5.txt -INFO : - Path1 File is OLDER - file1.txt -INFO : - Path1 File is OLDER - subdir/file20.txt -INFO : Path1: 8 changes: 0 new, 1 newer, 7 older, 0 deleted +INFO : - Path1 File changed: time (newer) - RCLONE_TEST +INFO : - Path1 File changed: time (older) - file1.copy1.txt +INFO : - Path1 File changed: time (older) - file1.copy2.txt +INFO : - Path1 File changed: time (older) - file1.copy3.txt +INFO : - Path1 File changed: time (older) - file1.copy4.txt +INFO : - Path1 File changed: time (older) - file1.copy5.txt +INFO : - Path1 File changed: time (older) - file1.txt +INFO : - Path1 File changed: time (older) - subdir/file20.txt +INFO : Path1: 8 changes:  0 new,  8 modified,  0 deleted +INFO : (Modified:  1 newer,  7 older) INFO : Path2 checking for diffs INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}RCLONE_TEST -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy1.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy2.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy3.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy4.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy5.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt -INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Queue copy to Path2 - {path2/}RCLONE_TEST +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy1.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy2.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy3.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy4.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.copy5.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt +INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst index 86b9e86ee..f0208cb9a 100644 --- a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-new index 465d2455d..ff7009316 100644 --- a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-old index fbedf0f5e..7819f9efc 100644 --- a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst index 86b9e86ee..f0208cb9a 100644 --- a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-new index 9e8bc8a1a..21a22d1e3 100644 --- a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-old index fbedf0f5e..7819f9efc 100644 --- a/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_basic/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_basic/golden/test.log b/cmd/bisync/testdata/test_basic/golden/test.log index a37bbe392..d5f63b679 100644 --- a/cmd/bisync/testdata/test_basic/golden/test.log +++ b/cmd/bisync/testdata/test_basic/golden/test.log @@ -3,10 +3,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -17,19 +27,31 @@ INFO : Bisync successful (07) : test bisync run (08) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - subdir/file20.txt -INFO : Path1: 1 changes: 0 new, 1 newer, 0 older, 0 deleted +INFO : - Path1 File changed: size (larger), time (newer) - subdir/file20.txt +INFO : Path1: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : Path2: 1 changes: 0 new, 1 newer, 0 older, 0 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file1.txt +INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst index ddb01f4a7..19e9623a5 100644 --- a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-new index 8ea562aab..fa6eba998 100644 --- a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-old index 6af4a00fa..e9f524af7 100644 --- a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst index ddb01f4a7..19e9623a5 100644 --- a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-new index ba1b8daab..4b722b537 100644 --- a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" diff --git a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-old index 6af4a00fa..e9f524af7 100644 --- a/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_changes/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_changes/golden/test.log b/cmd/bisync/testdata/test_changes/golden/test.log index b3702f98a..3d678b67a 100644 --- a/cmd/bisync/testdata/test_changes/golden/test.log +++ b/cmd/bisync/testdata/test_changes/golden/test.log @@ -3,10 +3,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -49,47 +59,59 @@ INFO : Bisync successful (31) : test bisync run (32) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - file2.txt -INFO : - Path1 File was deleted - file4.txt -INFO : - Path1 File is newer - file5.txt -INFO : - Path1 File was deleted - file6.txt -INFO : - Path1 File is newer - file7.txt -INFO : - Path1 File was deleted - file8.txt -INFO : - Path1 File is new - file11.txt -INFO : Path1: 7 changes: 1 new, 3 newer, 0 older, 3 deleted +INFO : - Path1 File changed: size (larger), time (newer) - file2.txt +INFO : - Path1 File was deleted - file4.txt +INFO : - Path1 File changed: size (larger), time (newer) - file5.txt +INFO : - Path1 File was deleted - file6.txt +INFO : - Path1 File changed: size (larger), time (newer) - file7.txt +INFO : - Path1 File was deleted - file8.txt +INFO : - Path1 File is new - file11.txt +INFO : Path1: 7 changes:  1 new,  3 modified,  3 deleted +INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : - Path2 File was deleted - file3.txt -INFO : - Path2 File is newer - file5.txt -INFO : - Path2 File is newer - file6.txt -INFO : - Path2 File was deleted - file7.txt -INFO : - Path2 File was deleted - file8.txt -INFO : - Path2 File is new - file10.txt -INFO : Path2: 7 changes: 1 new, 3 newer, 0 older, 3 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file1.txt +INFO : - Path2 File was deleted - file3.txt +INFO : - Path2 File changed: size (larger), time (newer) - file5.txt +INFO : - Path2 File changed: size (larger), time (newer) - file6.txt +INFO : - Path2 File was deleted - file7.txt +INFO : - Path2 File was deleted - file8.txt +INFO : - Path2 File is new - file10.txt +INFO : Path2: 7 changes:  1 new,  3 modified,  3 deleted +INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) INFO : Applying changes INFO : Checking potential conflicts... ERROR : file5.txt: md5 differ NOTICE: {path2String}: 1 differences found NOTICE: {path2String}: 1 errors while checking INFO : Finished checking the potential conflicts. 1 differences found -INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt -INFO : - Path2 Queue delete - {path2/}file4.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt +INFO : - Path2 Queue delete - {path2/}file4.txt NOTICE: - WARNING New or changed in both paths - file5.txt -NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 -NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 +NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 +NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt..path2 -NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 -INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file7.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt -INFO : - Path1 Queue delete - {path1/}file3.txt +NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 +INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file7.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt +INFO : - Path1 Queue delete - {path1/}file3.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-new index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-old index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-new index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-old index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-err index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-err @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-new index f228e0584..662f54c30 100644 --- a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-new @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-old index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path1.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-err index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-err @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-new index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-old index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access/golden/missing-listings._testdir_path1.._testdir_path2.path2.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-err index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-err @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-new index f228e0584..662f54c30 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-new @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-old index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path1.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-err index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-err @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-new index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-old index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access/golden/path1-missing._testdir_path1.._testdir_path2.path2.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-err index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-err @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-new index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-old index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-err index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-err @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-new index f9e405f73..dce50e508 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-new @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-old index 788d3f653..cbcdaf556 100644 --- a/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_access/golden/test.log b/cmd/bisync/testdata/test_check_access/golden/test.log index 2b8e6c982..7b6e19e88 100644 --- a/cmd/bisync/testdata/test_check_access/golden/test.log +++ b/cmd/bisync/testdata/test_check_access/golden/test.log @@ -3,15 +3,35 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (04) : test 1. see that check-access passes with the initial setup (05) : bisync check-access +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs @@ -26,12 +46,22 @@ INFO : Bisync successful (06) : test 2. delete the path2 subdir RCLONE_TEST and run sync. should fail critical. (07) : delete-file {path2/}subdir/RCLONE_TEST (08) : bisync check-access +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs INFO : Path2 checking for diffs -INFO : - Path2 File was deleted - subdir/RCLONE_TEST -INFO : Path2: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path2 File was deleted - subdir/RCLONE_TEST +INFO : Path2: 1 changes:  0 new,  0 modified,  1 deleted INFO : Checking access health ERROR : Access test failed: Path1 count 2, Path2 count 1 - RCLONE_TEST ERROR : -  Access test failed: Path1 file not found in Path2 - subdir/RCLONE_TEST @@ -43,15 +73,35 @@ Bisync error: bisync aborted (10) : test 3. put the path2 subdir RCLONE_TEST back, resync. (11) : copy-file {path1/}subdir/RCLONE_TEST {path2/} (12) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (13) : test 4. run sync with check-access. should pass. (14) : bisync check-access +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs @@ -66,11 +116,21 @@ INFO : Bisync successful (15) : test 5. delete path1 top level RCLONE_TEST, run sync. should fail critical. (16) : delete-file {path1/}RCLONE_TEST (17) : bisync check-access +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - RCLONE_TEST -INFO : Path1: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path1 File was deleted - RCLONE_TEST +INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted INFO : Path2 checking for diffs INFO : Checking access health ERROR : Access test failed: Path1 count 1, Path2 count 2 - RCLONE_TEST @@ -82,6 +142,16 @@ Bisync error: bisync aborted (19) : test 6. run again. should fail critical due to missing listings. (20) : bisync check-access +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" ERROR : Bisync critical error: cannot find prior Path1 or Path2 listings, likely due to critical error on prior run Tip: here are the filenames we were looking for. Do they exist? @@ -95,15 +165,35 @@ Bisync error: bisync aborted (22) : test 7. run resync, which will copy the path2 top level back to path1. (23) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (24) : test 8. run sync with --check-access. should pass. (25) : bisync check-access +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-err index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-err @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-new index 9296430cf..ba36aea08 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-new @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-old index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path1.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-err index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-err @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-new index ca2ca1554..79dfe7d7e 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-new @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-old index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-error-run._testdir_path1.._testdir_path2.path2.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-new index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-old index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path1.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-new index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-old index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-initial._testdir_path1.._testdir_path2.path2.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-new index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-old index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path1.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-new index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-old index 211bd4e31..4a89ef030 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/exclude-pass-run._testdir_path1.._testdir_path2.path2.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-err index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-err @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-new index ef36ad44d..b719bd8af 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-new @@ -1,12 +1,12 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-old index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path1.lst-old @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-err index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-err @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-new index 1f169a9dd..c122ac517 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-new @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-old index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-error-run._testdir_path1.._testdir_path2.path2.lst-old @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-new index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-new @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-old index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path1.lst-old @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-new index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-new @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-old index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-initial._testdir_path1.._testdir_path2.path2.lst-old @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-new index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-new @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-old index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path1.lst-old @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-new index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-new @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-old index cbfc00336..c8f127ce2 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_access_filters/golden/include-pass-run._testdir_path1.._testdir_path2.path2.lst-old @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/subdirB/file30.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdirX/subdirX1/file30.txt" diff --git a/cmd/bisync/testdata/test_check_access_filters/golden/test.log b/cmd/bisync/testdata/test_check_access_filters/golden/test.log index cf4fabcbc..b9724a84f 100644 --- a/cmd/bisync/testdata/test_check_access_filters/golden/test.log +++ b/cmd/bisync/testdata/test_check_access_filters/golden/test.log @@ -6,17 +6,37 @@ (04) : test resync to get the filters file md5 built. (05) : bisync resync filters-file={workdir/}exclude-other-filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}exclude-other-filtersfile.txt INFO : Storing filters file hash to {workdir/}exclude-other-filtersfile.txt.md5 INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (06) : test EXCLUDE - test filters for check access (07) : bisync check-access filters-file={workdir/}exclude-other-filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}exclude-other-filtersfile.txt INFO : Building Path1 and Path2 listings @@ -38,6 +58,16 @@ INFO : Bisync successful (14) : test EXCLUDE - test should PASS (15) : bisync check-access filters-file={workdir/}exclude-other-filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}exclude-other-filtersfile.txt INFO : Building Path1 and Path2 listings @@ -57,15 +87,25 @@ INFO : Bisync successful (20) : test EXCLUDE - test should ABORT (21) : bisync check-access filters-file={workdir/}exclude-other-filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}exclude-other-filtersfile.txt INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - subdir/RCLONE_TEST -INFO : Path1: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path1 File was deleted - subdir/RCLONE_TEST +INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted INFO : Path2 checking for diffs -INFO : - Path2 File was deleted - RCLONE_TEST -INFO : Path2: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path2 File was deleted - RCLONE_TEST +INFO : Path2: 1 changes:  0 new,  0 modified,  1 deleted INFO : Checking access health ERROR : -  Access test failed: Path1 file not found in Path2 - RCLONE_TEST ERROR : -  Access test failed: Path2 file not found in Path1 - subdir/RCLONE_TEST @@ -80,17 +120,37 @@ Bisync error: bisync aborted (26) : sync-dir {path1/} {path2/} (27) : copy-file {datadir/}include-other-filtersfile.txt {workdir/} (28) : bisync resync filters-file={workdir/}include-other-filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}include-other-filtersfile.txt INFO : Storing filters file hash to {workdir/}include-other-filtersfile.txt.md5 INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (29) : test INCLUDE - test include/exclude filters for check access (30) : bisync check-access filters-file={workdir/}include-other-filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}include-other-filtersfile.txt INFO : Building Path1 and Path2 listings @@ -111,6 +171,16 @@ INFO : Bisync successful (36) : test INCLUDE - test should PASS (37) : bisync check-access filters-file={workdir/}include-other-filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}include-other-filtersfile.txt INFO : Building Path1 and Path2 listings @@ -131,16 +201,26 @@ INFO : Bisync successful (43) : test INCLUDE - test should ABORT (44) : bisync check-access filters-file={workdir/}include-other-filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}include-other-filtersfile.txt INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - subdir/RCLONE_TEST -INFO : - Path1 File was deleted - subdirX/subdirX1/RCLONE_TEST -INFO : Path1: 2 changes: 0 new, 0 newer, 0 older, 2 deleted +INFO : - Path1 File was deleted - subdir/RCLONE_TEST +INFO : - Path1 File was deleted - subdirX/subdirX1/RCLONE_TEST +INFO : Path1: 2 changes:  0 new,  0 modified,  2 deleted INFO : Path2 checking for diffs -INFO : - Path2 File was deleted - RCLONE_TEST -INFO : Path2: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path2 File was deleted - RCLONE_TEST +INFO : Path2: 1 changes:  0 new,  0 modified,  1 deleted INFO : Checking access health ERROR : Access test failed: Path1 count 3, Path2 count 4 - RCLONE_TEST ERROR : -  Access test failed: Path1 file not found in Path2 - RCLONE_TEST diff --git a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-new index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-old index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-new index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-old index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_filename/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst-new index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst-old index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path1.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst-new index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst-old index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_filename/golden/initial-pass._testdir_path1.._testdir_path2.path2.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-err index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-err @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-new index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-old index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path1.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-err index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-err @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-new index dc9d9664d..b69ca1a18 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-new @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-old index d9b82dd1c..6f866fa29 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_filename/golden/path2-missing._testdir_path1.._testdir_path2.path2.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 ".chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 ".chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "subdir/.chk_file" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_check_filename/golden/test.log b/cmd/bisync/testdata/test_check_filename/golden/test.log index b8be8484a..59728701e 100644 --- a/cmd/bisync/testdata/test_check_filename/golden/test.log +++ b/cmd/bisync/testdata/test_check_filename/golden/test.log @@ -3,15 +3,35 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (04) : test 1. see that check-access passes with the initial setup (05) : bisync check-access check-filename=.chk_file +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs @@ -27,12 +47,22 @@ INFO : Bisync successful (07) : test 2. delete the remote subdir .chk_file, run sync. should fail critical. (08) : delete-file {path2/}subdir/.chk_file (09) : bisync check-access check-filename=.chk_file +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs INFO : Path2 checking for diffs -INFO : - Path2 File was deleted - subdir/.chk_file -INFO : Path2: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path2 File was deleted - subdir/.chk_file +INFO : Path2: 1 changes:  0 new,  0 modified,  1 deleted INFO : Checking access health ERROR : Access test failed: Path1 count 2, Path2 count 1 - .chk_file ERROR : -  Access test failed: Path1 file not found in Path2 - subdir/.chk_file @@ -44,17 +74,37 @@ Bisync error: bisync aborted (11) : test 3. put the remote subdir .chk_file back, run resync. (12) : copy-file {path1/}subdir/.chk_file {path2/}subdir/ (13) : bisync check-access resync check-filename=.chk_file +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : Checking access health INFO : Found 2 matching ".chk_file" files on both paths INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (14) : test 4. run sync with check-access. should pass. (15) : bisync check-access check-filename=.chk_file +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs diff --git a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst index 6af4a00fa..e9f524af7 100644 --- a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst-new index 6af4a00fa..e9f524af7 100644 --- a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst-old index 6af4a00fa..e9f524af7 100644 --- a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst index 6af4a00fa..e9f524af7 100644 --- a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst-new index 6af4a00fa..e9f524af7 100644 --- a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst-old index 6af4a00fa..e9f524af7 100644 --- a/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_check_sync/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_check_sync/golden/test.log b/cmd/bisync/testdata/test_check_sync/golden/test.log index edc5c221f..35246882d 100644 --- a/cmd/bisync/testdata/test_check_sync/golden/test.log +++ b/cmd/bisync/testdata/test_check_sync/golden/test.log @@ -3,15 +3,35 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (04) : test 1. run check-sync-only on a clean sync (05) : bisync check-sync-only +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful @@ -21,6 +41,16 @@ INFO : Bisync successful (09) : test 3. run check-sync-only on modified listings (10) : bisync check-sync-only +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" ERROR : -  Path1 file not found in Path2 - file2.txt ERROR : -  Path2 file not found in Path1 - file1.txt @@ -31,6 +61,16 @@ Bisync error: bisync aborted (12) : test 4. run normal sync to check that it aborts (13) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" ERROR : Bisync critical error: cannot find prior Path1 or Path2 listings, likely due to critical error on prior run Tip: here are the filenames we were looking for. Do they exist? @@ -48,15 +88,35 @@ Bisync error: bisync aborted (18) : test 6. run resync (19) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (20) : test 7. run normal sync with check-sync enabled (default) (21) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs @@ -68,6 +128,16 @@ INFO : Bisync successful (22) : test 8. run normal sync with no-check-sync (23) : bisync no-check-sync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.copy1to2.que b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.copy1to2.que new file mode 100644 index 000000000..5725b8184 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.copy1to2.que @@ -0,0 +1,5 @@ +"file11.txt" +"file2.txt" +"file4.txt" +"file5.txt..path1" +"file7.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.copy2to1.que b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.copy2to1.que new file mode 100644 index 000000000..3b79e78bd --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.copy2to1.que @@ -0,0 +1,5 @@ +"file1.txt" +"file10.txt" +"file3.txt" +"file5.txt..path2" +"file6.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.delete1.que b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.delete1.que new file mode 100644 index 000000000..8a5f92a1a --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.delete1.que @@ -0,0 +1 @@ +"file3.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.delete2.que b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.delete2.que new file mode 100644 index 000000000..3bf899b25 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.delete2.que @@ -0,0 +1 @@ +"file4.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path1.lst new file mode 100644 index 000000000..ddb01f4a7 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path1.lst @@ -0,0 +1,10 @@ +# bisync listing v1 from test +- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path1.lst-new new file mode 100644 index 000000000..8ea562aab --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -0,0 +1,8 @@ +# bisync listing v1 from test +- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path1.lst-old new file mode 100644 index 000000000..6af4a00fa --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -0,0 +1,10 @@ +# bisync listing v1 from test +- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path2.lst new file mode 100644 index 000000000..ddb01f4a7 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path2.lst @@ -0,0 +1,10 @@ +# bisync listing v1 from test +- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path2.lst-new new file mode 100644 index 000000000..ba1b8daab --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -0,0 +1,8 @@ +# bisync listing v1 from test +- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path2.lst-old new file mode 100644 index 000000000..6af4a00fa --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -0,0 +1,10 @@ +# bisync listing v1 from test +- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" diff --git a/cmd/bisync/testdata/test_compare_all/golden/test.log b/cmd/bisync/testdata/test_compare_all/golden/test.log new file mode 100644 index 000000000..fc2674d79 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/golden/test.log @@ -0,0 +1,110 @@ +(01) : test changes compare-all + + +(02) : test initial bisync +(03) : bisync resync compare-all +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": true, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": true +} +INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" +INFO : Copying unique Path2 files to Path1 +INFO : - Path2 Resync is copying UNIQUE files to - Path1 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : Resync updating listings +INFO : Bisync successful + +(04) : test make modifications on both paths +(05) : test new on path2 - file10 +(06) : touch-copy 2001-01-02 {datadir/}file10.txt {path2/} + +(07) : test newer on path2 - file1 +(08) : touch-copy 2001-01-02 {datadir/}file1.txt {path2/} + +(09) : test new on path1 - file11 +(10) : touch-copy 2001-01-02 {datadir/}file11.txt {path1/} + +(11) : test newer on path1 - file2 +(12) : touch-copy 2001-01-02 {datadir/}file2.txt {path1/} + +(13) : test deleted on path2 - file3 +(14) : delete-file {path2/}file3.txt + +(15) : test deleted on path1 - file4 +(16) : delete-file {path1/}file4.txt + +(17) : test deleted on both paths - file8 +(18) : delete-file {path1/}file8.txt +(19) : delete-file {path2/}file8.txt + +(20) : test changed on both paths - file5 (file5R, file5L) +(21) : touch-glob 2001-01-02 {datadir/} file5R.txt +(22) : copy-as {datadir/}file5R.txt {path2/} file5.txt +(23) : touch-glob 2001-03-04 {datadir/} file5L.txt +(24) : copy-as {datadir/}file5L.txt {path1/} file5.txt + +(25) : test newer on path2 and deleted on path1 - file6 +(26) : touch-copy 2001-01-02 {datadir/}file6.txt {path2/} +(27) : delete-file {path1/}file6.txt + +(28) : test newer on path1 and deleted on path2 - file7 +(29) : touch-copy 2001-01-02 {datadir/}file7.txt {path1/} +(30) : delete-file {path2/}file7.txt + +(31) : test bisync run +(32) : bisync compare-all +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": true, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": true +} +INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" +INFO : Building Path1 and Path2 listings +INFO : Path1 checking for diffs +INFO : - Path1 File changed: size (larger), time (newer), hash - file2.txt +INFO : - Path1 File was deleted - file4.txt +INFO : - Path1 File changed: size (larger), time (newer), hash - file5.txt +INFO : - Path1 File was deleted - file6.txt +INFO : - Path1 File changed: size (larger), time (newer), hash - file7.txt +INFO : - Path1 File was deleted - file8.txt +INFO : - Path1 File is new - file11.txt +INFO : Path1: 7 changes:  1 new,  3 modified,  3 deleted +INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller,  3 hash differs) +INFO : Path2 checking for diffs +INFO : - Path2 File changed: size (larger), time (newer), hash - file1.txt +INFO : - Path2 File was deleted - file3.txt +INFO : - Path2 File changed: size (larger), time (newer), hash - file5.txt +INFO : - Path2 File changed: size (larger), time (newer), hash - file6.txt +INFO : - Path2 File was deleted - file7.txt +INFO : - Path2 File was deleted - file8.txt +INFO : - Path2 File is new - file10.txt +INFO : Path2: 7 changes:  1 new,  3 modified,  3 deleted +INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller,  3 hash differs) +INFO : Applying changes +INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt +INFO : - Path2 Queue delete - {path2/}file4.txt +NOTICE: - WARNING New or changed in both paths - file5.txt +NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 +NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 +NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt..path2 +NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 +INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file7.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt +INFO : - Path1 Queue delete - {path1/}file3.txt +INFO : - Path2 Do queued copies to - Path1 +INFO : - Path1 Do queued copies to - Path2 +INFO : Updating listings +INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" +INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_compare_all/initial/RCLONE_TEST b/cmd/bisync/testdata/test_compare_all/initial/RCLONE_TEST new file mode 100644 index 000000000..d8ca97c2a --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/initial/RCLONE_TEST @@ -0,0 +1 @@ +This file is used for testing the health of rclone accesses to the local/remote file system. Do not delete. diff --git a/cmd/bisync/testdata/test_compare_all/initial/file1.txt b/cmd/bisync/testdata/test_compare_all/initial/file1.txt new file mode 100644 index 000000000..e69de29bb diff --git a/cmd/bisync/testdata/test_compare_all/initial/file2.txt b/cmd/bisync/testdata/test_compare_all/initial/file2.txt new file mode 100644 index 000000000..e69de29bb diff --git a/cmd/bisync/testdata/test_compare_all/initial/file3.txt b/cmd/bisync/testdata/test_compare_all/initial/file3.txt new file mode 100644 index 000000000..e69de29bb diff --git a/cmd/bisync/testdata/test_compare_all/initial/file4.txt b/cmd/bisync/testdata/test_compare_all/initial/file4.txt new file mode 100644 index 000000000..e69de29bb diff --git a/cmd/bisync/testdata/test_compare_all/initial/file5.txt b/cmd/bisync/testdata/test_compare_all/initial/file5.txt new file mode 100644 index 000000000..e69de29bb diff --git a/cmd/bisync/testdata/test_compare_all/initial/file6.txt b/cmd/bisync/testdata/test_compare_all/initial/file6.txt new file mode 100644 index 000000000..e69de29bb diff --git a/cmd/bisync/testdata/test_compare_all/initial/file7.txt b/cmd/bisync/testdata/test_compare_all/initial/file7.txt new file mode 100644 index 000000000..e69de29bb diff --git a/cmd/bisync/testdata/test_compare_all/initial/file8.txt b/cmd/bisync/testdata/test_compare_all/initial/file8.txt new file mode 100644 index 000000000..e69de29bb diff --git a/cmd/bisync/testdata/test_compare_all/modfiles/file1.txt b/cmd/bisync/testdata/test_compare_all/modfiles/file1.txt new file mode 100644 index 000000000..464147f09 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/modfiles/file1.txt @@ -0,0 +1 @@ +This file is newer diff --git a/cmd/bisync/testdata/test_compare_all/modfiles/file10.txt b/cmd/bisync/testdata/test_compare_all/modfiles/file10.txt new file mode 100644 index 000000000..464147f09 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/modfiles/file10.txt @@ -0,0 +1 @@ +This file is newer diff --git a/cmd/bisync/testdata/test_compare_all/modfiles/file11.txt b/cmd/bisync/testdata/test_compare_all/modfiles/file11.txt new file mode 100644 index 000000000..464147f09 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/modfiles/file11.txt @@ -0,0 +1 @@ +This file is newer diff --git a/cmd/bisync/testdata/test_compare_all/modfiles/file2.txt b/cmd/bisync/testdata/test_compare_all/modfiles/file2.txt new file mode 100644 index 000000000..0fd70321a --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/modfiles/file2.txt @@ -0,0 +1 @@ +Newer version \ No newline at end of file diff --git a/cmd/bisync/testdata/test_compare_all/modfiles/file5L.txt b/cmd/bisync/testdata/test_compare_all/modfiles/file5L.txt new file mode 100644 index 000000000..43ceff1db --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/modfiles/file5L.txt @@ -0,0 +1 @@ +This file is newer and not equal to 5R diff --git a/cmd/bisync/testdata/test_compare_all/modfiles/file5R.txt b/cmd/bisync/testdata/test_compare_all/modfiles/file5R.txt new file mode 100644 index 000000000..a928fcf13 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/modfiles/file5R.txt @@ -0,0 +1 @@ +This file is newer and not equal to 5L diff --git a/cmd/bisync/testdata/test_compare_all/modfiles/file6.txt b/cmd/bisync/testdata/test_compare_all/modfiles/file6.txt new file mode 100644 index 000000000..464147f09 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/modfiles/file6.txt @@ -0,0 +1 @@ +This file is newer diff --git a/cmd/bisync/testdata/test_compare_all/modfiles/file7.txt b/cmd/bisync/testdata/test_compare_all/modfiles/file7.txt new file mode 100644 index 000000000..464147f09 --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/modfiles/file7.txt @@ -0,0 +1 @@ +This file is newer diff --git a/cmd/bisync/testdata/test_compare_all/scenario.txt b/cmd/bisync/testdata/test_compare_all/scenario.txt new file mode 100644 index 000000000..e1839d7ea --- /dev/null +++ b/cmd/bisync/testdata/test_compare_all/scenario.txt @@ -0,0 +1,55 @@ +test changes compare-all +# Exercise all of the various file change scenarios +# - New on Path2 file10 +# - Newer on Path2 file1 +# - New on Path1 file11 +# - Newer on Path1 file2 +# - Deleted on Path2 file3 +# - Deleted on Path1 file4 +# - Changed on Path2 and on Path1 file5 (file5r, file5l) +# - Newer on Path2 and deleted on Path1 file6 +# - Newer on Path1 and deleted on Path2 file7 +# - Deleted on both paths file8 + +test initial bisync +bisync resync compare-all + +test make modifications on both paths +test new on path2 - file10 +touch-copy 2001-01-02 {datadir/}file10.txt {path2/} + +test newer on path2 - file1 +touch-copy 2001-01-02 {datadir/}file1.txt {path2/} + +test new on path1 - file11 +touch-copy 2001-01-02 {datadir/}file11.txt {path1/} + +test newer on path1 - file2 +touch-copy 2001-01-02 {datadir/}file2.txt {path1/} + +test deleted on path2 - file3 +delete-file {path2/}file3.txt + +test deleted on path1 - file4 +delete-file {path1/}file4.txt + +test deleted on both paths - file8 +delete-file {path1/}file8.txt +delete-file {path2/}file8.txt + +test changed on both paths - file5 (file5R, file5L) +touch-glob 2001-01-02 {datadir/} file5R.txt +copy-as {datadir/}file5R.txt {path2/} file5.txt +touch-glob 2001-03-04 {datadir/} file5L.txt +copy-as {datadir/}file5L.txt {path1/} file5.txt + +test newer on path2 and deleted on path1 - file6 +touch-copy 2001-01-02 {datadir/}file6.txt {path2/} +delete-file {path1/}file6.txt + +test newer on path1 and deleted on path2 - file7 +touch-copy 2001-01-02 {datadir/}file7.txt {path1/} +delete-file {path2/}file7.txt + +test bisync run +bisync compare-all diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst index 5d46d4069..0bea450fb 100644 --- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst-new index 5d46d4069..0bea450fb 100644 --- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst-old index 5d46d4069..0bea450fb 100644 --- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst index 5d46d4069..0bea450fb 100644 --- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst-new index 5d46d4069..0bea450fb 100644 --- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst-old index 5d46d4069..0bea450fb 100644 --- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log b/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log index 85a9c6938..06dd5f2c6 100644 --- a/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log +++ b/cmd/bisync/testdata/test_createemptysrcdirs/golden/test.log @@ -10,10 +10,20 @@ (08) : copy-as {datadir/}placeholder.txt {path1/} file1.copy4.txt (09) : copy-as {datadir/}placeholder.txt {path1/} file1.copy5.txt (10) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -24,6 +34,16 @@ INFO : Bisync successful (15) : test 2. Run bisync without --create-empty-src-dirs (16) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs @@ -40,15 +60,25 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (20) : test 4.Run bisync WITH --create-empty-src-dirs (21) : bisync create-empty-src-dirs +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is new - subdir -INFO : Path1: 1 changes: 1 new, 0 newer, 0 older, 0 deleted +INFO : - Path1 File is new - subdir +INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted INFO : Path2 checking for diffs INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}subdir -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Queue copy to Path2 - {path2/}subdir +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful @@ -70,18 +100,28 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (33) : test 7. Run bisync without --create-empty-src-dirs (34) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - RCLONE_TEST -INFO : - Path1 File was deleted - subdir -INFO : Path1: 2 changes: 0 new, 0 newer, 0 older, 2 deleted +INFO : - Path1 File was deleted - RCLONE_TEST +INFO : - Path1 File was deleted - subdir +INFO : Path1: 2 changes:  0 new,  0 modified,  2 deleted INFO : Path2 checking for diffs -INFO : - Path2 File was deleted - subdir -INFO : Path2: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path2 File was deleted - subdir +INFO : Path2: 1 changes:  0 new,  0 modified,  1 deleted INFO : Applying changes -INFO : - Path2 Queue delete - {path2/}RCLONE_TEST -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path2 Queue delete - {path2/}RCLONE_TEST +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful @@ -93,10 +133,20 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (38) : test 9. Reset, do the delete again, and run bisync WITH --create-empty-src-dirs (39) : bisync resync create-empty-src-dirs +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (40) : list-dirs {path1/} @@ -116,15 +166,25 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (51) : bisync create-empty-src-dirs +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - subdir -INFO : Path1: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path1 File was deleted - subdir +INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted INFO : Path2 checking for diffs INFO : Applying changes -INFO : - Path2 Queue delete - {path2/}subdir -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path2 Queue delete - {path2/}subdir +INFO : - Path1 Do queued copies to - Path2 INFO : subdir: Removing directory INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" @@ -136,6 +196,16 @@ INFO : Bisync successful (55) : test 11. bisync again (because if we leave subdir in listings, test will fail due to mismatched modtime) (56) : bisync create-empty-src-dirs +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst index ddb01f4a7..19e9623a5 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry index 8ea562aab..fa6eba998 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry-new b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry-new index 8ea562aab..fa6eba998 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry-new +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry-old b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry-old index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry-old +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-dry-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-new index 8ea562aab..fa6eba998 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-old index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst index ddb01f4a7..19e9623a5 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry index ba1b8daab..4b722b537 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry-new b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry-new index ba1b8daab..4b722b537 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry-new +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry-old b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry-old index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry-old +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-dry-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-new index ba1b8daab..4b722b537 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-old index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_dry_run/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst-dry b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst-dry index 8ea562aab..fa6eba998 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst-dry +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst-dry @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst-dry-old b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst-dry-old index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst-dry-old +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path1.lst-dry-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst-dry b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst-dry index ba1b8daab..4b722b537 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst-dry +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst-dry @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst-dry-old b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst-dry-old index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst-dry-old +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun-resync._testdir_path1.._testdir_path2.path2.lst-dry-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry index 8ea562aab..fa6eba998 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry-new b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry-new index 8ea562aab..fa6eba998 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry-new +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file11.txt" -- 13 md5:fb3ecfb2800400fb01b0bfd39903e9fb - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file11.txt" +- 13 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry-old b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry-old index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry-old +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path1.lst-dry-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry index ba1b8daab..4b722b537 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry-new b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry-new index ba1b8daab..4b722b537 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry-new +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file10.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file6.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file10.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file6.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry-old b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry-old index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry-old +++ b/cmd/bisync/testdata/test_dry_run/golden/dryrun._testdir_path1.._testdir_path2.path2.lst-dry-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_dry_run/golden/test.log b/cmd/bisync/testdata/test_dry_run/golden/test.log index d5b938003..1736942d4 100644 --- a/cmd/bisync/testdata/test_dry_run/golden/test.log +++ b/cmd/bisync/testdata/test_dry_run/golden/test.log @@ -3,10 +3,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -44,13 +54,23 @@ INFO : Bisync successful (27) : test sync with dry-run and resync (28) : bisync dry-run resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 NOTICE: file10.txt: Skipped copy as --dry-run is set (size 19) NOTICE: file4.txt: Skipped copy as --dry-run is set (size 0) NOTICE: file6.txt: Skipped copy as --dry-run is set (size 19) -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 NOTICE: file1.txt: Skipped copy as --dry-run is set (size 0) NOTICE: file11.txt: Skipped copy as --dry-run is set (size 19) NOTICE: file2.txt: Skipped copy as --dry-run is set (size 13) @@ -63,51 +83,63 @@ INFO : Bisync successful (30) : test sync with dry-run (31) : bisync dry-run +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - file2.txt -INFO : - Path1 File was deleted - file4.txt -INFO : - Path1 File is newer - file5.txt -INFO : - Path1 File was deleted - file6.txt -INFO : - Path1 File is newer - file7.txt -INFO : - Path1 File is new - file11.txt -INFO : Path1: 6 changes: 1 new, 3 newer, 0 older, 2 deleted +INFO : - Path1 File changed: size (larger), time (newer) - file2.txt +INFO : - Path1 File was deleted - file4.txt +INFO : - Path1 File changed: size (larger), time (newer) - file5.txt +INFO : - Path1 File was deleted - file6.txt +INFO : - Path1 File changed: size (larger), time (newer) - file7.txt +INFO : - Path1 File is new - file11.txt +INFO : Path1: 6 changes:  1 new,  3 modified,  2 deleted +INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : - Path2 File was deleted - file3.txt -INFO : - Path2 File is newer - file5.txt -INFO : - Path2 File is newer - file6.txt -INFO : - Path2 File was deleted - file7.txt -INFO : - Path2 File is new - file10.txt -INFO : Path2: 6 changes: 1 new, 3 newer, 0 older, 2 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file1.txt +INFO : - Path2 File was deleted - file3.txt +INFO : - Path2 File changed: size (larger), time (newer) - file5.txt +INFO : - Path2 File changed: size (larger), time (newer) - file6.txt +INFO : - Path2 File was deleted - file7.txt +INFO : - Path2 File is new - file10.txt +INFO : Path2: 6 changes:  1 new,  3 modified,  2 deleted +INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) INFO : Applying changes INFO : Checking potential conflicts... ERROR : file5.txt: md5 differ NOTICE: {path2String}: 1 differences found NOTICE: {path2String}: 1 errors while checking INFO : Finished checking the potential conflicts. 1 differences found -INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt -INFO : - Path2 Queue delete - {path2/}file4.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt +INFO : - Path2 Queue delete - {path2/}file4.txt NOTICE: - WARNING New or changed in both paths - file5.txt -NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 +NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 NOTICE: file5.txt: Skipped move as --dry-run is set (size 39) -NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 +NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt..path2 NOTICE: file5.txt: Skipped move as --dry-run is set (size 39) -NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 -INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file7.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt -INFO : - Path1 Queue delete - {path1/}file3.txt +NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 +INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file7.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt +INFO : - Path1 Queue delete - {path1/}file3.txt INFO : - Path2 Do queued copies to - Path1 NOTICE: file1.txt: Skipped copy as --dry-run is set (size 19) NOTICE: file10.txt: Skipped copy as --dry-run is set (size 19) NOTICE: file3.txt: Skipped delete as --dry-run is set (size 0) NOTICE: file6.txt: Skipped copy as --dry-run is set (size 19) -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 NOTICE: file11.txt: Skipped copy as --dry-run is set (size 19) NOTICE: file2.txt: Skipped copy as --dry-run is set (size 13) NOTICE: file4.txt: Skipped delete as --dry-run is set (size 0) @@ -118,45 +150,57 @@ INFO : Bisync successful (33) : test sync without dry-run (34) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - file2.txt -INFO : - Path1 File was deleted - file4.txt -INFO : - Path1 File is newer - file5.txt -INFO : - Path1 File was deleted - file6.txt -INFO : - Path1 File is newer - file7.txt -INFO : - Path1 File is new - file11.txt -INFO : Path1: 6 changes: 1 new, 3 newer, 0 older, 2 deleted +INFO : - Path1 File changed: size (larger), time (newer) - file2.txt +INFO : - Path1 File was deleted - file4.txt +INFO : - Path1 File changed: size (larger), time (newer) - file5.txt +INFO : - Path1 File was deleted - file6.txt +INFO : - Path1 File changed: size (larger), time (newer) - file7.txt +INFO : - Path1 File is new - file11.txt +INFO : Path1: 6 changes:  1 new,  3 modified,  2 deleted +INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : - Path2 File was deleted - file3.txt -INFO : - Path2 File is newer - file5.txt -INFO : - Path2 File is newer - file6.txt -INFO : - Path2 File was deleted - file7.txt -INFO : - Path2 File is new - file10.txt -INFO : Path2: 6 changes: 1 new, 3 newer, 0 older, 2 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file1.txt +INFO : - Path2 File was deleted - file3.txt +INFO : - Path2 File changed: size (larger), time (newer) - file5.txt +INFO : - Path2 File changed: size (larger), time (newer) - file6.txt +INFO : - Path2 File was deleted - file7.txt +INFO : - Path2 File is new - file10.txt +INFO : Path2: 6 changes:  1 new,  3 modified,  2 deleted +INFO : (Modified:  3 newer,  0 older,  3 larger,  0 smaller) INFO : Applying changes INFO : Checking potential conflicts... ERROR : file5.txt: md5 differ NOTICE: {path2String}: 1 differences found NOTICE: {path2String}: 1 errors while checking INFO : Finished checking the potential conflicts. 1 differences found -INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt -INFO : - Path2 Queue delete - {path2/}file4.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file11.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file2.txt +INFO : - Path2 Queue delete - {path2/}file4.txt NOTICE: - WARNING New or changed in both paths - file5.txt -NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 -NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 +NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 +NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt..path2 -NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 -INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file7.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt -INFO : - Path1 Queue delete - {path1/}file3.txt +NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 +INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file7.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt +INFO : - Path1 Queue delete - {path1/}file3.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst index 8ef63fed8..3e93d92de 100644 --- a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 33 md5:ea683c03f780b76a62405456b08ae6fd - 2001-03-04T00:00:00.000000000+0000 "file1.txt..path1" -- 33 md5:2b4975bb20f7be674e66d78570ba2fb1 - 2001-01-02T00:00:00.000000000+0000 "file1.txt..path2" -- 37 md5:9fe822ddd1cb81d83aae00fa48239bd3 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 33 - - 2001-03-04T00:00:00.000000000+0000 "file1.txt..path1" +- 33 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt..path2" +- 37 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" diff --git a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst-new index eb2bbe4cf..a6ffa47b7 100644 --- a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,4 +1,4 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 33 md5:ea683c03f780b76a62405456b08ae6fd - 2001-03-04T00:00:00.000000000+0000 "file1.txt" -- 37 md5:9fe822ddd1cb81d83aae00fa48239bd3 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 33 - - 2001-03-04T00:00:00.000000000+0000 "file1.txt" +- 37 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" diff --git a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst-old index 74a0975d9..e2b916d4a 100644 --- a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,4 +1,4 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" diff --git a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst index 8ef63fed8..3e93d92de 100644 --- a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 33 md5:ea683c03f780b76a62405456b08ae6fd - 2001-03-04T00:00:00.000000000+0000 "file1.txt..path1" -- 33 md5:2b4975bb20f7be674e66d78570ba2fb1 - 2001-01-02T00:00:00.000000000+0000 "file1.txt..path2" -- 37 md5:9fe822ddd1cb81d83aae00fa48239bd3 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 33 - - 2001-03-04T00:00:00.000000000+0000 "file1.txt..path1" +- 33 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt..path2" +- 37 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" diff --git a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst-new index 8bea8b845..4f4da2514 100644 --- a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,4 +1,4 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 33 md5:2b4975bb20f7be674e66d78570ba2fb1 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 37 md5:9fe822ddd1cb81d83aae00fa48239bd3 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 33 - - 2001-01-02T00:00:00.000000000+0000 "file1.txt" +- 37 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" diff --git a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst-old index 74a0975d9..e2b916d4a 100644 --- a/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_equal/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,4 +1,4 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" diff --git a/cmd/bisync/testdata/test_equal/golden/test.log b/cmd/bisync/testdata/test_equal/golden/test.log index 097be45a6..e496bc95e 100644 --- a/cmd/bisync/testdata/test_equal/golden/test.log +++ b/cmd/bisync/testdata/test_equal/golden/test.log @@ -3,10 +3,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -23,16 +33,28 @@ INFO : Bisync successful (13) : test bisync run (14) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - file1.txt -INFO : - Path1 File is newer - file2.txt -INFO : Path1: 2 changes: 0 new, 2 newer, 0 older, 0 deleted +INFO : - Path1 File changed: size (larger), time (newer) - file1.txt +INFO : - Path1 File changed: size (larger), time (newer) - file2.txt +INFO : Path1: 2 changes:  0 new,  2 modified,  0 deleted +INFO : (Modified:  2 newer,  0 older,  2 larger,  0 smaller) INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : - Path2 File is newer - file2.txt -INFO : Path2: 2 changes: 0 new, 2 newer, 0 older, 0 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file1.txt +INFO : - Path2 File changed: size (larger), time (newer) - file2.txt +INFO : Path2: 2 changes:  0 new,  2 modified,  0 deleted +INFO : (Modified:  2 newer,  0 older,  2 larger,  0 smaller) INFO : Applying changes INFO : Checking potential conflicts... ERROR : file1.txt: md5 differ @@ -41,14 +63,14 @@ NOTICE: {path2String}: 1 errors while checking NOTICE: {path2String}: 1 matching files INFO : Finished checking the potential conflicts. 1 differences found NOTICE: - WARNING New or changed in both paths - file1.txt -NOTICE: - Path1 Renaming Path1 copy - {path1/}file1.txt..path1 -NOTICE: - Path1 Queue copy to Path2 - {path2/}file1.txt..path1 +NOTICE: - Path1 Renaming Path1 copy - {path1/}file1.txt..path1 +NOTICE: - Path1 Queue copy to Path2 - {path2/}file1.txt..path1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file1.txt..path2 -NOTICE: - Path2 Queue copy to Path1 - {path1/}file1.txt..path2 +NOTICE: - Path2 Queue copy to Path1 - {path1/}file1.txt..path2 NOTICE: - WARNING New or changed in both paths - file2.txt INFO : Files are equal! Skipping: file2.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst-new index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst-old index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst-new index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst-old index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-err index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-err @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-new index fe0dc6daf..06590645e 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path1.lst-new @@ -1,12 +1,12 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-err index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-err @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-new index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-fail._testdir_path1.._testdir_path2.path2.lst-new @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-err index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-err @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-new index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-new @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-old index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path1.lst-old @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-err index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-err @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-new index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-new @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-old index 577a33802..f73773e5d 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/check-access-pass._testdir_path1.._testdir_path2.path2.lst-old @@ -1,13 +1,13 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Русский_ _ _ě_áñ/測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst index e657e7839..1f7335a3a 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst @@ -1,6 +1,6 @@ # bisync listing v1 from test -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-new b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-new index b0c9313f8..aa79684e0 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-new +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-new @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_file1p1" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_file1p1" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-old b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-old index d5769bf3d..e6e079918 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-old +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst-old @@ -1,4 +1,4 @@ # bisync listing v1 from test -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst index e657e7839..1f7335a3a 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst @@ -1,6 +1,6 @@ # bisync listing v1 from test -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_file1p1" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_file1p1" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-new b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-new index 0aac3e9cf..cce8b4946 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-new +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-new @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_file1p2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_file1p2" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-old b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-old index d5769bf3d..e6e079918 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-old +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/normal-sync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst-old @@ -1,4 +1,4 @@ # bisync listing v1 from test -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst b/cmd/bisync/testdata/test_extended_char_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst index d5769bf3d..e6e079918 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path1.lst @@ -1,4 +1,4 @@ # bisync listing v1 from test -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst b/cmd/bisync/testdata/test_extended_char_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst index d5769bf3d..e6e079918 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/resync._testdir_path1_測試_Русский_____ě_áñ.._testdir_path2_測試_Русский_____ě_áñ.path2.lst @@ -1,4 +1,4 @@ # bisync listing v1 from test -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "測試_check file" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "測試_check file" diff --git a/cmd/bisync/testdata/test_extended_char_paths/golden/test.log b/cmd/bisync/testdata/test_extended_char_paths/golden/test.log index 8e3c32045..ede7e1807 100644 --- a/cmd/bisync/testdata/test_extended_char_paths/golden/test.log +++ b/cmd/bisync/testdata/test_extended_char_paths/golden/test.log @@ -14,10 +14,20 @@ (12) : test resync subdirs with extended chars (13) : bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}測試_Русский_ _ _ě_áñ/" with Path2 "{path2/}測試_Русский_ _ _ě_áñ/" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (14) : copy-listings resync @@ -30,19 +40,29 @@ INFO : Bisync successful (19) : test normal sync of subdirs with extended chars (20) : bisync subdir=測試_Русский_{spc}_{spc}_ě_áñ +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}測試_Русский_ _ _ě_áñ/" with Path2 "{path2/}測試_Русский_ _ _ě_áñ/" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is new - 測試_file1p1 -INFO : Path1: 1 changes: 1 new, 0 newer, 0 older, 0 deleted +INFO : - Path1 File is new - 測試_file1p1 +INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted INFO : Path2 checking for diffs -INFO : - Path2 File is new - 測試_file1p2 -INFO : Path2: 1 changes: 1 new, 0 newer, 0 older, 0 deleted +INFO : - Path2 File is new - 測試_file1p2 +INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}測試_Русский_ _ _ě_áñ/測試_file1p1 -INFO : - Path2 Queue copy to Path1 - {path1/}測試_Русский_ _ _ě_áñ/測試_file1p2 +INFO : - Path1 Queue copy to Path2 - {path2/}測試_Русский_ _ _ě_áñ/測試_file1p1 +INFO : - Path2 Queue copy to Path1 - {path1/}測試_Русский_ _ _ě_áñ/測試_file1p2 INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}測試_Русский_ _ _ě_áñ/" vs Path2 "{path2/}測試_Русский_ _ _ě_áñ/" INFO : Bisync successful @@ -50,19 +70,39 @@ INFO : Bisync successful (22) : test check-filename with extended chars. check should fail. (23) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (24) : delete-file {path1/}測試_Русский_{spc}_{spc}_ě_áñ/測試_check{spc}file (25) : bisync check-access check-filename=測試_check{spc}file +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - 測試_Русский_ _ _ě_áñ/測試_check file -INFO : Path1: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path1 File was deleted - 測試_Русский_ _ _ě_áñ/測試_check file +INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted INFO : Path2 checking for diffs INFO : Checking access health ERROR : Access test failed: Path1 count 1, Path2 count 2 - 測試_check file @@ -74,13 +114,33 @@ Bisync error: bisync aborted (27) : test check-filename with extended chars. check should pass. (28) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (29) : bisync check-access check-filename=測試_check{spc}file +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs @@ -96,16 +156,36 @@ INFO : Bisync successful (31) : test filters-file path with extended chars - masks /fileZ.txt (32) : copy-file {datadir/}測試_filtersfile.txt {workdir/} (33) : bisync filters-file={workdir/}測試_filtersfile.txt resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}測試_filtersfile.txt INFO : Storing filters file hash to {workdir/}測試_filtersfile.txt.md5 INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (34) : copy-as {datadir/}file1.txt {path1/} fileZ.txt (35) : bisync filters-file={workdir/}測試_filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}測試_filtersfile.txt INFO : Building Path1 and Path2 listings diff --git a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst index 2d9313ea4..348c62c3d 100644 --- a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,20 +1,20 @@ # bisync listing v1 from test -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "New_top_level_mañana_funcionará.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1_with white space.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "filename_contains_ࢺ_p1m.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir with␊white space.txt/file2 with␊white space.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/file_with_測試_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-03T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path1" -- 42 md5:40b811fb5009223b6da573f169619d8e - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path2" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/mañana_funcionará.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/test.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "Русский.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "New_top_level_mañana_funcionará.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1_with white space.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "filename_contains_ࢺ_p1m.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir with␊white space.txt/file2 with␊white space.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/file_with_測試_.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path1" +- 42 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/mañana_funcionará.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/test.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "Русский.txt" diff --git a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst-new index fa06c1786..3a6214973 100644 --- a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,16 +1,16 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1_with white space.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "filename_contains_ࢺ_p1m.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/file_with_測試_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-03T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/mañana_funcionará.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/test.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1_with white space.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "filename_contains_ࢺ_p1m.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/file_with_測試_.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/mañana_funcionará.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/test.txt" diff --git a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst-old index fc36112a8..9ccdf0249 100644 --- a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,11 +1,11 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" diff --git a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst index 2d9313ea4..348c62c3d 100644 --- a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,20 +1,20 @@ # bisync listing v1 from test -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "New_top_level_mañana_funcionará.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1_with white space.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "filename_contains_ࢺ_p1m.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir with␊white space.txt/file2 with␊white space.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/file_with_測試_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-03T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path1" -- 42 md5:40b811fb5009223b6da573f169619d8e - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path2" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/mañana_funcionará.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/test.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "Русский.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "New_top_level_mañana_funcionará.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file1_with white space.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "filename_contains_ࢺ_p1m.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir with␊white space.txt/file2 with␊white space.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/file_with_測試_.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path1" +- 42 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path2" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/mañana_funcionará.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/test.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "Русский.txt" diff --git a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst-new index 850de84a6..840a0e0fa 100644 --- a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,14 +1,14 @@ # bisync listing v1 from test -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "New_top_level_mañana_funcionará.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir with␊white space.txt/file2 with␊white space.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" -- 42 md5:40b811fb5009223b6da573f169619d8e - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "Русский.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "New_top_level_mañana_funcionará.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir with␊white space.txt/file2 with␊white space.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" +- 42 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "Русский.txt" diff --git a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst-old index fc36112a8..9ccdf0249 100644 --- a/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_extended_filenames/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,11 +1,11 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ě_.txt" -- 272 md5:0033328434f9662a7dae0d1aee7768b6 - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy (2).txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1 - Copy.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file_enconde_mañana_funcionará.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "filename_contains_ࢺ_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ě_.txt" +- 272 - - 2000-01-01T00:00:00.000000000+0000 "subdir_with_ࢺ_/filename_contains_ࢺ_.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "Русский.txt" diff --git a/cmd/bisync/testdata/test_extended_filenames/golden/test.log b/cmd/bisync/testdata/test_extended_filenames/golden/test.log index b2cdcd002..5f5e31959 100644 --- a/cmd/bisync/testdata/test_extended_filenames/golden/test.log +++ b/cmd/bisync/testdata/test_extended_filenames/golden/test.log @@ -12,10 +12,20 @@ (10) : test initial bisync (11) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -48,54 +58,60 @@ INFO : Bisync successful (35) : test bisync run (36) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - Русский.txt -INFO : - Path1 File is new - file1_with white space.txt -INFO : - Path1 File is new - filename_contains_ࢺ_p1m.txt -INFO : - Path1 File is new - subdir_with_ࢺ_/file_with_測試_.txt -INFO : - Path1 File is new - subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt -INFO : - Path1 File is new - subdir_with_ࢺ_/mañana_funcionará.txt -INFO : - Path1 File is new - subdir_with_ࢺ_/test.txt -INFO : Path1: 7 changes: 6 new, 0 newer, 0 older, 1 deleted +INFO : - Path1 File was deleted - Русский.txt +INFO : - Path1 File is new - file1_with white space.txt +INFO : - Path1 File is new - filename_contains_ࢺ_p1m.txt +INFO : - Path1 File is new - subdir_with_ࢺ_/file_with_測試_.txt +INFO : - Path1 File is new - subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt +INFO : - Path1 File is new - subdir_with_ࢺ_/mañana_funcionará.txt +INFO : - Path1 File is new - subdir_with_ࢺ_/test.txt +INFO : Path1: 7 changes:  6 new,  0 modified,  1 deleted INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file_enconde_mañana_funcionará.txt -INFO : - Path2 File was deleted - filename_contains_ࢺ_.txt -INFO : - Path2 File was deleted - subdir_with_ࢺ_/filename_contains_ě_.txt -INFO : - Path2 File is newer - Русский.txt -INFO : - Path2 File is new - New_top_level_mañana_funcionará.txt -INFO : - Path2 File is new - subdir with␊white space.txt/file2 with␊white space.txt -INFO : - Path2 File is new - "subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" -INFO : - Path2 File is new - subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt -INFO : - Path2 File is new - subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt -INFO : Path2: 9 changes: 5 new, 2 newer, 0 older, 2 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file_enconde_mañana_funcionará.txt +INFO : - Path2 File was deleted - filename_contains_ࢺ_.txt +INFO : - Path2 File was deleted - subdir_with_ࢺ_/filename_contains_ě_.txt +INFO : - Path2 File changed: size (larger), time (newer) - Русский.txt +INFO : - Path2 File is new - New_top_level_mañana_funcionará.txt +INFO : - Path2 File is new - subdir with␊white space.txt/file2 with␊white space.txt +INFO : - Path2 File is new - "subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" +INFO : - Path2 File is new - subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt +INFO : - Path2 File is new - subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt +INFO : Path2: 9 changes:  5 new,  2 modified,  2 deleted +INFO : (Modified:  2 newer,  0 older,  2 larger,  0 smaller) INFO : Applying changes -INFO : Checking potential conflicts... -ERROR : subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt: sizes differ -NOTICE: {path2String}: 1 differences found -NOTICE: {path2String}: 1 errors while checking -INFO : Finished checking the potential conflicts. 1 differences found -INFO : - Path1 Queue copy to Path2 - {path2/}file1_with white space.txt -INFO : - Path1 Queue copy to Path2 - {path2/}filename_contains_ࢺ_p1m.txt -INFO : - Path1 Queue copy to Path2 - {path2/}subdir_with_ࢺ_/file_with_測試_.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1_with white space.txt +INFO : - Path1 Queue copy to Path2 - {path2/}filename_contains_ࢺ_p1m.txt +INFO : - Path1 Queue copy to Path2 - {path2/}subdir_with_ࢺ_/file_with_測試_.txt NOTICE: - WARNING New or changed in both paths - subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt -NOTICE: - Path1 Renaming Path1 copy - {path1/}subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path1 -NOTICE: - Path1 Queue copy to Path2 - {path2/}subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path1 +NOTICE: - Path1 Renaming Path1 copy - {path1/}subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path1 +NOTICE: - Path1 Queue copy to Path2 - {path2/}subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path1 NOTICE: - Path2 Renaming Path2 copy - {path2/}subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path2 -NOTICE: - Path2 Queue copy to Path1 - {path1/}subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path2 -INFO : - Path1 Queue copy to Path2 - {path2/}subdir_with_ࢺ_/mañana_funcionará.txt -INFO : - Path1 Queue copy to Path2 - {path2/}subdir_with_ࢺ_/test.txt -INFO : - Path2 Queue copy to Path1 - {path1/}Русский.txt -INFO : - Path2 Queue copy to Path1 - {path1/}New_top_level_mañana_funcionará.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file_enconde_mañana_funcionará.txt -INFO : - Path1 Queue delete - {path1/}filename_contains_ࢺ_.txt -INFO : - Path2 Queue copy to Path1 - {path1/}subdir with␊white space.txt/file2 with␊white space.txt -INFO : - Path2 Queue copy to Path1 - "{path1/}subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" -INFO : - Path1 Queue delete - {path1/}subdir_with_ࢺ_/filename_contains_ě_.txt -INFO : - Path2 Queue copy to Path1 - {path1/}subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt +NOTICE: - Path2 Queue copy to Path1 - {path1/}subdir_with_ࢺ_/filechangedbothpaths_ࢺ_.txt..path2 +INFO : - Path1 Queue copy to Path2 - {path2/}subdir_with_ࢺ_/mañana_funcionará.txt +INFO : - Path1 Queue copy to Path2 - {path2/}subdir_with_ࢺ_/test.txt +INFO : - Path2 Queue copy to Path1 - {path1/}Русский.txt +INFO : - Path2 Queue copy to Path1 - {path1/}New_top_level_mañana_funcionará.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file_enconde_mañana_funcionará.txt +INFO : - Path1 Queue delete - {path1/}filename_contains_ࢺ_.txt +INFO : - Path2 Queue copy to Path1 - {path1/}subdir with␊white space.txt/file2 with␊white space.txt +INFO : - Path2 Queue copy to Path1 - "{path1/}subdir_rawchars_␙_\x81_\xfe/file3_␙_\x81_\xfe" +INFO : - Path1 Queue delete - {path1/}subdir_with_ࢺ_/filename_contains_ě_.txt +INFO : - Path2 Queue copy to Path1 - {path1/}subdir_with_ࢺ_/filename_contains_ࢺ_p2s.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst index b2c606651..0b64e383c 100644 --- a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,11 +1,11 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir/fileZ.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir/fileZ.txt" diff --git a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst-new index b2c606651..0b64e383c 100644 --- a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,11 +1,11 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir/fileZ.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir/fileZ.txt" diff --git a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst-old index c3767400b..3af005f25 100644 --- a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst index b2c606651..0b64e383c 100644 --- a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,11 +1,11 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "subdir/fileZ.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "subdir/fileZ.txt" diff --git a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst-new index c3767400b..3af005f25 100644 --- a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst-old index c3767400b..3af005f25 100644 --- a/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_filters/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filters/golden/resync._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_filters/golden/resync._testdir_path1.._testdir_path2.path1.lst index c3767400b..3af005f25 100644 --- a/cmd/bisync/testdata/test_filters/golden/resync._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_filters/golden/resync._testdir_path1.._testdir_path2.path1.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filters/golden/resync._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_filters/golden/resync._testdir_path1.._testdir_path2.path2.lst index c3767400b..3af005f25 100644 --- a/cmd/bisync/testdata/test_filters/golden/resync._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_filters/golden/resync._testdir_path1.._testdir_path2.path2.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filters/golden/test.log b/cmd/bisync/testdata/test_filters/golden/test.log index 1b1af0935..c43a9beb5 100644 --- a/cmd/bisync/testdata/test_filters/golden/test.log +++ b/cmd/bisync/testdata/test_filters/golden/test.log @@ -5,12 +5,22 @@ (03) : test resync to force building of the filters md5 hash (04) : bisync filters-file={workdir/}filtersfile.flt resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}filtersfile.flt INFO : Storing filters file hash to {workdir/}filtersfile.flt.md5 INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -23,16 +33,26 @@ INFO : Bisync successful (10) : test bisync with filters-file. path2-side fileZ.txt will be filtered. (11) : bisync filters-file={workdir/}filtersfile.flt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}filtersfile.flt INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is new - subdir/fileZ.txt -INFO : Path1: 1 changes: 1 new, 0 newer, 0 older, 0 deleted +INFO : - Path1 File is new - subdir/fileZ.txt +INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted INFO : Path2 checking for diffs INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}subdir/fileZ.txt -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Queue copy to Path2 - {path2/}subdir/fileZ.txt +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-dry b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-dry index 844684626..204e613ff 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-dry +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-dry @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-err index 844684626..204e613ff 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-err @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-new index 844684626..204e613ff 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-old index 844684626..204e613ff 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-dry b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-dry index 844684626..204e613ff 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-dry +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-dry @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-err index 844684626..204e613ff 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-err @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-new index 844684626..204e613ff 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-old index 844684626..204e613ff 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" diff --git a/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log b/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log index 2e099b9f6..5d15dbe36 100644 --- a/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log +++ b/cmd/bisync/testdata/test_filtersfile_checks/golden/test.log @@ -3,10 +3,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -15,6 +25,16 @@ INFO : Bisync successful (06) : test 2. run with filters-file but without md5. should abort. (07) : bisync filters-file={workdir/}filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}filtersfile.txt ERROR : Bisync critical error: filters file md5 hash not found (must run --resync): {workdir/}filtersfile.txt @@ -23,6 +43,16 @@ Bisync error: bisync aborted (08) : test 3. run without filters-file. should be blocked due to prior abort. (09) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" ERROR : Bisync critical error: cannot find prior Path1 or Path2 listings, likely due to critical error on prior run Tip: here are the filenames we were looking for. Do they exist? @@ -35,17 +65,37 @@ Bisync error: bisync aborted (10) : test 4. run with filters-file and resync. (11) : bisync filters-file={workdir/}filtersfile.txt resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}filtersfile.txt INFO : Storing filters file hash to {workdir/}filtersfile.txt.md5 INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (12) : test 5. run with filters-file alone. should run. (13) : bisync filters-file={workdir/}filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}filtersfile.txt INFO : Building Path1 and Path2 listings @@ -61,6 +111,16 @@ INFO : Bisync successful (16) : test 7. run with filters-file alone. should abort. (17) : bisync filters-file={workdir/}filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}filtersfile.txt ERROR : Bisync critical error: filters file has changed (must run --resync): {workdir/}filtersfile.txt @@ -69,17 +129,37 @@ Bisync error: bisync aborted (18) : test 8. run with filters-file and resync and dry-run. should do the dry-run but still cause next non-resync run to abort. (19) : bisync filters-file={workdir/}filtersfile.txt resync dry-run +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}filtersfile.txt INFO : Skipped storing filters file hash to {workdir/}filtersfile.txt.md5 as --dry-run is set INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (20) : test 9. run with filters-file alone. should abort. (21) : bisync filters-file={workdir/}filtersfile.txt +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Using filters file {workdir/}filtersfile.txt ERROR : Bisync critical error: filters file has changed (must run --resync): {workdir/}filtersfile.txt diff --git a/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log b/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log index cf2dcd35c..fc6fc4e8f 100644 --- a/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log +++ b/cmd/bisync/testdata/test_ignorelistingchecksum/golden/test.log @@ -3,17 +3,36 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (04) : bisync resync ignore-listing-checksum +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -24,19 +43,30 @@ INFO : Bisync successful (08) : test bisync run (09) : bisync ignore-listing-checksum +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - subdir/file20.txt -INFO : Path1: 1 changes: 0 new, 1 newer, 0 older, 0 deleted +INFO : - Path1 File changed: size (larger), time (newer) - subdir/file20.txt +INFO : Path1: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : Path2: 1 changes: 0 new, 1 newer, 0 older, 0 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file1.txt +INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst index b454740c0..9410ce110 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst-new index b454740c0..9410ce110 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst-old index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst index b454740c0..9410ce110 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst-new index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst-old index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst-new index b454740c0..9410ce110 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst-new @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst-new index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path1/golden/test.log b/cmd/bisync/testdata/test_max_delete_path1/golden/test.log index 99259ad92..877b48f0a 100644 --- a/cmd/bisync/testdata/test_max_delete_path1/golden/test.log +++ b/cmd/bisync/testdata/test_max_delete_path1/golden/test.log @@ -3,10 +3,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -19,15 +29,25 @@ INFO : Bisync successful (10) : test sync should fail due to too many local deletes (11) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - file1.txt -INFO : - Path1 File was deleted - file2.txt -INFO : - Path1 File was deleted - file3.txt -INFO : - Path1 File was deleted - file4.txt -INFO : - Path1 File was deleted - file5.txt -INFO : Path1: 5 changes: 0 new, 0 newer, 0 older, 5 deleted +INFO : - Path1 File was deleted - file1.txt +INFO : - Path1 File was deleted - file2.txt +INFO : - Path1 File was deleted - file3.txt +INFO : - Path1 File was deleted - file4.txt +INFO : - Path1 File was deleted - file5.txt +INFO : Path1: 5 changes:  0 new,  0 modified,  5 deleted INFO : Path2 checking for diffs ERROR : Safety abort: too many deletes (>50%, 5 of 9) on Path1 "{path1/}". Run with --force if desired. NOTICE: Bisync aborted. Please try again. @@ -36,23 +56,33 @@ Bisync error: too many deletes (13) : test change max-delete limit to 60%. sync should run. (14) : bisync max-delete=60 +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - file1.txt -INFO : - Path1 File was deleted - file2.txt -INFO : - Path1 File was deleted - file3.txt -INFO : - Path1 File was deleted - file4.txt -INFO : - Path1 File was deleted - file5.txt -INFO : Path1: 5 changes: 0 new, 0 newer, 0 older, 5 deleted +INFO : - Path1 File was deleted - file1.txt +INFO : - Path1 File was deleted - file2.txt +INFO : - Path1 File was deleted - file3.txt +INFO : - Path1 File was deleted - file4.txt +INFO : - Path1 File was deleted - file5.txt +INFO : Path1: 5 changes:  0 new,  0 modified,  5 deleted INFO : Path2 checking for diffs INFO : Applying changes -INFO : - Path2 Queue delete - {path2/}file1.txt -INFO : - Path2 Queue delete - {path2/}file2.txt -INFO : - Path2 Queue delete - {path2/}file3.txt -INFO : - Path2 Queue delete - {path2/}file4.txt -INFO : - Path2 Queue delete - {path2/}file5.txt -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path2 Queue delete - {path2/}file1.txt +INFO : - Path2 Queue delete - {path2/}file2.txt +INFO : - Path2 Queue delete - {path2/}file3.txt +INFO : - Path2 Queue delete - {path2/}file4.txt +INFO : - Path2 Queue delete - {path2/}file5.txt +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst index b454740c0..9410ce110 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst-new index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst-old index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst index b454740c0..9410ce110 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst-new index b454740c0..9410ce110 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst-old index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst-new index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path1.lst-new @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst index a105688f2..482270ec0 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst @@ -1,10 +1,10 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst-new index b454740c0..9410ce110 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/initial-fail._testdir_path1.._testdir_path2.path2.lst-new @@ -1,5 +1,5 @@ # bisync listing v1 from test -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file8.txt" -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "file9.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file8.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "file9.txt" diff --git a/cmd/bisync/testdata/test_max_delete_path2_force/golden/test.log b/cmd/bisync/testdata/test_max_delete_path2_force/golden/test.log index b8f91faef..d6efc5981 100644 --- a/cmd/bisync/testdata/test_max_delete_path2_force/golden/test.log +++ b/cmd/bisync/testdata/test_max_delete_path2_force/golden/test.log @@ -3,10 +3,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -19,16 +29,26 @@ INFO : Bisync successful (10) : test sync should fail due to too many path2 deletes (11) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs INFO : Path2 checking for diffs -INFO : - Path2 File was deleted - file1.txt -INFO : - Path2 File was deleted - file2.txt -INFO : - Path2 File was deleted - file3.txt -INFO : - Path2 File was deleted - file4.txt -INFO : - Path2 File was deleted - file5.txt -INFO : Path2: 5 changes: 0 new, 0 newer, 0 older, 5 deleted +INFO : - Path2 File was deleted - file1.txt +INFO : - Path2 File was deleted - file2.txt +INFO : - Path2 File was deleted - file3.txt +INFO : - Path2 File was deleted - file4.txt +INFO : - Path2 File was deleted - file5.txt +INFO : Path2: 5 changes:  0 new,  0 modified,  5 deleted ERROR : Safety abort: too many deletes (>50%, 5 of 9) on Path2 "{path2/}". Run with --force if desired. NOTICE: Bisync aborted. Please try again. Bisync error: too many deletes @@ -36,22 +56,32 @@ Bisync error: too many deletes (13) : test apply force option. sync should run. (14) : bisync force +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs INFO : Path2 checking for diffs -INFO : - Path2 File was deleted - file1.txt -INFO : - Path2 File was deleted - file2.txt -INFO : - Path2 File was deleted - file3.txt -INFO : - Path2 File was deleted - file4.txt -INFO : - Path2 File was deleted - file5.txt -INFO : Path2: 5 changes: 0 new, 0 newer, 0 older, 5 deleted +INFO : - Path2 File was deleted - file1.txt +INFO : - Path2 File was deleted - file2.txt +INFO : - Path2 File was deleted - file3.txt +INFO : - Path2 File was deleted - file4.txt +INFO : - Path2 File was deleted - file5.txt +INFO : Path2: 5 changes:  0 new,  0 modified,  5 deleted INFO : Applying changes -INFO : - Path1 Queue delete - {path1/}file1.txt -INFO : - Path1 Queue delete - {path1/}file2.txt -INFO : - Path1 Queue delete - {path1/}file3.txt -INFO : - Path1 Queue delete - {path1/}file4.txt -INFO : - Path1 Queue delete - {path1/}file5.txt +INFO : - Path1 Queue delete - {path1/}file1.txt +INFO : - Path1 Queue delete - {path1/}file2.txt +INFO : - Path1 Queue delete - {path1/}file3.txt +INFO : - Path1 Queue delete - {path1/}file4.txt +INFO : - Path1 Queue delete - {path1/}file5.txt INFO : - Path2 Do queued copies to - Path1 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst index ae1a6278b..cdcb637c1 100644 --- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-new index 7c2dc8156..ce7d68aa0 100644 --- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-03T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-old index ef150b300..7b6936323 100644 --- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-03T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/éééö.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/HeLlO,wOrLd!.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/éééö.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst index d4a293c84..b724e7a4a 100644 --- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/hello,WORLD!.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/hello,WORLD!.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "folder/éééö.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-new index c0a689c72..6d1771d37 100644 --- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-05T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/hello,WORLD!.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/éééö.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +- 19 - - 2001-01-05T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/hello,WORLD!.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/éééö.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" diff --git a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-old index b85b8c3b6..2ed93adea 100644 --- a/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_normalization/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,7 +1,7 @@ # bisync listing v1 from test -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-03T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/hello,WORLD!.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "folder/éééö.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/hello,WORLD!.txt" +- 19 - - 2001-01-03T00:00:00.000000000+0000 "folder/éééö.txt" +- 19 - - 2001-01-02T00:00:00.000000000+0000 "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" diff --git a/cmd/bisync/testdata/test_normalization/golden/test.log b/cmd/bisync/testdata/test_normalization/golden/test.log index dd473711c..c8c0f2a6d 100644 --- a/cmd/bisync/testdata/test_normalization/golden/test.log +++ b/cmd/bisync/testdata/test_normalization/golden/test.log @@ -4,10 +4,20 @@ (02) : touch-copy 2001-01-02 {datadir/}file1.txt {path2/} (03) : test initial bisync (04) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -23,18 +33,29 @@ INFO : Bisync successful (11) : test bisync run with fix-case (12) : bisync fix-case +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is new - folder/HeLlO,wOrLd!.txt -INFO : - Path1 File is new - folder/éééö.txt -INFO : - Path1 File is new - "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" -INFO : Path1: 3 changes: 3 new, 0 newer, 0 older, 0 deleted +INFO : - Path1 File is new - folder/HeLlO,wOrLd!.txt +INFO : - Path1 File is new - folder/éééö.txt +INFO : - Path1 File is new - "測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +INFO : Path1: 3 changes:  3 new,  0 modified,  0 deleted INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : - Path2 File is new - folder/éééö.txt -INFO : - Path2 File is new - folder/hello,WORLD!.txt -INFO : Path2: 3 changes: 2 new, 1 newer, 0 older, 0 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file1.txt +INFO : - Path2 File is new - folder/éééö.txt +INFO : - Path2 File is new - folder/hello,WORLD!.txt +INFO : Path2: 3 changes:  2 new,  1 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) INFO : Applying changes INFO : Checking potential conflicts... NOTICE: {path2String}: 0 differences found @@ -44,10 +65,10 @@ NOTICE: - WARNING New or changed in both paths - f INFO : folder/hello,WORLD!.txt: Files are equal but will copy anyway to fix case to folder/HeLlO,wOrLd!.txt NOTICE: - WARNING New or changed in both paths - folder/éééö.txt INFO : folder/éééö.txt: Files are equal but will copy anyway to fix case to folder/éééö.txt -INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" -INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Русский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : folder/hello,WORLD!.txt: Fixed case by renaming to: folder/HeLlO,wOrLd!.txt INFO : folder/éééö.txt: Fixed case by renaming to: folder/éééö.txt INFO : Updating listings @@ -61,10 +82,20 @@ INFO : Bisync successful (16) : copy-as-NFC {datadir/}file1.txt {path2/} file2.txt (17) : copy-as-NFC {datadir/}file1.txt {path1/} file3.txt (18) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -80,41 +111,64 @@ INFO : Bisync successful (25) : test bisync run with normalization (26) : bisync norm force +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is new - folder/HeLlO,wOrLd!.txt -INFO : - Path1 File is new - folder/éééö.txt -INFO : - Path1 File is new - "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" -INFO : Path1: 3 changes: 3 new, 0 newer, 0 older, 0 deleted +INFO : - Path1 File is new - folder/HeLlO,wOrLd!.txt +INFO : - Path1 File is new - folder/éééö.txt +INFO : - Path1 File is new - "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +INFO : Path1: 3 changes:  3 new,  0 modified,  0 deleted INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : - Path2 File is new - folder/éééö.txt -INFO : - Path2 File is new - folder/hello,WORLD!.txt -INFO : Path2: 3 changes: 2 new, 1 newer, 0 older, 0 deleted +INFO : - Path2 File changed: time (newer) - file1.txt +INFO : - Path2 File is new - folder/éééö.txt +INFO : - Path2 File is new - folder/hello,WORLD!.txt +INFO : Path2: 3 changes:  2 new,  1 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older) INFO : Applying changes INFO : Checking potential conflicts... NOTICE: {path2String}: 0 differences found NOTICE: {path2String}: 2 matching files INFO : Finished checking the potential conflicts. %!s() NOTICE: - WARNING New or changed in both paths - folder/HeLlO,wOrLd!.txt -INFO : Files are equal! Skipping: folder/HeLlO,wOrLd!.txt +INFO : folder/HeLlO,wOrLd!.txt: Files are equal but will copy anyway to update modtime (will not rename) +INFO : - Path2 Queue copy to Path1 - {path1/}folder/HeLlO,wOrLd!.txt NOTICE: - WARNING New or changed in both paths - folder/éééö.txt -INFO : Files are equal! Skipping: folder/éééö.txt -INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" -INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : folder/éééö.txt: Files are equal but will copy anyway to update modtime (will not rename) +INFO : - Path2 Queue copy to Path1 - {path1/}folder/éééö.txt +INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful (27) : test resync (28) : bisync resync norm +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -124,23 +178,35 @@ INFO : Bisync successful (32) : copy-as-NFC {datadir/}file1.txt {path1/}folder éééö.txt (33) : copy-as-NFC {datadir/}file1.txt {path1/}folder HeLlO,wOrLd!.txt (34) : bisync norm +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - folder/HeLlO,wOrLd!.txt -INFO : - Path1 File is newer - folder/éééö.txt -INFO : - Path1 File is newer - "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" -INFO : Path1: 3 changes: 0 new, 3 newer, 0 older, 0 deleted +INFO : - Path1 File changed: time (newer) - folder/HeLlO,wOrLd!.txt +INFO : - Path1 File changed: time (newer) - folder/éééö.txt +INFO : - Path1 File changed: time (newer) - "測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +INFO : Path1: 3 changes:  0 new,  3 modified,  0 deleted +INFO : (Modified:  3 newer,  0 older) INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : Path2: 1 changes: 0 new, 1 newer, 0 older, 0 deleted +INFO : - Path2 File changed: time (newer) - file1.txt +INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older) INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}folder/hello,WORLD!.txt -INFO : - Path1 Queue copy to Path2 - {path2/}folder/éééö.txt -INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" -INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path1 Queue copy to Path2 - {path2/}folder/hello,WORLD!.txt +INFO : - Path1 Queue copy to Path2 - {path2/}folder/éééö.txt +INFO : - Path1 Queue copy to Path2 - "{path2/}測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö/測試_Руский___ě_áñ👸🏼🧝🏾\u200d♀️💆🏿\u200d♂️🐨🤙🏼🤮🧑🏻\u200d🔧🧑\u200d🔬éö.txt" +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst index 317d2cf5c..4d732c610 100644 --- a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,6 +1,6 @@ # bisync listing v1 from test - 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file21.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2007-07-23T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2023-08-26T00:00:00.000000000+0000 "subdir/file20.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2023-08-26T00:00:00.000000000+0000 "subdir/file21.txt" diff --git a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst-new index 4305c5420..6c7f72eaf 100644 --- a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,6 +1,6 @@ # bisync listing v1 from test - 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "subdir/file20.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file21.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2007-07-23T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2023-08-26T00:00:00.000000000+0000 "subdir/file20.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2007-07-23T00:00:00.000000000+0000 "subdir/file21.txt" diff --git a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst-old index df7868bef..3c238e4b8 100644 --- a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,6 +1,6 @@ # bisync listing v1 from test - 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file21.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2007-07-23T00:00:00.000000000+0000 "file1.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2007-07-23T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2007-07-23T00:00:00.000000000+0000 "subdir/file20.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2007-07-23T00:00:00.000000000+0000 "subdir/file21.txt" diff --git a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst index 1933dad81..4d732c610 100644 --- a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,6 +1,6 @@ # bisync listing v1 from test - 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "subdir/file21.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2007-07-23T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2023-08-26T00:00:00.000000000+0000 "subdir/file20.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2023-08-26T00:00:00.000000000+0000 "subdir/file21.txt" diff --git a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst-new index 6c638eaa5..966e51592 100644 --- a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,6 +1,6 @@ # bisync listing v1 from test - 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2001-01-02T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2001-01-02T00:00:00.000000000+0000 "subdir/file21.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2007-07-23T00:00:00.000000000+0000 "file1.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2007-07-23T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2007-07-23T00:00:00.000000000+0000 "subdir/file20.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2023-08-26T00:00:00.000000000+0000 "subdir/file21.txt" diff --git a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst-old index df7868bef..3c238e4b8 100644 --- a/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_rclone_args/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,6 +1,6 @@ # bisync listing v1 from test - 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file20.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "subdir/file21.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2007-07-23T00:00:00.000000000+0000 "file1.txt" +- 19 md5:7fe98ed88552b828777d8630900346b8 - 2007-07-23T00:00:00.000000000+0000 "file2.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2007-07-23T00:00:00.000000000+0000 "subdir/file20.txt" +- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2007-07-23T00:00:00.000000000+0000 "subdir/file21.txt" diff --git a/cmd/bisync/testdata/test_rclone_args/golden/test.log b/cmd/bisync/testdata/test_rclone_args/golden/test.log index e68bd7411..10819ff05 100644 --- a/cmd/bisync/testdata/test_rclone_args/golden/test.log +++ b/cmd/bisync/testdata/test_rclone_args/golden/test.log @@ -2,11 +2,20 @@ (02) : test initial bisync -(03) : bisync resync +(03) : bisync resync checksum +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": false, +"Size": true, +"Checksum": true, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": true +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -22,24 +31,173 @@ INFO : Bisync successful (09) : copy-file {datadir/}file21.txt {path2/}subdir (10) : test run bisync with custom options -(11) : bisync size-only +(11) : bisync checksum +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": false, +"Size": true, +"Checksum": true, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": true +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - file1.txt -INFO : - Path1 File is newer - subdir/file20.txt -INFO : Path1: 2 changes: 0 new, 2 newer, 0 older, 0 deleted +INFO : - Path1 File changed: hash - file1.txt +INFO : Path1: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  1 hash differs) INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file2.txt -INFO : - Path2 File is newer - subdir/file21.txt -INFO : Path2: 2 changes: 0 new, 2 newer, 0 older, 0 deleted +INFO : - Path2 File changed: size (larger), hash - file2.txt +INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  1 larger,  0 smaller,  1 hash differs) INFO : Applying changes -INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt -INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt -INFO : - Path2 Queue copy to Path1 - {path1/}subdir/file21.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 +INFO : Updating listings +INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" +INFO : Bisync successful + +(12) : touch-glob 2007-07-23 {datadir/} * + +(13) : copy-file {datadir/}file1.txt {path1/} +(14) : copy-file {datadir/}file2.txt {path2/} + +(15) : copy-file {datadir/}file20.txt {path1/}subdir +(16) : copy-as {datadir/}file21.txt {path2/} file1.txt + +(17) : bisync size-only +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": false, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} +INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" +INFO : Building Path1 and Path2 listings +INFO : Path1 checking for diffs +INFO : Path2 checking for diffs +INFO : - Path2 File changed: size (smaller) - file1.txt +INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  0 larger,  1 smaller) +INFO : Applying changes +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path2 Do queued copies to - Path1 +INFO : Updating listings +INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" +INFO : Bisync successful +(18) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} +INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" +INFO : Copying unique Path2 files to Path1 +INFO : - Path2 Resync is copying UNIQUE files to - Path1 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : Resync updating listings +INFO : Bisync successful + +(19) : copy-file {datadir/}file1.txt {path1/} +(20) : copy-file {datadir/}file2.txt {path2/} + +(21) : copy-file {datadir/}file20.txt {path1/}subdir +(22) : copy-file {datadir/}file21.txt {path2/}subdir + +(23) : bisync ignore-size +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": false, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} +INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" +INFO : Building Path1 and Path2 listings +INFO : Path1 checking for diffs +INFO : Path2 checking for diffs +INFO : - Path2 File changed: time (newer) - file2.txt +INFO : - Path2 File changed: time (newer) - subdir/file21.txt +INFO : Path2: 2 changes:  0 new,  2 modified,  0 deleted +INFO : (Modified:  2 newer,  0 older) +INFO : Applying changes +INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt +INFO : - Path2 Queue copy to Path1 - {path1/}subdir/file21.txt +INFO : - Path2 Do queued copies to - Path1 +INFO : Updating listings +INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" +INFO : Bisync successful + +(24) : bisync resync compare-all +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": true, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": true +} +INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" +INFO : Copying unique Path2 files to Path1 +INFO : - Path2 Resync is copying UNIQUE files to - Path1 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : Resync updating listings +INFO : Bisync successful + +(25) : copy-as {datadir/}file21.txt {path2/} file2.txt + +(26) : touch-glob 2023-08-26 {datadir/} * + +(27) : copy-file {datadir/}file1.txt {path1/} + +(28) : copy-file {datadir/}file20.txt {path1/}subdir +(29) : copy-file {datadir/}file21.txt {path2/}subdir + +(30) : bisync compare-all +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": true, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": true +} +INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" +INFO : Building Path1 and Path2 listings +INFO : Path1 checking for diffs +INFO : - Path1 File changed: time (newer) - file1.txt +INFO : - Path1 File changed: time (newer) - subdir/file20.txt +INFO : Path1: 2 changes:  0 new,  2 modified,  0 deleted +INFO : (Modified:  2 newer,  0 older) +INFO : Path2 checking for diffs +INFO : - Path2 File changed: size (smaller), hash - file2.txt +INFO : - Path2 File changed: time (newer) - subdir/file21.txt +INFO : Path2: 2 changes:  0 new,  2 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older,  0 larger,  1 smaller,  1 hash differs) +INFO : Applying changes +INFO : - Path1 Queue copy to Path2 - {path2/}file1.txt +INFO : - Path1 Queue copy to Path2 - {path2/}subdir/file20.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt +INFO : - Path2 Queue copy to Path1 - {path1/}subdir/file21.txt +INFO : - Path2 Do queued copies to - Path1 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/cmd/bisync/testdata/test_rclone_args/initial/file1.txt b/cmd/bisync/testdata/test_rclone_args/initial/file1.txt index e69de29bb..7c38ed19a 100644 --- a/cmd/bisync/testdata/test_rclone_args/initial/file1.txt +++ b/cmd/bisync/testdata/test_rclone_args/initial/file1.txt @@ -0,0 +1 @@ +This file is older diff --git a/cmd/bisync/testdata/test_rclone_args/scenario.txt b/cmd/bisync/testdata/test_rclone_args/scenario.txt index 6cb3162bb..a4ea81cd1 100644 --- a/cmd/bisync/testdata/test_rclone_args/scenario.txt +++ b/cmd/bisync/testdata/test_rclone_args/scenario.txt @@ -1,12 +1,10 @@ test rclone-args # Pass generic flags to rclone under test using as an example # the --size-only flag, which changes the meaning of operations. -# Note that --size-only is honored by the rclone proper, but not bisync. -# Bisync copies the newer {path2/}file21.txt to {path1/}, but `rlcone sync` -# does not copy the newer {path1/}file20.txt to {path2/}. + test initial bisync -bisync resync +bisync resync checksum test place newer files on both paths @@ -20,4 +18,36 @@ copy-file {datadir/}file20.txt {path1/}subdir copy-file {datadir/}file21.txt {path2/}subdir test run bisync with custom options +bisync checksum + +touch-glob 2007-07-23 {datadir/} * + +copy-file {datadir/}file1.txt {path1/} +copy-file {datadir/}file2.txt {path2/} + +copy-file {datadir/}file20.txt {path1/}subdir +copy-as {datadir/}file21.txt {path2/} file1.txt + bisync size-only +bisync resync + +copy-file {datadir/}file1.txt {path1/} +copy-file {datadir/}file2.txt {path2/} + +copy-file {datadir/}file20.txt {path1/}subdir +copy-file {datadir/}file21.txt {path2/}subdir + +bisync ignore-size + +bisync resync compare-all + +copy-as {datadir/}file21.txt {path2/} file2.txt + +touch-glob 2023-08-26 {datadir/} * + +copy-file {datadir/}file1.txt {path1/} + +copy-file {datadir/}file20.txt {path1/}subdir +copy-file {datadir/}file21.txt {path2/}subdir + +bisync compare-all \ No newline at end of file diff --git a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-err index 565120782..ec565c15c 100644 --- a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-err +++ b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-err @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2002-02-02T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 1999-09-09T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2002-02-02T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 19 - - 1999-09-09T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-new index 565120782..ec565c15c 100644 --- a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2002-02-02T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 1999-09-09T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2002-02-02T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 19 - - 1999-09-09T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-old index 565120782..ec565c15c 100644 --- a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2002-02-02T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 1999-09-09T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2002-02-02T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 19 - - 1999-09-09T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path2.lst-err index 565120782..ec565c15c 100644 --- a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path2.lst-err +++ b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path2.lst-err @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2002-02-02T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 1999-09-09T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2002-02-02T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 19 - - 1999-09-09T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path2.lst-old index 565120782..ec565c15c 100644 --- a/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_resync/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2002-02-02T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 1999-09-09T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2002-02-02T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 19 - - 1999-09-09T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/empty-path1._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_resync/golden/empty-path1._testdir_path1.._testdir_path2.path1.lst index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_resync/golden/empty-path1._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_resync/golden/empty-path1._testdir_path1.._testdir_path2.path1.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/empty-path1._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_resync/golden/empty-path1._testdir_path1.._testdir_path2.path2.lst index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_resync/golden/empty-path1._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_resync/golden/empty-path1._testdir_path1.._testdir_path2.path2.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/empty-path2._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_resync/golden/empty-path2._testdir_path1.._testdir_path2.path1.lst index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_resync/golden/empty-path2._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_resync/golden/empty-path2._testdir_path1.._testdir_path2.path1.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/empty-path2._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_resync/golden/empty-path2._testdir_path1.._testdir_path2.path2.lst index 8ff472b60..a82119a44 100644 --- a/cmd/bisync/testdata/test_resync/golden/empty-path2._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_resync/golden/empty-path2._testdir_path1.._testdir_path2.path2.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/mixed-diffs._testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_resync/golden/mixed-diffs._testdir_path1.._testdir_path2.path1.lst index 565120782..ec565c15c 100644 --- a/cmd/bisync/testdata/test_resync/golden/mixed-diffs._testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_resync/golden/mixed-diffs._testdir_path1.._testdir_path2.path1.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2002-02-02T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 1999-09-09T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2002-02-02T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 19 - - 1999-09-09T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/mixed-diffs._testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_resync/golden/mixed-diffs._testdir_path1.._testdir_path2.path2.lst index 565120782..ec565c15c 100644 --- a/cmd/bisync/testdata/test_resync/golden/mixed-diffs._testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_resync/golden/mixed-diffs._testdir_path1.._testdir_path2.path2.lst @@ -1,9 +1,9 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2002-02-02T00:00:00.000000000+0000 "file4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file5.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 1999-09-09T00:00:00.000000000+0000 "file6.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file7.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2002-02-02T00:00:00.000000000+0000 "file4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file5.txt" +- 19 - - 1999-09-09T00:00:00.000000000+0000 "file6.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file7.txt" diff --git a/cmd/bisync/testdata/test_resync/golden/test.log b/cmd/bisync/testdata/test_resync/golden/test.log index 1ae9daea2..9c7164f85 100644 --- a/cmd/bisync/testdata/test_resync/golden/test.log +++ b/cmd/bisync/testdata/test_resync/golden/test.log @@ -4,10 +4,20 @@ (02) : test 1. resync with empty path1, resulting in copying all content from path2. (03) : purge-children {path1/} (04) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (05) : move-listings empty-path1 @@ -15,10 +25,20 @@ INFO : Bisync successful (06) : test 2. resync with empty path2, resulting in synching all content to path2. (07) : purge-children {path2/} (08) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (09) : move-listings empty-path2 @@ -52,16 +72,36 @@ INFO : Bisync successful (29) : test run bisync with resync (30) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful (31) : copy-listings mixed-diffs (32) : test run normal bisync (33) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs @@ -74,6 +114,16 @@ INFO : Bisync successful (34) : test 4. confirm critical error on normal sync of empty path. (35) : purge-children {path2/} (36) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs diff --git a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst index dfacfb520..aaa32cfe5 100644 --- a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst-new index dfacfb520..aaa32cfe5 100644 --- a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst-old index dfacfb520..aaa32cfe5 100644 --- a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst index dfacfb520..aaa32cfe5 100644 --- a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst-new index dfacfb520..aaa32cfe5 100644 --- a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst-old index dfacfb520..aaa32cfe5 100644 --- a/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_rmdirs/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,8 +1,8 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" -- 0 md5:d41d8cd98f00b204e9800998ecf8427e - 2000-01-01T00:00:00.000000000+0000 "file1.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy1.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy2.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy3.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy4.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.copy5.txt" +- 0 - - 2000-01-01T00:00:00.000000000+0000 "file1.txt" diff --git a/cmd/bisync/testdata/test_rmdirs/golden/test.log b/cmd/bisync/testdata/test_rmdirs/golden/test.log index 32d79b746..b5e47b879 100644 --- a/cmd/bisync/testdata/test_rmdirs/golden/test.log +++ b/cmd/bisync/testdata/test_rmdirs/golden/test.log @@ -3,10 +3,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -15,15 +25,25 @@ INFO : Bisync successful (06) : test 2. run bisync without remove-empty-dirs (07) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File was deleted - subdir/file20.txt -INFO : Path1: 1 changes: 0 new, 0 newer, 0 older, 1 deleted +INFO : - Path1 File was deleted - subdir/file20.txt +INFO : Path1: 1 changes:  0 new,  0 modified,  1 deleted INFO : Path2 checking for diffs INFO : Applying changes -INFO : - Path2 Queue delete - {path2/}subdir/file20.txt -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path2 Queue delete - {path2/}subdir/file20.txt +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful @@ -36,6 +56,16 @@ subdir/ - filename hash: 86ae37b338459868804e9697025ba4c2 (11) : test 4. run bisync with remove-empty-dirs (12) : bisync remove-empty-dirs +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst index fe9dd1f50..1a9f106fc 100644 --- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst +++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst @@ -1,103 +1,103 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file0.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file100.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file11.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file12.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file13.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file14.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file15.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file16.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file17.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file18.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file19.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file20.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file21.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file22.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file23.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file24.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file25.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file26.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file27.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file28.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file29.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file30.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file31.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file32.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file33.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file34.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file35.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file36.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file37.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file38.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file39.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file4.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file40.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file41.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file42.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file43.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file44.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file45.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file46.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file47.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file48.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file49.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file51.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file52.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file53.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file54.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file55.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file56.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file57.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file58.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file59.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file60.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file61.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file62.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file63.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file64.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file65.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file66.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file67.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file68.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file69.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file7.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file70.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file71.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file72.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file73.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file74.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file75.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file76.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file77.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file78.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file79.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file8.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file80.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file81.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file82.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file83.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file84.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file85.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file86.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file87.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file88.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file89.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file9.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file90.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file91.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file92.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file93.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file94.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file95.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file96.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file97.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file98.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file99.txt" diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-new index deb7f2753..9adf42243 100644 --- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-new +++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-new @@ -1,104 +1,104 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file0.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file100.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file11.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file12.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file13.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file14.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file15.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file16.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file17.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file18.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file19.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file20.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file21.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file22.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file23.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file24.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file25.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file26.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file27.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file28.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file29.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file30.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file31.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file32.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file33.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file34.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file35.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file36.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file37.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file38.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file39.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file4.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file40.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file41.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file42.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file43.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file44.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file45.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file46.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file47.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file48.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file49.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file51.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file52.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file53.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file54.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file55.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file56.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file57.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file58.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file59.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file60.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file61.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file62.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file63.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file64.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file65.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file66.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file67.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file68.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file69.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file7.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file70.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file71.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file72.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file73.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file74.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file75.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file76.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file77.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file78.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file79.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file8.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file80.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file81.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file82.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file83.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file84.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file85.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file86.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file87.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file88.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file89.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file9.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file90.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file91.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file92.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file93.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file94.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file95.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file96.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file97.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file98.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file99.txt" diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-old index fe9dd1f50..1a9f106fc 100644 --- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-old +++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path1.lst-old @@ -1,103 +1,103 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file0.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file100.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file11.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file12.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file13.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file14.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file15.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file16.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file17.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file18.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file19.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file20.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file21.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file22.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file23.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file24.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file25.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file26.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file27.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file28.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file29.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file30.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file31.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file32.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file33.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file34.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file35.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file36.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file37.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file38.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file39.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file4.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file40.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file41.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file42.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file43.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file44.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file45.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file46.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file47.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file48.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file49.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file51.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file52.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file53.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file54.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file55.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file56.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file57.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file58.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file59.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file60.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file61.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file62.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file63.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file64.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file65.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file66.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file67.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file68.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file69.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file7.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file70.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file71.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file72.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file73.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file74.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file75.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file76.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file77.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file78.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file79.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file8.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file80.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file81.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file82.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file83.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file84.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file85.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file86.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file87.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file88.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file89.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file9.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file90.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file91.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file92.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file93.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file94.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file95.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file96.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file97.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file98.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file99.txt" diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst index fe9dd1f50..1a9f106fc 100644 --- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst +++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst @@ -1,103 +1,103 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file0.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file100.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file11.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file12.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file13.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file14.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file15.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file16.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file17.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file18.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file19.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file20.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file21.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file22.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file23.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file24.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file25.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file26.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file27.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file28.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file29.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file30.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file31.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file32.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file33.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file34.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file35.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file36.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file37.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file38.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file39.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file4.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file40.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file41.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file42.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file43.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file44.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file45.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file46.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file47.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file48.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file49.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file51.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file52.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file53.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file54.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file55.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file56.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file57.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file58.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file59.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file60.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file61.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file62.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file63.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file64.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file65.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file66.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file67.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file68.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file69.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file7.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file70.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file71.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file72.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file73.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file74.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file75.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file76.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file77.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file78.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file79.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file8.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file80.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file81.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file82.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file83.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file84.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file85.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file86.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file87.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file88.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file89.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file9.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file90.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file91.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file92.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file93.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file94.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file95.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file96.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file97.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file98.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file99.txt" diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-new index f6d4b4bdc..a8ce37fdc 100644 --- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-new +++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-new @@ -1,104 +1,104 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file0.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file100.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file11.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file12.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file13.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file14.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file15.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file16.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file17.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file18.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file19.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file20.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file21.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file22.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file23.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file24.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file25.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file26.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file27.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file28.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file29.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file30.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file31.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file32.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file33.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file34.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file35.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file36.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file37.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file38.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file39.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file4.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file40.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file41.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file42.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file43.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file44.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file45.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file46.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file47.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file48.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file49.txt" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file51.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file52.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file53.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file54.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file55.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file56.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file57.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file58.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file59.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file60.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file61.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file62.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file63.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file64.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file65.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file66.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file67.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file68.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file69.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file7.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file70.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file71.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file72.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file73.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file74.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file75.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file76.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file77.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file78.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file79.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file8.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file80.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file81.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file82.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file83.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file84.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file85.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file86.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file87.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file88.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file89.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file9.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file90.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file91.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file92.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file93.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file94.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file95.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file96.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file97.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file98.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file99.txt" diff --git a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-old index fe9dd1f50..1a9f106fc 100644 --- a/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-old +++ b/cmd/bisync/testdata/test_volatile/golden/_testdir_path1.._testdir_path2.path2.lst-old @@ -1,103 +1,103 @@ # bisync listing v1 from test -- 109 md5:294d25b294ff26a5243dba914ac3fbf7 - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file0.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file1.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file10.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file100.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file11.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file12.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file13.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file14.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file15.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file16.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file17.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file18.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file19.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file2.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file20.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file21.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file22.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file23.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file24.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file25.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file26.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file27.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file28.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file29.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file3.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file30.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file31.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file32.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file33.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file34.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file35.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file36.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file37.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file38.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file39.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file4.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file40.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file41.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file42.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file43.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file44.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file45.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file46.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file47.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file48.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file49.txt" -- 39 md5:0860a03592626642f8fd6c8bfb447d2a - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" -- 39 md5:979a803b15d27df0c31ad7d29006d10b - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file51.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file52.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file53.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file54.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file55.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file56.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file57.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file58.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file59.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file6.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file60.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file61.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file62.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file63.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file64.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file65.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file66.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file67.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file68.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file69.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file7.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file70.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file71.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file72.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file73.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file74.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file75.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file76.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file77.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file78.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file79.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file8.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file80.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file81.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file82.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file83.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file84.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file85.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file86.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file87.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file88.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file89.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file9.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file90.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file91.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file92.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file93.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file94.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file95.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file96.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file97.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file98.txt" -- 19 md5:7fe98ed88552b828777d8630900346b8 - 2023-08-26T00:00:00.000000000+0000 "file99.txt" +- 109 - - 2000-01-01T00:00:00.000000000+0000 "RCLONE_TEST" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file0.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file1.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file10.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file100.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file11.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file12.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file13.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file14.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file15.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file16.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file17.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file18.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file19.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file2.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file20.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file21.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file22.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file23.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file24.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file25.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file26.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file27.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file28.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file29.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file3.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file30.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file31.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file32.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file33.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file34.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file35.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file36.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file37.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file38.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file39.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file4.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file40.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file41.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file42.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file43.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file44.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file45.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file46.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file47.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file48.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file49.txt" +- 39 - - 2001-03-04T00:00:00.000000000+0000 "file5.txt..path1" +- 39 - - 2001-01-02T00:00:00.000000000+0000 "file5.txt..path2" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file51.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file52.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file53.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file54.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file55.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file56.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file57.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file58.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file59.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file6.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file60.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file61.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file62.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file63.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file64.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file65.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file66.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file67.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file68.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file69.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file7.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file70.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file71.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file72.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file73.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file74.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file75.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file76.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file77.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file78.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file79.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file8.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file80.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file81.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file82.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file83.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file84.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file85.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file86.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file87.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file88.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file89.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file9.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file90.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file91.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file92.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file93.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file94.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file95.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file96.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file97.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file98.txt" +- 19 - - 2023-08-26T00:00:00.000000000+0000 "file99.txt" diff --git a/cmd/bisync/testdata/test_volatile/golden/test.log b/cmd/bisync/testdata/test_volatile/golden/test.log index fcfe3f580..7facb5980 100644 --- a/cmd/bisync/testdata/test_volatile/golden/test.log +++ b/cmd/bisync/testdata/test_volatile/golden/test.log @@ -2,10 +2,20 @@ (02) : test initial bisync (03) : bisync resync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Copying unique Path2 files to Path1 INFO : - Path2 Resync is copying UNIQUE files to - Path1 -INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 +INFO : - Path1 Resync is copying UNIQUE OR DIFFERING files to - Path2 INFO : Resync updating listings INFO : Bisync successful @@ -19,14 +29,26 @@ INFO : Bisync successful (10) : test bisync with 50 files created during - should ignore new files (11) : test-func (12) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is newer - file5.txt -INFO : Path1: 1 changes: 0 new, 1 newer, 0 older, 0 deleted +INFO : - Path1 File changed: size (larger), time (newer) - file5.txt +INFO : Path1: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file5.txt -INFO : Path2: 1 changes: 0 new, 1 newer, 0 older, 0 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file5.txt +INFO : Path2: 1 changes:  0 new,  1 modified,  0 deleted +INFO : (Modified:  1 newer,  0 older,  1 larger,  0 smaller) INFO : Applying changes INFO : Checking potential conflicts... ERROR : file5.txt: md5 differ @@ -34,12 +56,12 @@ NOTICE: {path2String}: 1 differences found NOTICE: {path2String}: 1 errors while checking INFO : Finished checking the potential conflicts. 1 differences found NOTICE: - WARNING New or changed in both paths - file5.txt -NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 -NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 +NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 +NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt..path2 -NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 +NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful @@ -53,225 +75,236 @@ INFO : Bisync successful (18) : test next bisync - should now notice new files (19) : test-func (20) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is new - file100.txt -INFO : - Path1 File is new - file5.txt -INFO : - Path1 File is new - file51.txt -INFO : - Path1 File is new - file52.txt -INFO : - Path1 File is new - file53.txt -INFO : - Path1 File is new - file54.txt -INFO : - Path1 File is new - file55.txt -INFO : - Path1 File is new - file56.txt -INFO : - Path1 File is new - file57.txt -INFO : - Path1 File is new - file58.txt -INFO : - Path1 File is new - file59.txt -INFO : - Path1 File is new - file60.txt -INFO : - Path1 File is new - file61.txt -INFO : - Path1 File is new - file62.txt -INFO : - Path1 File is new - file63.txt -INFO : - Path1 File is new - file64.txt -INFO : - Path1 File is new - file65.txt -INFO : - Path1 File is new - file66.txt -INFO : - Path1 File is new - file67.txt -INFO : - Path1 File is new - file68.txt -INFO : - Path1 File is new - file69.txt -INFO : - Path1 File is new - file70.txt -INFO : - Path1 File is new - file71.txt -INFO : - Path1 File is new - file72.txt -INFO : - Path1 File is new - file73.txt -INFO : - Path1 File is new - file74.txt -INFO : - Path1 File is new - file75.txt -INFO : - Path1 File is new - file76.txt -INFO : - Path1 File is new - file77.txt -INFO : - Path1 File is new - file78.txt -INFO : - Path1 File is new - file79.txt -INFO : - Path1 File is new - file80.txt -INFO : - Path1 File is new - file81.txt -INFO : - Path1 File is new - file82.txt -INFO : - Path1 File is new - file83.txt -INFO : - Path1 File is new - file84.txt -INFO : - Path1 File is new - file85.txt -INFO : - Path1 File is new - file86.txt -INFO : - Path1 File is new - file87.txt -INFO : - Path1 File is new - file88.txt -INFO : - Path1 File is new - file89.txt -INFO : - Path1 File is new - file90.txt -INFO : - Path1 File is new - file91.txt -INFO : - Path1 File is new - file92.txt -INFO : - Path1 File is new - file93.txt -INFO : - Path1 File is new - file94.txt -INFO : - Path1 File is new - file95.txt -INFO : - Path1 File is new - file96.txt -INFO : - Path1 File is new - file97.txt -INFO : - Path1 File is new - file98.txt -INFO : - Path1 File is new - file99.txt -INFO : Path1: 51 changes: 51 new, 0 newer, 0 older, 0 deleted +INFO : - Path1 File is new - file100.txt +INFO : - Path1 File is new - file5.txt +INFO : - Path1 File is new - file51.txt +INFO : - Path1 File is new - file52.txt +INFO : - Path1 File is new - file53.txt +INFO : - Path1 File is new - file54.txt +INFO : - Path1 File is new - file55.txt +INFO : - Path1 File is new - file56.txt +INFO : - Path1 File is new - file57.txt +INFO : - Path1 File is new - file58.txt +INFO : - Path1 File is new - file59.txt +INFO : - Path1 File is new - file60.txt +INFO : - Path1 File is new - file61.txt +INFO : - Path1 File is new - file62.txt +INFO : - Path1 File is new - file63.txt +INFO : - Path1 File is new - file64.txt +INFO : - Path1 File is new - file65.txt +INFO : - Path1 File is new - file66.txt +INFO : - Path1 File is new - file67.txt +INFO : - Path1 File is new - file68.txt +INFO : - Path1 File is new - file69.txt +INFO : - Path1 File is new - file70.txt +INFO : - Path1 File is new - file71.txt +INFO : - Path1 File is new - file72.txt +INFO : - Path1 File is new - file73.txt +INFO : - Path1 File is new - file74.txt +INFO : - Path1 File is new - file75.txt +INFO : - Path1 File is new - file76.txt +INFO : - Path1 File is new - file77.txt +INFO : - Path1 File is new - file78.txt +INFO : - Path1 File is new - file79.txt +INFO : - Path1 File is new - file80.txt +INFO : - Path1 File is new - file81.txt +INFO : - Path1 File is new - file82.txt +INFO : - Path1 File is new - file83.txt +INFO : - Path1 File is new - file84.txt +INFO : - Path1 File is new - file85.txt +INFO : - Path1 File is new - file86.txt +INFO : - Path1 File is new - file87.txt +INFO : - Path1 File is new - file88.txt +INFO : - Path1 File is new - file89.txt +INFO : - Path1 File is new - file90.txt +INFO : - Path1 File is new - file91.txt +INFO : - Path1 File is new - file92.txt +INFO : - Path1 File is new - file93.txt +INFO : - Path1 File is new - file94.txt +INFO : - Path1 File is new - file95.txt +INFO : - Path1 File is new - file96.txt +INFO : - Path1 File is new - file97.txt +INFO : - Path1 File is new - file98.txt +INFO : - Path1 File is new - file99.txt +INFO : Path1: 51 changes:  51 new,  0 modified,  0 deleted INFO : Path2 checking for diffs -INFO : - Path2 File is newer - file1.txt -INFO : - Path2 File is newer - file2.txt -INFO : - Path2 File is newer - file3.txt -INFO : - Path2 File is newer - file4.txt -INFO : - Path2 File is newer - file6.txt -INFO : - Path2 File is newer - file7.txt -INFO : - Path2 File is newer - file8.txt -INFO : - Path2 File is new - file0.txt -INFO : - Path2 File is new - file10.txt -INFO : - Path2 File is new - file11.txt -INFO : - Path2 File is new - file12.txt -INFO : - Path2 File is new - file13.txt -INFO : - Path2 File is new - file14.txt -INFO : - Path2 File is new - file15.txt -INFO : - Path2 File is new - file16.txt -INFO : - Path2 File is new - file17.txt -INFO : - Path2 File is new - file18.txt -INFO : - Path2 File is new - file19.txt -INFO : - Path2 File is new - file20.txt -INFO : - Path2 File is new - file21.txt -INFO : - Path2 File is new - file22.txt -INFO : - Path2 File is new - file23.txt -INFO : - Path2 File is new - file24.txt -INFO : - Path2 File is new - file25.txt -INFO : - Path2 File is new - file26.txt -INFO : - Path2 File is new - file27.txt -INFO : - Path2 File is new - file28.txt -INFO : - Path2 File is new - file29.txt -INFO : - Path2 File is new - file30.txt -INFO : - Path2 File is new - file31.txt -INFO : - Path2 File is new - file32.txt -INFO : - Path2 File is new - file33.txt -INFO : - Path2 File is new - file34.txt -INFO : - Path2 File is new - file35.txt -INFO : - Path2 File is new - file36.txt -INFO : - Path2 File is new - file37.txt -INFO : - Path2 File is new - file38.txt -INFO : - Path2 File is new - file39.txt -INFO : - Path2 File is new - file40.txt -INFO : - Path2 File is new - file41.txt -INFO : - Path2 File is new - file42.txt -INFO : - Path2 File is new - file43.txt -INFO : - Path2 File is new - file44.txt -INFO : - Path2 File is new - file45.txt -INFO : - Path2 File is new - file46.txt -INFO : - Path2 File is new - file47.txt -INFO : - Path2 File is new - file48.txt -INFO : - Path2 File is new - file49.txt -INFO : - Path2 File is new - file5.txt -INFO : - Path2 File is new - file9.txt -INFO : Path2: 50 changes: 43 new, 7 newer, 0 older, 0 deleted +INFO : - Path2 File changed: size (larger), time (newer) - file1.txt +INFO : - Path2 File changed: size (larger), time (newer) - file2.txt +INFO : - Path2 File changed: size (larger), time (newer) - file3.txt +INFO : - Path2 File changed: size (larger), time (newer) - file4.txt +INFO : - Path2 File changed: size (larger), time (newer) - file6.txt +INFO : - Path2 File changed: size (larger), time (newer) - file7.txt +INFO : - Path2 File changed: size (larger), time (newer) - file8.txt +INFO : - Path2 File is new - file0.txt +INFO : - Path2 File is new - file10.txt +INFO : - Path2 File is new - file11.txt +INFO : - Path2 File is new - file12.txt +INFO : - Path2 File is new - file13.txt +INFO : - Path2 File is new - file14.txt +INFO : - Path2 File is new - file15.txt +INFO : - Path2 File is new - file16.txt +INFO : - Path2 File is new - file17.txt +INFO : - Path2 File is new - file18.txt +INFO : - Path2 File is new - file19.txt +INFO : - Path2 File is new - file20.txt +INFO : - Path2 File is new - file21.txt +INFO : - Path2 File is new - file22.txt +INFO : - Path2 File is new - file23.txt +INFO : - Path2 File is new - file24.txt +INFO : - Path2 File is new - file25.txt +INFO : - Path2 File is new - file26.txt +INFO : - Path2 File is new - file27.txt +INFO : - Path2 File is new - file28.txt +INFO : - Path2 File is new - file29.txt +INFO : - Path2 File is new - file30.txt +INFO : - Path2 File is new - file31.txt +INFO : - Path2 File is new - file32.txt +INFO : - Path2 File is new - file33.txt +INFO : - Path2 File is new - file34.txt +INFO : - Path2 File is new - file35.txt +INFO : - Path2 File is new - file36.txt +INFO : - Path2 File is new - file37.txt +INFO : - Path2 File is new - file38.txt +INFO : - Path2 File is new - file39.txt +INFO : - Path2 File is new - file40.txt +INFO : - Path2 File is new - file41.txt +INFO : - Path2 File is new - file42.txt +INFO : - Path2 File is new - file43.txt +INFO : - Path2 File is new - file44.txt +INFO : - Path2 File is new - file45.txt +INFO : - Path2 File is new - file46.txt +INFO : - Path2 File is new - file47.txt +INFO : - Path2 File is new - file48.txt +INFO : - Path2 File is new - file49.txt +INFO : - Path2 File is new - file5.txt +INFO : - Path2 File is new - file9.txt +INFO : Path2: 50 changes:  43 new,  7 modified,  0 deleted +INFO : (Modified:  7 newer,  0 older,  7 larger,  0 smaller) INFO : Applying changes INFO : Checking potential conflicts... ERROR : file5.txt: md5 differ NOTICE: {path2String}: 1 differences found NOTICE: {path2String}: 1 errors while checking INFO : Finished checking the potential conflicts. 1 differences found -INFO : - Path1 Queue copy to Path2 - {path2/}file100.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file100.txt NOTICE: - WARNING New or changed in both paths - file5.txt -NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 -NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 +NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 +NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt..path2 -NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 -INFO : - Path1 Queue copy to Path2 - {path2/}file51.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file52.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file53.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file54.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file55.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file56.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file57.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file58.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file59.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file60.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file61.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file62.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file63.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file64.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file65.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file66.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file67.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file68.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file69.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file70.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file71.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file72.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file73.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file74.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file75.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file76.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file77.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file78.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file79.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file80.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file81.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file82.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file83.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file84.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file85.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file86.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file87.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file88.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file89.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file90.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file91.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file92.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file93.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file94.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file95.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file96.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file97.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file98.txt -INFO : - Path1 Queue copy to Path2 - {path2/}file99.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file0.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file11.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file12.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file13.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file14.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file15.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file16.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file17.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file18.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file19.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file20.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file21.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file22.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file23.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file24.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file25.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file26.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file27.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file28.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file29.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file3.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file30.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file31.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file32.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file33.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file34.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file35.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file36.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file37.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file38.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file39.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file4.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file40.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file41.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file42.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file43.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file44.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file45.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file46.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file47.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file48.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file49.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file7.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file8.txt -INFO : - Path2 Queue copy to Path1 - {path1/}file9.txt +NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 +INFO : - Path1 Queue copy to Path2 - {path2/}file51.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file52.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file53.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file54.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file55.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file56.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file57.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file58.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file59.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file60.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file61.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file62.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file63.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file64.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file65.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file66.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file67.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file68.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file69.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file70.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file71.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file72.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file73.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file74.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file75.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file76.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file77.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file78.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file79.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file80.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file81.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file82.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file83.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file84.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file85.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file86.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file87.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file88.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file89.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file90.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file91.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file92.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file93.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file94.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file95.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file96.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file97.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file98.txt +INFO : - Path1 Queue copy to Path2 - {path2/}file99.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file0.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file1.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file10.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file11.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file12.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file13.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file14.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file15.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file16.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file17.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file18.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file19.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file2.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file20.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file21.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file22.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file23.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file24.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file25.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file26.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file27.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file28.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file29.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file3.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file30.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file31.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file32.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file33.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file34.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file35.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file36.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file37.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file38.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file39.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file4.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file40.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file41.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file42.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file43.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file44.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file45.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file46.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file47.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file48.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file49.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file6.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file7.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file8.txt +INFO : - Path2 Queue copy to Path1 - {path1/}file9.txt INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful @@ -285,14 +318,24 @@ INFO : Bisync successful (26) : test next bisync - should be no changes except dummy (27) : test-func (28) : bisync +INFO : Setting --ignore-listing-checksum as neither --checksum nor --compare checksum are set. +INFO : Bisyncing with Comparison Settings: +{ +"Modtime": true, +"Size": true, +"Checksum": false, +"NoSlowHash": false, +"SlowHashSyncOnly": false, +"DownloadHash": false +} INFO : Synching Path1 "{path1/}" with Path2 "{path2/}" INFO : Building Path1 and Path2 listings INFO : Path1 checking for diffs -INFO : - Path1 File is new - file5.txt -INFO : Path1: 1 changes: 1 new, 0 newer, 0 older, 0 deleted +INFO : - Path1 File is new - file5.txt +INFO : Path1: 1 changes:  1 new,  0 modified,  0 deleted INFO : Path2 checking for diffs -INFO : - Path2 File is new - file5.txt -INFO : Path2: 1 changes: 1 new, 0 newer, 0 older, 0 deleted +INFO : - Path2 File is new - file5.txt +INFO : Path2: 1 changes:  1 new,  0 modified,  0 deleted INFO : Applying changes INFO : Checking potential conflicts... ERROR : file5.txt: md5 differ @@ -300,12 +343,12 @@ NOTICE: {path2String}: 1 differences found NOTICE: {path2String}: 1 errors while checking INFO : Finished checking the potential conflicts. 1 differences found NOTICE: - WARNING New or changed in both paths - file5.txt -NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 -NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 +NOTICE: - Path1 Renaming Path1 copy - {path1/}file5.txt..path1 +NOTICE: - Path1 Queue copy to Path2 - {path2/}file5.txt..path1 NOTICE: - Path2 Renaming Path2 copy - {path2/}file5.txt..path2 -NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 +NOTICE: - Path2 Queue copy to Path1 - {path1/}file5.txt..path2 INFO : - Path2 Do queued copies to - Path1 -INFO : - Path1 Do queued copies to - Path2 +INFO : - Path1 Do queued copies to - Path2 INFO : Updating listings INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}" INFO : Bisync successful diff --git a/docs/content/bisync.md b/docs/content/bisync.md index 6d8e5cd1b..704d992a9 100644 --- a/docs/content/bisync.md +++ b/docs/content/bisync.md @@ -13,7 +13,7 @@ Make sure you have read and understood the entire [manual](https://rclone.org/bi - [Install rclone](/install/) and setup your remotes. - Bisync will create its working directory - at `~/.cache/rclone/bisync` on Linux + at `~/.cache/rclone/bisync` on Linux, `/Users/yourusername/Library/Caches/rclone/bisync` on Mac, or `C:\Users\MyLogin\AppData\Local\rclone\bisync` on Windows. Make sure that this location is writable. - Run bisync with the `--resync` flag, specifying the paths @@ -23,9 +23,16 @@ Make sure you have read and understood the entire [manual](https://rclone.org/bi unnecessary files and directories from the sync. - Consider setting up the [--check-access](#check-access) feature for safety. -- On Linux, consider setting up a [crontab entry](#cron). bisync can +- On Linux or Mac, consider setting up a [crontab entry](#cron). bisync can safely run in concurrent cron jobs thanks to lock files it maintains. +For example, your first command might look like this: + +``` +rclone bisync remote1:path1 remote2:path2 --create-empty-src-dirs --compare size,modtime,checksum --slow-hash-sync-only --resilient -MvP --drive-skip-gdocs --fix-case --resync --dry-run +``` +If all looks good, run it again without `--dry-run`. After that, remove `--resync` as well. + Here is a typical run log (with timestamps removed for clarity): ``` @@ -149,7 +156,7 @@ as the last step in the process. ## Command-line flags -#### --resync +### --resync This will effectively make both Path1 and Path2 filesystems contain a matching superset of all files. Path2 files that do not exist in Path1 will @@ -189,7 +196,7 @@ Therefore, if you included `--resync` for every bisync run, it would never be po the deleted file would always keep reappearing at the end of every run (because it's being copied from the other side where it still exists). Similarly, renaming a file would always result in a duplicate copy (both old and new name) on both sides. -#### --check-access +### --check-access Access check files are an additional safety measure against data loss. bisync will ensure it can find matching `RCLONE_TEST` files in the same places @@ -218,7 +225,7 @@ bisync assuming a bunch of deleted files if the linked-to tree should not be accessible. See also the [--check-filename](--check-filename) flag. -#### --check-filename +### --check-filename Name of the file(s) used in access health validation. The default `--check-filename` is `RCLONE_TEST`. @@ -226,7 +233,154 @@ One or more files having this filename must exist, synchronized between your source and destination filesets, in order for `--check-access` to succeed. See [--check-access](#check-access) for additional details. -#### --max-delete +### --compare + +As of `v1.66`, bisync fully supports comparing based on any combination of +size, modtime, and checksum (lifting the prior restriction on backends without +modtime support.) + +By default (without the `--compare` flag), bisync inherits the same comparison +options as `sync` +(that is: `size` and `modtime` by default, unless modified with flags such as +[`--checksum`](/docs/#c-checksum) or [`--size-only`](/docs/#size-only).) + +If the `--compare` flag is set, it will override these defaults. This can be +useful if you wish to compare based on combinations not currently supported in +`sync`, such as comparing all three of `size` AND `modtime` AND `checksum` +simultaneously (or just `modtime` AND `checksum`). + +`--compare` takes a comma-separated list, with the currently supported values +being `size`, `modtime`, and `checksum`. For example, if you want to compare +size and checksum, but not modtime, you would do: +``` +--compare size,checksum +``` + +Or if you want to compare all three: +``` +--compare size,modtime,checksum +``` + +`--compare` overrides any conflicting flags. For example, if you set the +conflicting flags `--compare checksum --size-only`, `--size-only` will be +ignored, and bisync will compare checksum and not size. To avoid confusion, it +is recommended to use _either_ `--compare` or the normal `sync` flags, but not +both. + +If `--compare` includes `checksum` and both remotes support checksums but have +no hash types in common with each other, checksums will be considered _only_ +for comparisons within the same side (to determine what has changed since the +prior sync), but not for comparisons against the opposite side. If one side +supports checksums and the other does not, checksums will only be considered on +the side that supports them. + +When comparing with `checksum` and/or `size` without `modtime`, bisync cannot +determine whether a file is `newer` or `older` -- only whether it is `changed` +or `unchanged`. (If it is `changed` on both sides, bisync still does the +standard equality-check to avoid declaring a sync conflict unless it absolutely +has to.) + +It is recommended to do a `--resync` when changing `--compare` settings, as +otherwise your prior listing files may not contain the attributes you wish to +compare (for example, they will not have stored checksums if you were not +previously comparing checksums.) + +### --ignore-listing-checksum + +When `--checksum` or `--compare checksum` is set, bisync will retrieve (or +generate) checksums (for backends that support them) when creating the listings +for both paths, and store the checksums in the listing files. +`--ignore-listing-checksum` will disable this behavior, which may speed things +up considerably, especially on backends (such as [local](/local/)) where hashes +must be computed on the fly instead of retrieved. Please note the following: + +* As of `v1.66`, `--ignore-listing-checksum` is now automatically set when +neither `--checksum` nor `--compare checksum` are in use (as the checksums +would not be used for anything.) +* `--ignore-listing-checksum` is NOT the same as +[`--ignore-checksum`](/docs/#ignore-checksum), +and you may wish to use one or the other, or both. In a nutshell: +`--ignore-listing-checksum` controls whether checksums are considered when +scanning for diffs, +while `--ignore-checksum` controls whether checksums are considered during the +copy/sync operations that follow, +if there ARE diffs. +* Unless `--ignore-listing-checksum` is passed, bisync currently computes +hashes for one path +*even when there's no common hash with the other path* +(for example, a [crypt](/crypt/#modification-times-and-hashes) remote.) +This can still be beneficial, as the hashes will still be used to detect +changes within the same side +(if `--checksum` or `--compare checksum` is set), even if they can't be used to +compare against the opposite side. +* If you wish to ignore listing checksums _only_ on remotes where they are slow +to compute, consider using +[`--no-slow-hash`](#no-slow-hash) (or +[`--slow-hash-sync-only`](#slow-hash-sync-only)) instead of +`--ignore-listing-checksum`. +* If `--ignore-listing-checksum` is used simultaneously with `--compare +checksum` (or `--checksum`), checksums will be ignored for bisync deltas, +but still considered during the sync operations that follow (if deltas are +detected based on modtime and/or size.) + +### --no-slow-hash + +On some remotes (notably `local`), checksums can dramatically slow down a +bisync run, because hashes cannot be stored and need to be computed in +real-time when they are requested. On other remotes (such as `drive`), they add +practically no time at all. The `--no-slow-hash` flag will automatically skip +checksums on remotes where they are slow, while still comparing them on others +(assuming [`--compare`](#compare) includes `checksum`.) This can be useful when one of your +bisync paths is slow but you still want to check checksums on the other, for a more +robust sync. + +### --slow-hash-sync-only + +Same as [`--no-slow-hash`](#no-slow-hash), except slow hashes are still +considered during sync calls. They are still NOT considered for determining +deltas, nor or they included in listings. They are also skipped during +`--resync`. The main use case for this flag is when you have a large number of +files, but relatively few of them change from run to run -- so you don't want +to check your entire tree every time (it would take too long), but you still +want to consider checksums for the smaller group of files for which a `modtime` +or `size` change was detected. Keep in mind that this speed savings comes with +a safety trade-off: if a file's content were to change without a change to its +`modtime` or `size`, bisync would not detect it, and it would not be synced. + +`--slow-hash-sync-only` is only useful if both remotes share a common hash +type (if they don't, bisync will automatically fall back to `--no-slow-hash`.) +Both `--no-slow-hash` and `--slow-hash-sync-only` have no effect without +`--compare checksum` (or `--checksum`). + +### --download-hash + +If `--download-hash` is set, bisync will use best efforts to obtain an MD5 +checksum by downloading and computing on-the-fly, when checksums are not +otherwise available (for example, a remote that doesn't support them.) Note +that since rclone has to download the entire file, this may dramatically slow +down your bisync runs, and is also likely to use a lot of data, so it is +probably not practical for bisync paths with a large total file size. However, +it can be a good option for syncing small-but-important files with maximum +accuracy (for example, a source code repo on a `crypt` remote.) An additional +advantage over methods like [`cryptcheck`](/commands/rclone_cryptcheck/) is +that the original file is not required for comparison (for example, +`--download-hash` can be used to bisync two different crypt remotes with +different passwords.) + +When `--download-hash` is set, bisync still looks for more efficient checksums +first, and falls back to downloading only when none are found. It takes +priority over conflicting flags such as `--no-slow-hash`. `--download-hash` is +not suitable for [Google Docs](#gdocs) and other files of unknown size, as +their checksums would change from run to run (due to small variances in the +internals of the generated export file.) Therefore, bisync automatically skips +`--download-hash` for files with a size less than 0. + +See also: [`Hasher`](https://rclone.org/hasher/) backend, +[`cryptcheck`](/commands/rclone_cryptcheck/) command, [`rclone check +--download`](/commands/rclone_check/) option, +[`md5sum`](/commands/rclone_md5sum/) command + +### --max-delete As a safety check, if greater than the `--max-delete` percent of files were deleted on either the Path1 or Path2 filesystem, then bisync will abort with @@ -244,7 +398,7 @@ to bypass the check. Also see the [all files changed](#all-files-changed) check. -#### --filters-file {#filters-file} +### --filters-file {#filters-file} By using rclone filter features you can exclude file types or directory sub-trees from the sync. @@ -268,7 +422,7 @@ of the current filters file and compares it to the hash stored in the `.md5` fil If they don't match, the run aborts with a critical error and thus forces you to do a `--resync`, likely avoiding a disaster. -#### --check-sync +### --check-sync Enabled by default, the check-sync function checks that all of the same files exist in both the Path1 and Path2 history listings. This _check-sync_ @@ -285,9 +439,19 @@ sync run times for very large numbers of files. The check may be run manually with `--check-sync=only`. It runs only the integrity check and terminates without actually synching. -Note that currently, `--check-sync` **only checks filenames and NOT modtime, size, or hash.** -For a more robust integrity check of the current state, consider using [`check`](commands/rclone_check/) -(or [`cryptcheck`](/commands/rclone_cryptcheck/), if at least one path is a `crypt` remote.) +Note that currently, `--check-sync` **only checks listing snapshots and NOT the +actual files on the remotes.** Note also that the listing snapshots will not +know about any changes that happened during or after the latest bisync run, as +those will be discovered on the next run. Therefore, while listings should +always match _each other_ at the end of a bisync run, it is _expected_ that +they will not match the underlying remotes, nor will the remotes match each +other, if there were changes during or after the run. This is normal, and any +differences will be detected and synced on the next run. + +For a robust integrity check of the current state of the remotes (as opposed to just their listing snapshots), consider using [`check`](commands/rclone_check/) +(or [`cryptcheck`](/commands/rclone_cryptcheck/), if at least one path is a `crypt` remote) instead of `--check-sync`, +keeping in mind that differences are expected if files changed during or after your last bisync run. + For example, a possible sequence could look like this: 1. Normally scheduled bisync run: @@ -319,28 +483,7 @@ consider alternatively running the above `rclone sync` command with `--dry-run` See also: [Concurrent modifications](#concurrent-modifications), [`--resilient`](#resilient) - -#### --ignore-listing-checksum - -By default, bisync will retrieve (or generate) checksums (for backends that support them) -when creating the listings for both paths, and store the checksums in the listing files. -`--ignore-listing-checksum` will disable this behavior, which may speed things up considerably, -especially on backends (such as [local](/local/)) where hashes must be computed on the fly instead of retrieved. -Please note the following: - -* While checksums are (by default) generated and stored in the listing files, -they are NOT currently used for determining diffs (deltas). -It is anticipated that full checksum support will be added in a future version. -* `--ignore-listing-checksum` is NOT the same as [`--ignore-checksum`](/docs/#ignore-checksum), -and you may wish to use one or the other, or both. In a nutshell: -`--ignore-listing-checksum` controls whether checksums are considered when scanning for diffs, -while `--ignore-checksum` controls whether checksums are considered during the copy/sync operations that follow, -if there ARE diffs. -* Unless `--ignore-listing-checksum` is passed, bisync currently computes hashes for one path -*even when there's no common hash with the other path* -(for example, a [crypt](/crypt/#modification-times-and-hashes) remote.) - -#### --resilient +### --resilient ***Caution: this is an experimental feature. Use at your own risk!*** @@ -364,7 +507,7 @@ Certain more serious errors will still enforce a `--resync` lockout, even in `-- Behavior of `--resilient` may change in a future version. -#### --backup-dir1 and --backup-dir2 +### --backup-dir1 and --backup-dir2 As of `v1.66`, [`--backup-dir`](/docs/#backup-dir-dir) is supported in bisync. Because `--backup-dir` must be a non-overlapping path on the same remote, @@ -473,19 +616,12 @@ before you commit to the changes. ### Modification times -Bisync relies on file timestamps to identify changed files and will -_refuse_ to operate if backend lacks the modification time support. - +By default, bisync compares files by modification time and size. If you or your application should change the content of a file -without changing the modification time then bisync will _not_ +without changing the modification time and size, then bisync will _not_ notice the change, and thus will not copy it to the other side. - -Note that on some cloud storage systems it is not possible to have file -timestamps that match _precisely_ between the local and other filesystems. - -Bisync's approach to this problem is by tracking the changes on each side -_separately_ over time with a local database of files in that side then -applying the resulting changes on the other side. +As an alternative, consider comparing by checksum (if your remotes support it). +See [`--compare`](#compare) for details. ### Error handling {#error-handling} @@ -546,14 +682,17 @@ Bisync is considered _BETA_ and has been tested with the following backends: - S3 - SFTP - Yandex Disk +- Crypt It has not been fully tested with other services yet. If it works, or sorta works, please let us know and we'll update the list. Run the test suite to check for proper operation as described below. -First release of `rclone bisync` requires that underlying backend supports -the modification time feature and will refuse to run otherwise. -This limitation will be lifted in a future `rclone bisync` release. +The first release of `rclone bisync` required both underlying backends to support +modification times, and refused to run otherwise. +This limitation has been lifted as of `v1.66`, as bisync now supports comparing +checksum and/or size instead of (or in addition to) modtime. +See [`--compare`](#compare) for details. ### Concurrent modifications @@ -1358,6 +1497,7 @@ for performance improvements and less [risk of error](https://forum.rclone.org/t * Equality checks before a sync conflict rename now fall back to `cryptcheck` (when possible) or `--download`, instead of of `--size-only`, when `check` is not available. * Bisync no longer fails to find the correct listing file when configs are overridden with backend-specific flags. +* Bisync now fully supports comparing based on any combination of size, modtime, and checksum, lifting the prior restriction on backends without modtime support. ### `v1.64` * Fixed an [issue](https://forum.rclone.org/t/bisync-bugs-and-feature-requests/37636#:~:text=1.%20Dry%20runs%20are%20not%20completely%20dry) diff --git a/fs/operations/operations.go b/fs/operations/operations.go index 8772f0d6a..78b271765 100644 --- a/fs/operations/operations.go +++ b/fs/operations/operations.go @@ -180,6 +180,17 @@ func logModTimeUpload(dst fs.Object) { }) } +// EqualFn allows replacing Equal() with a custom function during NeedTransfer() +type EqualFn func(ctx context.Context, src fs.ObjectInfo, dst fs.Object) bool +type equalFnContextKey struct{} + +var equalFnKey = equalFnContextKey{} + +// WithEqualFn stores equalFn in ctx and returns a copy of ctx in which equalFnKey = equalFn +func WithEqualFn(ctx context.Context, equalFn EqualFn) context.Context { + return context.WithValue(ctx, equalFnKey, equalFn) +} + func equal(ctx context.Context, src fs.ObjectInfo, dst fs.Object, opt equalOpt) bool { ci := fs.GetConfig(ctx) logger, _ := GetLogger(ctx) @@ -790,10 +801,10 @@ func ListLong(ctx context.Context, f fs.Fs, w io.Writer) error { }) } -// hashSum returns the human-readable hash for ht passed in. This may +// HashSum returns the human-readable hash for ht passed in. This may // be UNSUPPORTED or ERROR. If it isn't returning a valid hash it will // return an error. -func hashSum(ctx context.Context, ht hash.Type, base64Encoded bool, downloadFlag bool, o fs.Object) (string, error) { +func HashSum(ctx context.Context, ht hash.Type, base64Encoded bool, downloadFlag bool, o fs.Object) (string, error) { var sum string var err error @@ -881,7 +892,7 @@ func HashLister(ctx context.Context, ht hash.Type, outputBase64 bool, downloadFl <-concurrencyControl wg.Done() }() - sum, err := hashSum(ctx, ht, outputBase64, downloadFlag, o) + sum, err := HashSum(ctx, ht, outputBase64, downloadFlag, o) if err != nil { fs.Errorf(o, "%v", fs.CountError(err)) return @@ -1572,6 +1583,10 @@ func NeedTransfer(ctx context.Context, dst, src fs.Object) bool { } } else { // Check to see if changed or not + equalFn, ok := ctx.Value(equalFnKey).(EqualFn) + if ok { + return !equalFn(ctx, src, dst) + } if Equal(ctx, src, dst) && !SameObject(src, dst) { fs.Debugf(src, "Unchanged skipping") return false