"rsync for cloud storage" - Google Drive, S3, Dropbox, Backblaze B2, One Drive, Swift, Hubic, Wasabi, Google Cloud Storage, Azure Blob, Azure Files, Yandex Files
Go azure-blobazure-blob-storageazure-filesbackblaze-b2cloud-storagedropboxencryptionftpfuse-filesystemgogolanggoogle-cloud-storagegoogle-driveonedriveopenstack-swiftrclones3sftpsyncwebdav
bisync: add overlapping paths check
nielashe71b252b6526
diff --git a/cmd/bisync/bisync_test.go b/cmd/bisync/bisync_test.goindex d16e7d6a6..68df96838 100644--- a/cmd/bisync/bisync_test.go+++ b/cmd/bisync/bisync_test.go@@ -837,6 +837,10 @@ func (b *bisyncTest) runBisync(ctx context.Context, args []string) (err error) {case "subdir":fs1 = addSubdir(b.path1, val)fs2 = addSubdir(b.path2, val)+ case "backupdir1":+ opt.BackupDir1 = val+ case "backupdir2":+ opt.BackupDir2 = valcase "ignore-listing-checksum":opt.IgnoreListingChecksum = truecase "no-norm":@@ -1168,6 +1172,10 @@ func (b *bisyncTest) storeGolden() {if fileType(fileName) == "lock" {continue}+ if fileName == "backupdirs" {+ log.Printf("skipping: %v", fileName)+ continue+ }goldName := b.toGolden(fileName)if goldName != fileName {targetPath := filepath.Join(b.workDir, goldName)@@ -1189,6 +1197,10 @@ func (b *bisyncTest) storeGolden() {if fileType(fileName) == "lock" {continue}+ if fileName == "backupdirs" {+ log.Printf("skipping: %v", fileName)+ continue+ }text := b.mangleResult(b.goldenDir, fileName, true)goldName := b.toGolden(fileName)@@ -1205,6 +1217,9 @@ func (b *bisyncTest) storeGolden() {// mangleResult prepares test logs or listings for comparisonfunc (b *bisyncTest) mangleResult(dir, file string, golden bool) string {+ if file == "backupdirs" {+ return "skipping backupdirs"+ }buf, err := os.ReadFile(filepath.Join(dir, file))require.NoError(b.t, err)diff --git a/cmd/bisync/operations.go b/cmd/bisync/operations.goindex 7b0fc0033..8d7334cdf 100644--- a/cmd/bisync/operations.go+++ b/cmd/bisync/operations.go@@ -248,6 +248,14 @@ func (b *bisyncRun) runLocked(octx context.Context) (err error) {b.octx = octxb.fctx = fctx+ // overlapping paths check+ err = b.overlappingPathsCheck(fctx, b.fs1, b.fs2)+ if err != nil {+ b.critical = true+ b.retryable = true+ return err+ }+// Generate Path1 and Path2 listings and copy any unique Path2 files to Path1if opt.Resync {return b.resync(octx, fctx)@@ -676,12 +684,45 @@ func (b *bisyncRun) setBackupDir(ctx context.Context, destPath int) context.Contci.BackupDir = b.opt.BackupDir1}if destPath == 2 && b.opt.BackupDir2 != "" {- ci.BackupDir = b.opt.BackupDir1+ ci.BackupDir = b.opt.BackupDir2}fs.Debugf(ci.BackupDir, "updated backup-dir for Path%d", destPath)return ctx}+func (b *bisyncRun) overlappingPathsCheck(fctx context.Context, fs1, fs2 fs.Fs) error {+ if operations.OverlappingFilterCheck(fctx, fs2, fs1) {+ err = fmt.Errorf(Color(terminal.RedFg, "Overlapping paths detected. Cannot bisync between paths that overlap, unless excluded by filters."))+ return err+ }+ // need to test our BackupDirs too, as sync will be fooled by our --files-from filters+ testBackupDir := func(ctx context.Context, destPath int) error {+ src := fs1+ dst := fs2+ if destPath == 1 {+ src = fs2+ dst = fs1+ }+ ctxBackupDir := b.setBackupDir(ctx, destPath)+ ci := fs.GetConfig(ctxBackupDir)+ if ci.BackupDir != "" {+ // operations.BackupDir should return an error if not properly excluded+ _, err = operations.BackupDir(fctx, dst, src, "")+ return err+ }+ return nil+ }+ err = testBackupDir(fctx, 1)+ if err != nil {+ return err+ }+ err = testBackupDir(fctx, 2)+ if err != nil {+ return err+ }+ return nil+}+func (b *bisyncRun) debug(nametocheck, msgiftrue string) {if b.DebugName != "" && b.DebugName == nametocheck {fs.Infof(Color(terminal.MagentaBg, "DEBUGNAME "+b.DebugName), Color(terminal.MagentaBg, msgiftrue))diff --git a/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.copy1to2.que b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.copy1to2.quenew file mode 100644index 000000000..5725b8184--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/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_backupdir/golden/_testdir_path1.._testdir_path2.copy2to1.que b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.copy2to1.quenew file mode 100644index 000000000..3b79e78bd--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/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_backupdir/golden/_testdir_path1.._testdir_path2.delete1.que b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.delete1.quenew file mode 100644index 000000000..8a5f92a1a--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.delete1.que@@ -0,0 +1 @@+"file3.txt"diff --git a/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.delete2.que b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.delete2.quenew file mode 100644index 000000000..3bf899b25--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.delete2.que@@ -0,0 +1 @@+"file4.txt"diff --git a/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path1.lst-err b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path1.lst-errnew file mode 100644index 000000000..19e9623a5--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path1.lst-err@@ -0,0 +1,10 @@+# bisync listing v1 from test+- 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_backupdir/golden/_testdir_path1.._testdir_path2.path1.lst-new b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path1.lst-newnew file mode 100644index 000000000..19e9623a5--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path1.lst-new@@ -0,0 +1,10 @@+# bisync listing v1 from test+- 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_backupdir/golden/_testdir_path1.._testdir_path2.path1.lst-old b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path1.lst-oldnew file mode 100644index 000000000..19e9623a5--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path1.lst-old@@ -0,0 +1,10 @@+# bisync listing v1 from test+- 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_backupdir/golden/_testdir_path1.._testdir_path2.path2.lst-err b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path2.lst-errnew file mode 100644index 000000000..19e9623a5--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path2.lst-err@@ -0,0 +1,10 @@+# bisync listing v1 from test+- 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_backupdir/golden/_testdir_path1.._testdir_path2.path2.lst-new b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path2.lst-newnew file mode 100644index 000000000..19e9623a5--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path2.lst-new@@ -0,0 +1,10 @@+# bisync listing v1 from test+- 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_backupdir/golden/_testdir_path1.._testdir_path2.path2.lst-old b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path2.lst-oldnew file mode 100644index 000000000..19e9623a5--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/golden/_testdir_path1.._testdir_path2.path2.lst-old@@ -0,0 +1,10 @@+# bisync listing v1 from test+- 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_backupdir/golden/backupdirs/backupdir1/file1.txt b/cmd/bisync/testdata/test_backupdir/golden/backupdirs/backupdir1/file1.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/golden/backupdirs/backupdir1/file3.txt b/cmd/bisync/testdata/test_backupdir/golden/backupdirs/backupdir1/file3.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/golden/backupdirs/backupdir2/file2.txt b/cmd/bisync/testdata/test_backupdir/golden/backupdirs/backupdir2/file2.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/golden/backupdirs/backupdir2/file4.txt b/cmd/bisync/testdata/test_backupdir/golden/backupdirs/backupdir2/file4.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/golden/test.log b/cmd/bisync/testdata/test_backupdir/golden/test.lognew file mode 100644index 000000000..ab8170d50--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/golden/test.log@@ -0,0 +1,153 @@+[36m(01) :[0m [34mtest backupdir[0m+++[36m(02) :[0m [34mtest initial bisync[0m+[36m(03) :[0m [34mbisync resync backupdir1={workdir/}backupdirs/backupdir1 backupdir2={workdir/}backupdirs/backupdir2[0m+INFO : [2mSetting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.[0m+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 : - [34mPath2[0m [35mResync is copying UNIQUE files to[0m - [36mPath1[0m+INFO : - [36mPath1[0m [35mResync is copying UNIQUE OR DIFFERING files to[0m - [36mPath2[0m+INFO : Resync updating listings+INFO : [32mBisync successful[0m++[36m(04) :[0m [34mtest make modifications on both paths[0m+[36m(05) :[0m [34mtest new on path2 - file10[0m+[36m(06) :[0m [34mtouch-copy 2001-01-02 {datadir/}file10.txt {path2/}[0m++[36m(07) :[0m [34mtest newer on path2 - file1[0m+[36m(08) :[0m [34mtouch-copy 2001-01-02 {datadir/}file1.txt {path2/}[0m++[36m(09) :[0m [34mtest new on path1 - file11[0m+[36m(10) :[0m [34mtouch-copy 2001-01-02 {datadir/}file11.txt {path1/}[0m++[36m(11) :[0m [34mtest newer on path1 - file2[0m+[36m(12) :[0m [34mtouch-copy 2001-01-02 {datadir/}file2.txt {path1/}[0m++[36m(13) :[0m [34mtest deleted on path2 - file3[0m+[36m(14) :[0m [34mdelete-file {path2/}file3.txt[0m++[36m(15) :[0m [34mtest deleted on path1 - file4[0m+[36m(16) :[0m [34mdelete-file {path1/}file4.txt[0m++[36m(17) :[0m [34mtest deleted on both paths - file8[0m+[36m(18) :[0m [34mdelete-file {path1/}file8.txt[0m+[36m(19) :[0m [34mdelete-file {path2/}file8.txt[0m++[36m(20) :[0m [34mtest changed on both paths - file5 (file5R, file5L)[0m+[36m(21) :[0m [34mtouch-glob 2001-01-02 {datadir/} file5R.txt[0m+[36m(22) :[0m [34mcopy-as {datadir/}file5R.txt {path2/} file5.txt[0m+[36m(23) :[0m [34mtouch-glob 2001-03-04 {datadir/} file5L.txt[0m+[36m(24) :[0m [34mcopy-as {datadir/}file5L.txt {path1/} file5.txt[0m++[36m(25) :[0m [34mtest newer on path2 and deleted on path1 - file6[0m+[36m(26) :[0m [34mtouch-copy 2001-01-02 {datadir/}file6.txt {path2/}[0m+[36m(27) :[0m [34mdelete-file {path1/}file6.txt[0m++[36m(28) :[0m [34mtest newer on path1 and deleted on path2 - file7[0m+[36m(29) :[0m [34mtouch-copy 2001-01-02 {datadir/}file7.txt {path1/}[0m+[36m(30) :[0m [34mdelete-file {path2/}file7.txt[0m++[36m(31) :[0m [34mtest bisync run[0m+[36m(32) :[0m [34mbisync backupdir1={workdir/}backupdirs/backupdir1 backupdir2={workdir/}backupdirs/backupdir2[0m+INFO : [2mSetting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.[0m+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 : - [36mPath1[0m [35m[33mFile changed: [35msize (larger)[0m, [35mtime (newer)[0m[0m[0m - [36mfile2.txt[0m+INFO : - [36mPath1[0m [35m[31mFile was deleted[0m[0m - [36mfile4.txt[0m+INFO : - [36mPath1[0m [35m[33mFile changed: [35msize (larger)[0m, [35mtime (newer)[0m[0m[0m - [36mfile5.txt[0m+INFO : - [36mPath1[0m [35m[31mFile was deleted[0m[0m - [36mfile6.txt[0m+INFO : - [36mPath1[0m [35m[33mFile changed: [35msize (larger)[0m, [35mtime (newer)[0m[0m[0m - [36mfile7.txt[0m+INFO : - [36mPath1[0m [35m[31mFile was deleted[0m[0m - [36mfile8.txt[0m+INFO : - [36mPath1[0m [35m[32mFile is new[0m[0m - [36mfile11.txt[0m+INFO : Path1: 7 changes: [32m 1 new[0m, [33m 3 modified[0m, [31m 3 deleted[0m+INFO : ([33mModified[0m: [36m 3 newer[0m, [34m 0 older[0m, [36m 3 larger[0m, [34m 0 smaller[0m)+INFO : Path2 checking for diffs+INFO : - [34mPath2[0m [35m[33mFile changed: [35msize (larger)[0m, [35mtime (newer)[0m[0m[0m - [36mfile1.txt[0m+INFO : - [34mPath2[0m [35m[31mFile was deleted[0m[0m - [36mfile3.txt[0m+INFO : - [34mPath2[0m [35m[33mFile changed: [35msize (larger)[0m, [35mtime (newer)[0m[0m[0m - [36mfile5.txt[0m+INFO : - [34mPath2[0m [35m[33mFile changed: [35msize (larger)[0m, [35mtime (newer)[0m[0m[0m - [36mfile6.txt[0m+INFO : - [34mPath2[0m [35m[31mFile was deleted[0m[0m - [36mfile7.txt[0m+INFO : - [34mPath2[0m [35m[31mFile was deleted[0m[0m - [36mfile8.txt[0m+INFO : - [34mPath2[0m [35m[32mFile is new[0m[0m - [36mfile10.txt[0m+INFO : Path2: 7 changes: [32m 1 new[0m, [33m 3 modified[0m, [31m 3 deleted[0m+INFO : ([33mModified[0m: [36m 3 newer[0m, [34m 0 older[0m, [36m 3 larger[0m, [34m 0 smaller[0m)+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 : - [36mPath1[0m [35m[32mQueue copy to[0m Path2[0m - [36m{path2/}file11.txt[0m+INFO : - [36mPath1[0m [35m[32mQueue copy to[0m Path2[0m - [36m{path2/}file2.txt[0m+INFO : - [34mPath2[0m [35m[31mQueue delete[0m[0m - [36m{path2/}file4.txt[0m+NOTICE: - [34mWARNING[0m [35mNew or changed in both paths[0m - [36mfile5.txt[0m+NOTICE: - [36mPath1[0m [35mRenaming Path1 copy[0m - [36m{path1/}file5.txt..path1[0m+NOTICE: - [36mPath1[0m [35m[32mQueue copy to[0m Path2[0m - [36m{path2/}file5.txt..path1[0m+NOTICE: - [34mPath2[0m [35mRenaming Path2 copy[0m - [36m{path2/}file5.txt..path2[0m+NOTICE: - [34mPath2[0m [35m[32mQueue copy to[0m Path1[0m - [36m{path1/}file5.txt..path2[0m+INFO : - [34mPath2[0m [35m[32mQueue copy to[0m Path1[0m - [36m{path1/}file6.txt[0m+INFO : - [36mPath1[0m [35m[32mQueue copy to[0m Path2[0m - [36m{path2/}file7.txt[0m+INFO : - [34mPath2[0m [35m[32mQueue copy to[0m Path1[0m - [36m{path1/}file1.txt[0m+INFO : - [34mPath2[0m [35m[32mQueue copy to[0m Path1[0m - [36m{path1/}file10.txt[0m+INFO : - [36mPath1[0m [35m[31mQueue delete[0m[0m - [36m{path1/}file3.txt[0m+INFO : - [34mPath2[0m [35mDo queued copies to[0m - [36mPath1[0m+INFO : - [36mPath1[0m [35mDo queued copies to[0m - [36mPath2[0m+INFO : Updating listings+INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"+INFO : [32mBisync successful[0m+[36m(33) :[0m [34mbisync backupdir1={workdir/}backupdirs/backupdir1 backupdir2={workdir/}backupdirs/backupdir2[0m+INFO : [2mSetting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.[0m+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 : No changes found+INFO : Updating listings+INFO : Validating listings for Path1 "{path1/}" vs Path2 "{path2/}"+INFO : [32mBisync successful[0m++[36m(34) :[0m [34mtest overlapping path -- should fail[0m+[36m(35) :[0m [34mbisync backupdir1={path1/}subdir/backupdir1 backupdir2={path2/}subdir/backupdir2[0m+INFO : [2mSetting --ignore-listing-checksum as neither --checksum nor --compare checksum are set.[0m+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 : [31mBisync critical error: destination and parameter to --backup-dir mustn't overlap[0m+ERROR : [31mBisync aborted. Must run --resync to recover.[0m+Bisync error: bisync aborteddiff --git a/cmd/bisync/testdata/test_backupdir/initial/RCLONE_TEST b/cmd/bisync/testdata/test_backupdir/initial/RCLONE_TESTnew file mode 100644index 000000000..d8ca97c2a--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/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_backupdir/initial/file1.txt b/cmd/bisync/testdata/test_backupdir/initial/file1.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/initial/file2.txt b/cmd/bisync/testdata/test_backupdir/initial/file2.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/initial/file3.txt b/cmd/bisync/testdata/test_backupdir/initial/file3.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/initial/file4.txt b/cmd/bisync/testdata/test_backupdir/initial/file4.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/initial/file5.txt b/cmd/bisync/testdata/test_backupdir/initial/file5.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/initial/file6.txt b/cmd/bisync/testdata/test_backupdir/initial/file6.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/initial/file7.txt b/cmd/bisync/testdata/test_backupdir/initial/file7.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/initial/file8.txt b/cmd/bisync/testdata/test_backupdir/initial/file8.txtnew file mode 100644index 000000000..e69de29bbdiff --git a/cmd/bisync/testdata/test_backupdir/modfiles/file1.txt b/cmd/bisync/testdata/test_backupdir/modfiles/file1.txtnew file mode 100644index 000000000..464147f09--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/modfiles/file1.txt@@ -0,0 +1 @@+This file is newerdiff --git a/cmd/bisync/testdata/test_backupdir/modfiles/file10.txt b/cmd/bisync/testdata/test_backupdir/modfiles/file10.txtnew file mode 100644index 000000000..464147f09--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/modfiles/file10.txt@@ -0,0 +1 @@+This file is newerdiff --git a/cmd/bisync/testdata/test_backupdir/modfiles/file11.txt b/cmd/bisync/testdata/test_backupdir/modfiles/file11.txtnew file mode 100644index 000000000..464147f09--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/modfiles/file11.txt@@ -0,0 +1 @@+This file is newerdiff --git a/cmd/bisync/testdata/test_backupdir/modfiles/file2.txt b/cmd/bisync/testdata/test_backupdir/modfiles/file2.txtnew file mode 100644index 000000000..0fd70321a--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/modfiles/file2.txt@@ -0,0 +1 @@+Newer version\ No newline at end of filediff --git a/cmd/bisync/testdata/test_backupdir/modfiles/file5L.txt b/cmd/bisync/testdata/test_backupdir/modfiles/file5L.txtnew file mode 100644index 000000000..43ceff1db--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/modfiles/file5L.txt@@ -0,0 +1 @@+This file is newer and not equal to 5Rdiff --git a/cmd/bisync/testdata/test_backupdir/modfiles/file5R.txt b/cmd/bisync/testdata/test_backupdir/modfiles/file5R.txtnew file mode 100644index 000000000..a928fcf13--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/modfiles/file5R.txt@@ -0,0 +1 @@+This file is newer and not equal to 5Ldiff --git a/cmd/bisync/testdata/test_backupdir/modfiles/file6.txt b/cmd/bisync/testdata/test_backupdir/modfiles/file6.txtnew file mode 100644index 000000000..464147f09--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/modfiles/file6.txt@@ -0,0 +1 @@+This file is newerdiff --git a/cmd/bisync/testdata/test_backupdir/modfiles/file7.txt b/cmd/bisync/testdata/test_backupdir/modfiles/file7.txtnew file mode 100644index 000000000..464147f09--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/modfiles/file7.txt@@ -0,0 +1 @@+This file is newerdiff --git a/cmd/bisync/testdata/test_backupdir/scenario.txt b/cmd/bisync/testdata/test_backupdir/scenario.txtnew file mode 100644index 000000000..0b8a53e0d--- /dev/null+++ b/cmd/bisync/testdata/test_backupdir/scenario.txt@@ -0,0 +1,59 @@+test backupdir+# 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 backupdir1={workdir/}backupdirs/backupdir1 backupdir2={workdir/}backupdirs/backupdir2++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 backupdir1={workdir/}backupdirs/backupdir1 backupdir2={workdir/}backupdirs/backupdir2+bisync backupdir1={workdir/}backupdirs/backupdir1 backupdir2={workdir/}backupdirs/backupdir2++test overlapping path -- should fail+bisync backupdir1={path1/}subdir/backupdir1 backupdir2={path2/}subdir/backupdir2