operations: don't remove destination files on errored transfers

See: https://forum.rclone.org/t/transfer-on-mega-in-ftp-mode-is-not-working/24642/7

.github/workflows/build.yml

@@ -241,14 +241,14 @@ jobs:
            fetch-depth: 0
 
        # Upgrade together with NDK version
-       - name: Set up Go 1.16
+       - name: Set up Go 1.14
          uses: actions/setup-go@v1
          with:
-           go-version: 1.16
+           go-version: 1.14
 
        # Upgrade together with Go version. Using a GitHub-provided version saves around 2 minutes.
        - name: Force NDK version
-         run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;22.1.7171670" | grep -v = || true
+         run: echo "y" | sudo ${ANDROID_HOME}/tools/bin/sdkmanager --install "ndk;21.4.7075529" | grep -v = || true
 
        - name: Go module cache
          uses: actions/cache@v2
@@ -279,7 +279,7 @@ jobs:
        - name: arm-v7a Set environment variables
          shell: bash
          run: |
-           echo "CC=$(echo $ANDROID_HOME/ndk/22.1.7171670/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi16-clang)" >> $GITHUB_ENV
+           echo "CC=$(echo $ANDROID_HOME/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi16-clang)" >> $GITHUB_ENV
            echo "CC_FOR_TARGET=$CC" >> $GITHUB_ENV
            echo 'GOOS=android' >> $GITHUB_ENV
            echo 'GOARCH=arm' >> $GITHUB_ENV
@@ -292,7 +292,7 @@ jobs:
        - name: arm64-v8a Set environment variables
          shell: bash
          run: |
-           echo "CC=$(echo $ANDROID_HOME/ndk/22.1.7171670/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang)" >> $GITHUB_ENV
+           echo "CC=$(echo $ANDROID_HOME/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android21-clang)" >> $GITHUB_ENV
            echo "CC_FOR_TARGET=$CC" >> $GITHUB_ENV
            echo 'GOOS=android' >> $GITHUB_ENV
            echo 'GOARCH=arm64' >> $GITHUB_ENV
@@ -305,7 +305,7 @@ jobs:
        - name: x86 Set environment variables
          shell: bash
          run: |
-           echo "CC=$(echo $ANDROID_HOME/ndk/22.1.7171670/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android16-clang)" >> $GITHUB_ENV
+           echo "CC=$(echo $ANDROID_HOME/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android16-clang)" >> $GITHUB_ENV
            echo "CC_FOR_TARGET=$CC" >> $GITHUB_ENV
            echo 'GOOS=android' >> $GITHUB_ENV
            echo 'GOARCH=386' >> $GITHUB_ENV
@@ -318,7 +318,7 @@ jobs:
        - name: x64 Set environment variables
          shell: bash
          run: |
-           echo "CC=$(echo $ANDROID_HOME/ndk/22.1.7171670/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang)" >> $GITHUB_ENV
+           echo "CC=$(echo $ANDROID_HOME/ndk/21.4.7075529/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android21-clang)" >> $GITHUB_ENV
            echo "CC_FOR_TARGET=$CC" >> $GITHUB_ENV
            echo 'GOOS=android' >> $GITHUB_ENV
            echo 'GOARCH=amd64' >> $GITHUB_ENV

.github/workflows/build_publish_release_docker_image.yml

@@ -32,40 +32,3 @@ jobs:
                 publish: true
                 dockerHubUser: ${{ secrets.DOCKER_HUB_USER }}
                 dockerHubPassword: ${{ secrets.DOCKER_HUB_PASSWORD }}
-
-    build_docker_volume_plugin:
-        if: github.repository == 'rclone/rclone'
-        needs: build
-        runs-on: ubuntu-latest
-        name: Build and publish docker volume plugin
-        steps:
-            - name: Checkout master
-              uses: actions/checkout@v2
-              with:
-                fetch-depth: 0
-            - name: Set plugin parameters
-              shell: bash
-              run: |
-                GITHUB_REF=${{ github.ref }}
-
-                PLUGIN_IMAGE_USER=rclone
-                PLUGIN_IMAGE_NAME=docker-volume-rclone
-                PLUGIN_IMAGE_TAG=${GITHUB_REF#refs/tags/}
-                PLUGIN_IMAGE=${PLUGIN_IMAGE_USER}/${PLUGIN_IMAGE_NAME}:${PLUGIN_IMAGE_TAG}
-                PLUGIN_IMAGE_LATEST=${PLUGIN_IMAGE_USER}/${PLUGIN_IMAGE_NAME}:latest
-
-                echo "PLUGIN_IMAGE_USER=${PLUGIN_IMAGE_USER}" >> $GITHUB_ENV
-                echo "PLUGIN_IMAGE_NAME=${PLUGIN_IMAGE_NAME}" >> $GITHUB_ENV
-                echo "PLUGIN_IMAGE_TAG=${PLUGIN_IMAGE_TAG}" >> $GITHUB_ENV
-                echo "PLUGIN_IMAGE=${PLUGIN_IMAGE}" >> $GITHUB_ENV
-                echo "PLUGIN_IMAGE_LATEST=${PLUGIN_IMAGE_LATEST}" >> $GITHUB_ENV
-            - name: Build image
-              shell: bash
-              run: |
-                make docker-plugin
-            - name: Push image
-              shell: bash
-              run: |
-                docker login -u ${{ secrets.DOCKER_HUB_USER }} -p ${{ secrets.DOCKER_HUB_PASSWORD }}
-                make docker-plugin-push PLUGIN_IMAGE=${PLUGIN_IMAGE}
-                make docker-plugin-push PLUGIN_IMAGE=${PLUGIN_IMAGE_LATEST}

.gitignore

@@ -13,4 +13,3 @@ rclone.iml
 fuzz-build.zip
 *.orig
 *.rej
-Thumbs.db

CONTRIBUTING.md

@@ -12,162 +12,95 @@ When filing an issue, please include the following information if
 possible as well as a description of the problem.  Make sure you test
 with the [latest beta of rclone](https://beta.rclone.org/):
 
-  * Rclone version (e.g. output from `rclone version`)
-  * Which OS you are using and how many bits (e.g. Windows 10, 64 bit)
+  * Rclone version (e.g. output from `rclone -V`)
+  * Which OS you are using and how many bits (e.g. Windows 7, 64 bit)
   * The command you were trying to run (e.g. `rclone copy /tmp remote:tmp`)
   * A log of the command with the `-vv` flag (e.g. output from `rclone -vv copy /tmp remote:tmp`)
     * if the log contains secrets then edit the file with a text editor first to obscure them
 
-## Submitting a new feature or bug fix ##
+## Submitting a pull request ##
 
 If you find a bug that you'd like to fix, or a new feature that you'd
 like to implement then please submit a pull request via GitHub.
 
-If it is a big feature, then [make an issue](https://github.com/rclone/rclone/issues) first so it can be discussed.
+If it is a big feature then make an issue first so it can be discussed.
 
-To prepare your pull request first press the fork button on [rclone's GitHub
+You'll need a Go environment set up with GOPATH set.  See [the Go
+getting started docs](https://golang.org/doc/install) for more info.
+
+First in your web browser press the fork button on [rclone's GitHub
 page](https://github.com/rclone/rclone).
 
-Then [install Git](https://git-scm.com/downloads) and set your public contribution [name](https://docs.github.com/en/github/getting-started-with-github/setting-your-username-in-git) and [email](https://docs.github.com/en/github/setting-up-and-managing-your-github-user-account/setting-your-commit-email-address#setting-your-commit-email-address-in-git).
-
-Next open your terminal, change directory to your preferred folder and initialise your local rclone project:
+Now in your terminal
 
     git clone https://github.com/rclone/rclone.git
     cd rclone
     git remote rename origin upstream
-      # if you have SSH keys setup in your GitHub account:
     git remote add origin git@github.com:YOURUSER/rclone.git
-      # otherwise:
-    git remote add origin https://github.com/YOURUSER/rclone.git
-
-Note that most of the terminal commands in the rest of this guide must be executed from the rclone folder created above.
-
-Now [install Go](https://golang.org/doc/install) and verify your installation:
-
-    go version
-
-Great, you can now compile and execute your own version of rclone:
-
     go build
-    ./rclone version
 
-Finally make a branch to add your new feature
+Make a branch to add your new feature
 
     git checkout -b my-new-feature
 
 And get hacking.
 
-You may like one of the [popular editors/IDE's for Go](https://github.com/golang/go/wiki/IDEsAndTextEditorPlugins) and a quick view on the rclone [code organisation](#code-organisation).
+When ready - run the unit tests for the code you changed
 
-When ready - test the affected functionality and run the unit tests for the code you changed
-
-    cd folder/with/changed/files
     go test -v
 
 Note that you may need to make a test remote, e.g. `TestSwift` for some
 of the unit tests.
 
-This is typically enough if you made a simple bug fix, otherwise please read the rclone [testing](#testing) section too.
+Note the top level Makefile targets
+
+  * make check
+  * make test
+
+Both of these will be run by Travis when you make a pull request but
+you can do this yourself locally too.  These require some extra go
+packages which you can install with
+
+  * make build_dep
 
 Make sure you
 
-  * Add [unit tests](#testing) for a new feature.
   * Add [documentation](#writing-documentation) for a new feature.
-  * [Commit your changes](#committing-your-changes) using the [message guideline](#commit-messages).
+  * Follow the [commit message guidelines](#commit-messages).
+  * Add [unit tests](#testing) for a new feature
+  * squash commits down to one per feature
+  * rebase to master with `git rebase master`
 
-When you are done with that push your changes to Github:
+When you are done with that
 
     git push -u origin my-new-feature
 
-and open the GitHub website to [create your pull
+Go to the GitHub website and click [Create pull
 request](https://help.github.com/articles/creating-a-pull-request/).
 
-Your changes will then get reviewed and you might get asked to fix some stuff. If so, then make the changes in the same branch, commit and push your updates to GitHub.
+You patch will get reviewed and you might get asked to fix some stuff.
 
-You may sometimes be asked to [base your changes on the latest master](#basing-your-changes-on-the-latest-master) or [squash your commits](#squashing-your-commits).
+If so, then make the changes in the same branch, squash the commits (make multiple commits one commit) by running:
+```
+git log # See how many commits you want to squash
+git reset --soft HEAD~2 # This squashes the 2 latest commits together.
+git status # Check what will happen, if you made a mistake resetting, you can run git reset 'HEAD@{1}' to undo.
+git commit # Add a new commit message.
+git push --force # Push the squashed commit to your GitHub repo.
+# For more, see Stack Overflow, Git docs, or generally Duck around the web. jtagcat also recommends wizardzines.com
+```
 
-## Using Git and Github ##
-
-### Committing your changes ###
-
-Follow the guideline for [commit messages](#commit-messages) and then:
-
-    git checkout my-new-feature      # To switch to your branch
-    git status                       # To see the new and changed files
-    git add FILENAME                 # To select FILENAME for the commit
-    git status                       # To verify the changes to be committed
-    git commit                       # To do the commit
-    git log                          # To verify the commit. Use q to quit the log
-
-You can modify the message or changes in the latest commit using:
-
-    git commit --amend
-
-If you amend to commits that have been pushed to GitHub, then you will have to [replace your previously pushed commits](#replacing-your-previously-pushed-commits).
-
-### Replacing your previously pushed commits ###
-
-Note that you are about to rewrite the GitHub history of your branch. It is good practice to involve your collaborators before modifying commits that have been pushed to GitHub.
-
-Your previously pushed commits are replaced by:
-
-    git push --force origin my-new-feature 
-
-### Basing your changes on the latest master ###
-
-To base your changes on the latest version of the [rclone master](https://github.com/rclone/rclone/tree/master) (upstream):
-
-    git checkout master
-    git fetch upstream
-    git merge --ff-only
-    git push origin --follow-tags    # optional update of your fork in GitHub
-    git checkout my-new-feature
-    git rebase master
-
-If you rebase commits that have been pushed to GitHub, then you will have to [replace your previously pushed commits](#replacing-your-previously-pushed-commits).
-
-### Squashing your commits ###
-
-To combine your commits into one commit:
-
-    git log                          # To count the commits to squash, e.g. the last 2
-    git reset --soft HEAD~2          # To undo the 2 latest commits
-    git status                       # To check everything is as expected
-
-If everything is fine, then make the new combined commit:
-
-    git commit                       # To commit the undone commits as one
-
-otherwise, you may roll back using:
-
-    git reflog                       # To check that HEAD{1} is your previous state
-    git reset --soft 'HEAD@{1}'      # To roll back to your previous state
-
-If you squash commits that have been pushed to GitHub, then you will have to [replace your previously pushed commits](#replacing-your-previously-pushed-commits).
-
-Tip: You may like to use `git rebase -i master` if you are experienced or have a more complex situation.
-
-### GitHub Continuous Integration ###
+## CI for your fork ##
 
 rclone currently uses [GitHub Actions](https://github.com/rclone/rclone/actions) to build and test the project, which should be automatically available for your fork too from the `Actions` tab in your repository.
 
 ## Testing ##
 
-### Quick testing ###
-
 rclone's tests are run from the go testing framework, so at the top
 level you can run this to run all the tests.
 
     go test -v ./...
 
-You can also use `make`, if supported by your platform
-
-    make quicktest
-
-The quicktest is [automatically run by GitHub](#github-continuous-integration) when you push your branch to GitHub.
-
-### Backend testing ###
-
 rclone contains a mixture of unit tests and integration tests.
 Because it is difficult (and in some respects pointless) to test cloud
 storage systems by mocking all their interfaces, rclone unit tests can
@@ -201,19 +134,12 @@ project root:
     go install github.com/rclone/rclone/fstest/test_all
     test_all -backend drive
 
-### Full integration testing ###
-
 If you want to run all the integration tests against all the remotes,
 then change into the project root and run
 
-    make check
     make test
 
-The commands may require some extra go packages which you can install with
-
-    make build_dep
-
-The full integration tests are run daily on the integration test server. You can
+This command is run daily on the integration test server. You can
 find the results at https://pub.rclone.org/integration-tests/
 
 ## Code Organisation ##
@@ -228,7 +154,6 @@ with modules beneath.
   * cmd - the rclone commands
     * all - import this to load all the commands
     * ...commands
-  * cmdtest - end-to-end tests of commands, flags, environment variables,...
   * docs - the documentation and website
     * content - adjust these docs only - everything else is autogenerated
       * command - these are auto generated - edit the corresponding .go file

Makefile

@@ -256,36 +256,3 @@ startstable:
 
 winzip:
 	zip -9 rclone-$(TAG).zip rclone.exe
-
-# docker volume plugin
-PLUGIN_IMAGE_USER ?= rclone
-PLUGIN_IMAGE_TAG ?= latest
-PLUGIN_IMAGE_NAME ?= docker-volume-rclone
-PLUGIN_IMAGE ?= $(PLUGIN_IMAGE_USER)/$(PLUGIN_IMAGE_NAME):$(PLUGIN_IMAGE_TAG)
-
-PLUGIN_BASE_IMAGE := rclone/rclone:latest
-PLUGIN_BUILD_DIR := ./build/docker-plugin
-PLUGIN_CONTRIB_DIR := ./cmd/serve/docker/contrib/plugin
-PLUGIN_CONFIG := $(PLUGIN_CONTRIB_DIR)/config.json
-PLUGIN_DOCKERFILE := $(PLUGIN_CONTRIB_DIR)/Dockerfile
-PLUGIN_CONTAINER := docker-volume-rclone-dev-$(shell date +'%Y%m%d-%H%M%S')
-
-docker-plugin: docker-plugin-rootfs docker-plugin-create
-
-docker-plugin-image: rclone
-	docker build --no-cache --pull --build-arg BASE_IMAGE=${PLUGIN_BASE_IMAGE} -t ${PLUGIN_IMAGE} -f ${PLUGIN_DOCKERFILE} .
-
-docker-plugin-rootfs: docker-plugin-image
-	mkdir -p ${PLUGIN_BUILD_DIR}/rootfs
-	docker create --name ${PLUGIN_CONTAINER} ${PLUGIN_IMAGE}
-	docker export ${PLUGIN_CONTAINER} | tar -x -C ${PLUGIN_BUILD_DIR}/rootfs
-	docker rm -vf ${PLUGIN_CONTAINER}
-	cp ${PLUGIN_CONFIG} ${PLUGIN_BUILD_DIR}/config.json
-
-docker-plugin-create:
-	docker plugin rm -f ${PLUGIN_IMAGE} 2>/dev/null || true
-	docker plugin create ${PLUGIN_IMAGE} ${PLUGIN_BUILD_DIR}
-
-docker-plugin-push: docker-plugin-create
-	docker plugin push ${PLUGIN_IMAGE}
-	docker plugin rm ${PLUGIN_IMAGE}

VERSION

@@ -1 +1 @@
-v1.56.2
+v1.56.0

backend/amazonclouddrive/amazonclouddrive_test.go

@@ -1,6 +1,5 @@
 // Test AmazonCloudDrive filesystem interface
 
-//go:build acd
 // +build acd
 
 package amazonclouddrive_test

backend/azureblob/azureblob.go

@@ -1,6 +1,5 @@
 // Package azureblob provides an interface to the Microsoft Azure blob object storage system
 
-//go:build !plan9 && !solaris && !js && go1.14
 // +build !plan9,!solaris,!js,go1.14
 
 package azureblob
@@ -81,12 +80,13 @@ func init() {
 
 Leave blank normally. Needed only if you want to use a service principal instead of interactive login.
 
-    $ az ad sp create-for-rbac --name "<name>" \
+    $ az sp create-for-rbac --name "<name>" \
       --role "Storage Blob Data Owner" \
       --scopes "/subscriptions/<subscription>/resourceGroups/<resource-group>/providers/Microsoft.Storage/storageAccounts/<storage-account>/blobServices/default/containers/<container>" \
       > azure-principal.json
 
-See ["Create an Azure service principal"](https://docs.microsoft.com/en-us/cli/azure/create-an-azure-service-principal-azure-cli) and ["Assign an Azure role for access to blob data"](https://docs.microsoft.com/en-us/azure/storage/common/storage-auth-aad-rbac-cli) pages for more details.
+See [Use Azure CLI to assign an Azure role for access to blob and queue data](https://docs.microsoft.com/en-us/azure/storage/common/storage-auth-aad-rbac-cli)
+for more details.
 `,
 		}, {
 			Name: "key",

backend/azureblob/azureblob_internal_test.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !solaris && !js && go1.14
 // +build !plan9,!solaris,!js,go1.14
 
 package azureblob

backend/azureblob/azureblob_test.go

@@ -1,6 +1,5 @@
 // Test AzureBlob filesystem interface
 
-//go:build !plan9 && !solaris && !js && go1.14
 // +build !plan9,!solaris,!js,go1.14
 
 package azureblob

backend/azureblob/azureblob_unsupported.go

@@ -1,7 +1,6 @@
 // Build for azureblob for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
-//go:build plan9 || solaris || js || !go1.14
 // +build plan9 solaris js !go1.14
 
 package azureblob

backend/azureblob/imds.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !solaris && !js && go1.14
 // +build !plan9,!solaris,!js,go1.14
 
 package azureblob

backend/azureblob/imds_test.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !solaris && !js && go1.14
 // +build !plan9,!solaris,!js,go1.14
 
 package azureblob

backend/cache/cache.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package cache

backend/cache/cache_internal_test.go

@@ -1,5 +1,5 @@
-//go:build !plan9 && !js && !race
-// +build !plan9,!js,!race
+// +build !plan9,!js
+// +build !race
 
 package cache_test
 

backend/cache/cache_test.go

@@ -1,7 +1,7 @@
 // Test Cache filesystem interface
 
-//go:build !plan9 && !js && !race
-// +build !plan9,!js,!race
+// +build !plan9,!js
+// +build !race
 
 package cache_test
 

backend/cache/cache_unsupported.go

@@ -1,7 +1,6 @@
 // Build for cache for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
-//go:build plan9 || js
 // +build plan9 js
 
 package cache

backend/cache/cache_upload_test.go

@@ -1,5 +1,5 @@
-//go:build !plan9 && !js && !race
-// +build !plan9,!js,!race
+// +build !plan9,!js
+// +build !race
 
 package cache_test
 

backend/cache/directory.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package cache

backend/cache/handle.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package cache

backend/cache/object.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package cache

backend/cache/plex.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package cache

backend/cache/storage_memory.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package cache

backend/cache/storage_persistent.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package cache

backend/drive/drive.go

@@ -210,19 +210,12 @@ func init() {
 				if opt.TeamDriveID == "" {
 					return fs.ConfigConfirm("teamdrive_ok", false, "config_change_team_drive", "Configure this as a Shared Drive (Team Drive)?\n")
 				}
-				return fs.ConfigConfirm("teamdrive_change", false, "config_change_team_drive", fmt.Sprintf("Change current Shared Drive (Team Drive) ID %q?\n", opt.TeamDriveID))
+				return fs.ConfigConfirm("teamdrive_ok", false, "config_change_team_drive", fmt.Sprintf("Change current Shared Drive (Team Drive) ID %q?\n", opt.TeamDriveID))
 			case "teamdrive_ok":
 				if config.Result == "false" {
 					m.Set("team_drive", "")
 					return nil, nil
 				}
-				return fs.ConfigGoto("teamdrive_config")
-			case "teamdrive_change":
-				if config.Result == "false" {
-					return nil, nil
-				}
-				return fs.ConfigGoto("teamdrive_config")
-			case "teamdrive_config":
 				f, err := newFs(ctx, name, "", m)
 				if err != nil {
 					return nil, errors.Wrap(err, "failed to make Fs to list Shared Drives")
@@ -1328,8 +1321,8 @@ func (f *Fs) newLinkObject(remote string, info *drive.File, extension, exportMim
 //
 // When the drive.File cannot be represented as an fs.Object it will return (nil, nil).
 func (f *Fs) newObjectWithInfo(ctx context.Context, remote string, info *drive.File) (fs.Object, error) {
-	// If item has MD5 sum it is a file stored on drive
-	if info.Md5Checksum != "" {
+	// If item has MD5 sum or a length it is a file stored on drive
+	if info.Md5Checksum != "" || info.Size > 0 {
 		return f.newRegularObject(remote, info), nil
 	}
 
@@ -1362,8 +1355,8 @@ func (f *Fs) newObjectWithExportInfo(
 		// Pretend a dangling shortcut is a regular object
 		// It will error if used, but appear in listings so it can be deleted
 		return f.newRegularObject(remote, info), nil
-	case info.Md5Checksum != "":
-		// If item has MD5 sum it is a file stored on drive
+	case info.Md5Checksum != "" || info.Size > 0:
+		// If item has MD5 sum or a length it is a file stored on drive
 		return f.newRegularObject(remote, info), nil
 	case f.opt.SkipGdocs:
 		fs.Debugf(remote, "Skipping google document type %q", info.MimeType)

backend/fichier/api.go

@@ -87,11 +87,6 @@ func (f *Fs) readFileInfo(ctx context.Context, url string) (*File, error) {
 	return &file, err
 }
 
-// maybe do some actual validation later if necessary
-func validToken(token *GetTokenResponse) bool {
-	return token.Status == "OK"
-}
-
 func (f *Fs) getDownloadToken(ctx context.Context, url string) (*GetTokenResponse, error) {
 	request := DownloadRequest{
 		URL:    url,
@@ -106,8 +101,7 @@ func (f *Fs) getDownloadToken(ctx context.Context, url string) (*GetTokenRespons
 	var token GetTokenResponse
 	err := f.pacer.Call(func() (bool, error) {
 		resp, err := f.rest.CallJSON(ctx, &opts, &request, &token)
-		doretry, err := shouldRetry(ctx, resp, err)
-		return doretry || !validToken(&token), err
+		return shouldRetry(ctx, resp, err)
 	})
 	if err != nil {
 		return nil, errors.Wrap(err, "couldn't list files")

backend/ftp/ftp.go

@@ -1050,21 +1050,10 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op
 		return errors.Wrap(err, "Update")
 	}
 	err = c.Stor(o.fs.opt.Enc.FromStandardPath(path), in)
-	// Ignore error 250 here - send by some servers
-	if err != nil {
-		switch errX := err.(type) {
-		case *textproto.Error:
-			switch errX.Code {
-			case ftp.StatusRequestedFileActionOK:
-				err = nil
-			}
-		}
-	}
 	if err != nil {
 		_ = c.Quit() // toss this connection to avoid sync errors
-		// recycle connection in advance to let remove() find free token
-		o.fs.putFtpConnection(nil, err)
 		remove()
+		o.fs.putFtpConnection(nil, err)
 		return errors.Wrap(err, "update stor")
 	}
 	o.fs.putFtpConnection(&c, nil)

backend/googlephotos/googlephotos.go

@@ -53,7 +53,6 @@ const (
 	minSleep                    = 10 * time.Millisecond
 	scopeReadOnly               = "https://www.googleapis.com/auth/photoslibrary.readonly"
 	scopeReadWrite              = "https://www.googleapis.com/auth/photoslibrary"
-	scopeAccess                 = 2 // position of access scope in list
 )
 
 var (
@@ -62,7 +61,7 @@ var (
 		Scopes: []string{
 			"openid",
 			"profile",
-			scopeReadWrite, // this must be at position scopeAccess
+			scopeReadWrite,
 		},
 		Endpoint:     google.Endpoint,
 		ClientID:     rcloneClientID,
@@ -90,9 +89,9 @@ func init() {
 			case "":
 				// Fill in the scopes
 				if opt.ReadOnly {
-					oauthConfig.Scopes[scopeAccess] = scopeReadOnly
+					oauthConfig.Scopes[0] = scopeReadOnly
 				} else {
-					oauthConfig.Scopes[scopeAccess] = scopeReadWrite
+					oauthConfig.Scopes[0] = scopeReadWrite
 				}
 				return oauthutil.ConfigOut("warning", &oauthutil.Options{
 					OAuth2Config: oauthConfig,

backend/hdfs/fs.go

@@ -1,4 +1,3 @@
-//go:build !plan9
 // +build !plan9
 
 package hdfs

backend/hdfs/hdfs.go

@@ -1,4 +1,3 @@
-//go:build !plan9
 // +build !plan9
 
 package hdfs
@@ -38,7 +37,7 @@ func init() {
 			Help: `Kerberos service principal name for the namenode
 
 Enables KERBEROS authentication. Specifies the Service Principal Name
-(SERVICE/FQDN) for the namenode.`,
+(<SERVICE>/<FQDN>) for the namenode.`,
 			Required: false,
 			Examples: []fs.OptionExample{{
 				Value: "hdfs/namenode.hadoop.docker",

backend/hdfs/hdfs_test.go

@@ -1,6 +1,5 @@
 // Test HDFS filesystem interface
 
-//go:build !plan9
 // +build !plan9
 
 package hdfs_test

backend/hdfs/hdfs_unsupported.go

@@ -1,7 +1,6 @@
 // Build for hdfs for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
-//go:build plan9
 // +build plan9
 
 package hdfs

backend/hdfs/object.go

@@ -1,4 +1,3 @@
-//go:build !plan9
 // +build !plan9
 
 package hdfs

backend/jottacloud/jottacloud.go

@@ -99,11 +99,6 @@ func init() {
 			Help:     "Files bigger than this can be resumed if the upload fail's.",
 			Default:  fs.SizeSuffix(10 * 1024 * 1024),
 			Advanced: true,
-		}, {
-			Name:     "no_versions",
-			Help:     "Avoid server side versioning by deleting files and recreating files instead of overwriting them.",
-			Default:  false,
-			Advanced: true,
 		}, {
 			Name:     config.ConfigEncoding,
 			Help:     config.ConfigEncodingHelp,
@@ -302,7 +297,6 @@ type Options struct {
 	MD5MemoryThreshold fs.SizeSuffix        `config:"md5_memory_limit"`
 	TrashedOnly        bool                 `config:"trashed_only"`
 	HardDelete         bool                 `config:"hard_delete"`
-	NoVersions         bool                 `config:"no_versions"`
 	UploadThreshold    fs.SizeSuffix        `config:"upload_resume_limit"`
 	Enc                encoder.MultiEncoder `config:"encoding"`
 }
@@ -1500,20 +1494,6 @@ func readMD5(in io.Reader, size, threshold int64) (md5sum string, out io.Reader,
 //
 // The new object may have been created if an error is returned
 func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, options ...fs.OpenOption) (err error) {
-	if o.fs.opt.NoVersions {
-		err := o.readMetaData(ctx, false)
-		if err == nil {
-			// if the object exists delete it
-			err = o.remove(ctx, true)
-			if err != nil {
-				return errors.Wrap(err, "failed to remove old object")
-			}
-		}
-		// if the object does not exist we can just continue but if the error is something different we should report that
-		if err != fs.ErrorObjectNotFound {
-			return err
-		}
-	}
 	o.fs.tokenRenewer.Start()
 	defer o.fs.tokenRenewer.Stop()
 	size := src.Size()
@@ -1604,7 +1584,8 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op
 	return nil
 }
 
-func (o *Object) remove(ctx context.Context, hard bool) error {
+// Remove an object
+func (o *Object) Remove(ctx context.Context) error {
 	opts := rest.Opts{
 		Method:     "POST",
 		Path:       o.filePath(),
@@ -1612,7 +1593,7 @@ func (o *Object) remove(ctx context.Context, hard bool) error {
 		NoResponse: true,
 	}
 
-	if hard {
+	if o.fs.opt.HardDelete {
 		opts.Parameters.Set("rm", "true")
 	} else {
 		opts.Parameters.Set("dl", "true")
@@ -1624,11 +1605,6 @@ func (o *Object) remove(ctx context.Context, hard bool) error {
 	})
 }
 
-// Remove an object
-func (o *Object) Remove(ctx context.Context) error {
-	return o.remove(ctx, o.fs.opt.HardDelete)
-}
-
 // Check the interfaces are satisfied
 var (
 	_ fs.Fs           = (*Fs)(nil)

backend/local/about_unix.go

@@ -1,4 +1,3 @@
-//go:build darwin || dragonfly || freebsd || linux
 // +build darwin dragonfly freebsd linux
 
 package local

backend/local/about_windows.go

@@ -1,4 +1,3 @@
-//go:build windows
 // +build windows
 
 package local

backend/local/encode_darwin.go

@@ -1,5 +1,4 @@
-//go:build darwin
-// +build darwin
+//+build darwin
 
 package local
 

backend/local/encode_other.go

@@ -1,5 +1,4 @@
-//go:build !windows && !darwin
-// +build !windows,!darwin
+//+build !windows,!darwin
 
 package local
 

backend/local/encode_windows.go

@@ -1,5 +1,4 @@
-//go:build windows
-// +build windows
+//+build windows
 
 package local
 

backend/local/fadvise_other.go

@@ -1,5 +1,4 @@
-//go:build !linux
-// +build !linux
+//+build !linux
 
 package local
 

backend/local/fadvise_unix.go

@@ -1,5 +1,4 @@
-//go:build linux
-// +build linux
+//+build linux
 
 package local
 

backend/local/lchtimes.go

@@ -1,4 +1,3 @@
-//go:build windows || plan9 || js
 // +build windows plan9 js
 
 package local

backend/local/lchtimes_unix.go

@@ -1,4 +1,3 @@
-//go:build !windows && !plan9 && !js
 // +build !windows,!plan9,!js
 
 package local

backend/local/local.go

@@ -467,10 +467,6 @@ func (f *Fs) List(ctx context.Context, dir string) (entries fs.DirEntries, err e
 				for _, name := range names {
 					namepath := filepath.Join(fsDirPath, name)
 					fi, fierr := os.Lstat(namepath)
-					if os.IsNotExist(fierr) {
-						// skip entry removed by a concurrent goroutine
-						continue
-					}
 					if fierr != nil {
 						err = errors.Wrapf(err, "failed to read directory %q", namepath)
 						fs.Errorf(dir, "%v", fierr)

backend/local/read_device_other.go

@@ -1,6 +1,5 @@
 // Device reading functions
 
-//go:build !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris
 // +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris
 
 package local

backend/local/read_device_unix.go

@@ -1,6 +1,5 @@
 // Device reading functions
 
-//go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || solaris
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 package local

backend/local/remove_other.go

@@ -1,5 +1,4 @@
-//go:build !windows
-// +build !windows
+//+build !windows
 
 package local
 

backend/local/remove_windows.go

@@ -1,5 +1,4 @@
-//go:build windows
-// +build windows
+//+build windows
 
 package local
 

backend/local/symlink.go

@@ -1,4 +1,3 @@
-//go:build !windows && !plan9 && !js
 // +build !windows,!plan9,!js
 
 package local

backend/local/symlink_other.go

@@ -1,4 +1,3 @@
-//go:build windows || plan9 || js
 // +build windows plan9 js
 
 package local

backend/onedrive/onedrive.go

@@ -1500,85 +1500,10 @@ func (f *Fs) PublicLink(ctx context.Context, remote string, expire fs.Duration,
 		return shouldRetry(ctx, resp, err)
 	})
 	if err != nil {
-		if resp != nil && resp.StatusCode == 400 && f.driveType != driveTypePersonal {
-			return "", errors.Errorf("%v (is making public links permitted by the org admin?)", err)
-		}
+		fmt.Println(err)
 		return "", err
 	}
-
-	shareURL := result.Link.WebURL
-
-	// Convert share link to direct download link if target is not a folder
-	// Not attempting to do the conversion for regional versions, just to be safe
-	if f.opt.Region != regionGlobal {
-		return shareURL, nil
-	}
-	if info.Folder != nil {
-		fs.Debugf(nil, "Can't convert share link for folder to direct link - returning the link as is")
-		return shareURL, nil
-	}
-
-	cnvFailMsg := "Don't know how to convert share link to direct link - returning the link as is"
-	directURL := ""
-	segments := strings.Split(shareURL, "/")
-	switch f.driveType {
-	case driveTypePersonal:
-		// Method: https://stackoverflow.com/questions/37951114/direct-download-link-to-onedrive-file
-		if len(segments) != 5 {
-			fs.Logf(f, cnvFailMsg)
-			return shareURL, nil
-		}
-		enc := base64.StdEncoding.EncodeToString([]byte(shareURL))
-		enc = strings.ReplaceAll(enc, "/", "_")
-		enc = strings.ReplaceAll(enc, "+", "-")
-		enc = strings.ReplaceAll(enc, "=", "")
-		directURL = fmt.Sprintf("https://api.onedrive.com/v1.0/shares/u!%s/root/content", enc)
-	case driveTypeBusiness:
-		// Method: https://docs.microsoft.com/en-us/sharepoint/dev/spfx/shorter-share-link-format
-		// Example:
-		//   https://{tenant}-my.sharepoint.com/:t:/g/personal/{user_email}/{Opaque_String}
-		//   --convert to->
-		//   https://{tenant}-my.sharepoint.com/personal/{user_email}/_layouts/15/download.aspx?share={Opaque_String}
-		if len(segments) != 8 {
-			fs.Logf(f, cnvFailMsg)
-			return shareURL, nil
-		}
-		directURL = fmt.Sprintf("https://%s/%s/%s/_layouts/15/download.aspx?share=%s",
-			segments[2], segments[5], segments[6], segments[7])
-	case driveTypeSharepoint:
-		// Method: Similar to driveTypeBusiness
-		// Example:
-		//   https://{tenant}.sharepoint.com/:t:/s/{site_name}/{Opaque_String}
-		//   --convert to->
-		//   https://{tenant}.sharepoint.com/sites/{site_name}/_layouts/15/download.aspx?share={Opaque_String}
-		//
-		//   https://{tenant}.sharepoint.com/:t:/t/{team_name}/{Opaque_String}
-		//   --convert to->
-		//   https://{tenant}.sharepoint.com/teams/{team_name}/_layouts/15/download.aspx?share={Opaque_String}
-		//
-		//   https://{tenant}.sharepoint.com/:t:/g/{Opaque_String}
-		//   --convert to->
-		//   https://{tenant}.sharepoint.com/_layouts/15/download.aspx?share={Opaque_String}
-		if len(segments) < 6 || len(segments) > 7 {
-			fs.Logf(f, cnvFailMsg)
-			return shareURL, nil
-		}
-		pathPrefix := ""
-		switch segments[4] {
-		case "s": // Site
-			pathPrefix = "/sites/" + segments[5]
-		case "t": // Team
-			pathPrefix = "/teams/" + segments[5]
-		case "g": // Root site
-		default:
-			fs.Logf(f, cnvFailMsg)
-			return shareURL, nil
-		}
-		directURL = fmt.Sprintf("https://%s%s/_layouts/15/download.aspx?share=%s",
-			segments[2], pathPrefix, segments[len(segments)-1])
-	}
-
-	return directURL, nil
+	return result.Link.WebURL, nil
 }
 
 // CleanUp deletes all the hidden files.

backend/pcloud/pcloud.go

@@ -1092,10 +1092,6 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op
 	modTime := src.ModTime(ctx)
 	remote := o.Remote()
 
-	if size < 0 {
-		return errors.New("can't upload unknown sizes objects")
-	}
-
 	// Create the directory for the object if it doesn't exist
 	leaf, directoryID, err := o.fs.dirCache.FindPath(ctx, remote, true)
 	if err != nil {
@@ -1158,14 +1154,10 @@ func (o *Object) Update(ctx context.Context, in io.Reader, src fs.ObjectInfo, op
 	})
 	if err != nil {
 		// sometimes pcloud leaves a half complete file on
-		// error, so delete it if it exists, trying a few times
-		for i := 0; i < 5; i++ {
+		// error, so delete it if it exists
 		delObj, delErr := o.fs.NewObject(ctx, o.remote)
 		if delErr == nil && delObj != nil {
 			_ = delObj.Remove(ctx)
-				break
-			}
-			time.Sleep(time.Second)
 		}
 		return err
 	}

backend/qingstor/qingstor.go

@@ -1,7 +1,6 @@
 // Package qingstor provides an interface to QingStor object storage
 // Home: https://www.qingcloud.com/
 
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package qingstor

backend/qingstor/qingstor_test.go

@@ -1,6 +1,5 @@
 // Test QingStor filesystem interface
 
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package qingstor

backend/qingstor/qingstor_unsupported.go

@@ -1,7 +1,6 @@
 // Build for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
-//go:build plan9 || js
 // +build plan9 js
 
 package qingstor

backend/qingstor/upload.go

@@ -1,6 +1,5 @@
 // Upload object to QingStor
 
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package qingstor

backend/s3/s3.go

@@ -430,12 +430,6 @@ func init() {
 			Help:     "Endpoint for OSS API.",
 			Provider: "Alibaba",
 			Examples: []fs.OptionExample{{
-				Value: "oss-accelerate.aliyuncs.com",
-				Help:  "Global Accelerate",
-			}, {
-				Value: "oss-accelerate-overseas.aliyuncs.com",
-				Help:  "Global Accelerate (outside mainland China)",
-			}, {
 				Value: "oss-cn-hangzhou.aliyuncs.com",
 				Help:  "East China 1 (Hangzhou)",
 			}, {
@@ -452,22 +446,10 @@ func init() {
 				Help:  "North China 3 (Zhangjiakou)",
 			}, {
 				Value: "oss-cn-huhehaote.aliyuncs.com",
-				Help:  "North China 5 (Hohhot)",
-			}, {
-				Value: "oss-cn-wulanchabu.aliyuncs.com",
-				Help:  "North China 6 (Ulanqab)",
+				Help:  "North China 5 (Huhehaote)",
 			}, {
 				Value: "oss-cn-shenzhen.aliyuncs.com",
 				Help:  "South China 1 (Shenzhen)",
-			}, {
-				Value: "oss-cn-heyuan.aliyuncs.com",
-				Help:  "South China 2 (Heyuan)",
-			}, {
-				Value: "oss-cn-guangzhou.aliyuncs.com",
-				Help:  "South China 3 (Guangzhou)",
-			}, {
-				Value: "oss-cn-chengdu.aliyuncs.com",
-				Help:  "West China 1 (Chengdu)",
 			}, {
 				Value: "oss-cn-hongkong.aliyuncs.com",
 				Help:  "Hong Kong (Hong Kong)",
@@ -629,10 +611,6 @@ func init() {
 				Value:    "s3.eu-central-1.wasabisys.com",
 				Help:     "Wasabi EU Central endpoint",
 				Provider: "Wasabi",
-			}, {
-				Value:    "s3.ap-northeast-1.wasabisys.com",
-				Help:     "Wasabi AP Northeast endpoint",
-				Provider: "Wasabi",
 			}},
 		}, {
 			Name:     "location_constraint",

backend/seafile/seafile.go

@@ -325,20 +325,17 @@ func Config(ctx context.Context, name string, m configmap.Mapper, config fs.Conf
 
 	switch config.State {
 	case "":
-		// Empty state means it's the first call to the Config function
+		// Just make sure we do have a password
 		if password == "" {
-			return fs.ConfigPassword("password", "config_password", "Two-factor authentication: please enter your password (it won't be saved in the configuration)")
+			return fs.ConfigPassword("", "config_password", "Two-factor authentication: please enter your password (it won't be saved in the configuration)")
 		}
-		// password was successfully loaded from the config
-		return fs.ConfigGoto("2fa")
+		return fs.ConfigGoto("password")
 	case "password":
-		// password should be coming from the previous state (entered by the user)
 		password = config.Result
 		if password == "" {
-			return fs.ConfigError("", "Password can't be blank")
+			return fs.ConfigError("password", "Password can't be blank")
 		}
-		// save it into the configuration file and keep going
-		m.Set(configPassword, obscure.MustObscure(password))
+		m.Set(configPassword, obscure.MustObscure(config.Result))
 		return fs.ConfigGoto("2fa")
 	case "2fa":
 		return fs.ConfigInput("2fa_do", "config_2fa", "Two-factor authentication: please enter your 2FA code")

backend/seafile/seafile_internal_test.go

@@ -1,15 +1,10 @@
 package seafile
 
 import (
-	"context"
 	"path"
 	"testing"
 
-	"github.com/rclone/rclone/fs"
-	"github.com/rclone/rclone/fs/config/configmap"
-	"github.com/rclone/rclone/fs/config/obscure"
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 )
 
 type pathData struct {
@@ -24,77 +19,77 @@ type pathData struct {
 // from a mix of configuration data and path command line argument
 func TestSplitPath(t *testing.T) {
 	testData := []pathData{
-		{
+		pathData{
 			configLibrary:   "",
 			configRoot:      "",
 			argumentPath:    "",
 			expectedLibrary: "",
 			expectedPath:    "",
 		},
-		{
+		pathData{
 			configLibrary:   "",
 			configRoot:      "",
 			argumentPath:    "Library",
 			expectedLibrary: "Library",
 			expectedPath:    "",
 		},
-		{
+		pathData{
 			configLibrary:   "",
 			configRoot:      "",
 			argumentPath:    path.Join("Library", "path", "to", "file"),
 			expectedLibrary: "Library",
 			expectedPath:    path.Join("path", "to", "file"),
 		},
-		{
+		pathData{
 			configLibrary:   "Library",
 			configRoot:      "",
 			argumentPath:    "",
 			expectedLibrary: "Library",
 			expectedPath:    "",
 		},
-		{
+		pathData{
 			configLibrary:   "Library",
 			configRoot:      "",
 			argumentPath:    "path",
 			expectedLibrary: "Library",
 			expectedPath:    "path",
 		},
-		{
+		pathData{
 			configLibrary:   "Library",
 			configRoot:      "",
 			argumentPath:    path.Join("path", "to", "file"),
 			expectedLibrary: "Library",
 			expectedPath:    path.Join("path", "to", "file"),
 		},
-		{
+		pathData{
 			configLibrary:   "Library",
 			configRoot:      "root",
 			argumentPath:    "",
 			expectedLibrary: "Library",
 			expectedPath:    "root",
 		},
-		{
+		pathData{
 			configLibrary:   "Library",
 			configRoot:      path.Join("root", "path"),
 			argumentPath:    "",
 			expectedLibrary: "Library",
 			expectedPath:    path.Join("root", "path"),
 		},
-		{
+		pathData{
 			configLibrary:   "Library",
 			configRoot:      "root",
 			argumentPath:    "path",
 			expectedLibrary: "Library",
 			expectedPath:    path.Join("root", "path"),
 		},
-		{
+		pathData{
 			configLibrary:   "Library",
 			configRoot:      "root",
 			argumentPath:    path.Join("path", "to", "file"),
 			expectedLibrary: "Library",
 			expectedPath:    path.Join("root", "path", "to", "file"),
 		},
-		{
+		pathData{
 			configLibrary:   "Library",
 			configRoot:      path.Join("root", "path"),
 			argumentPath:    path.Join("subpath", "to", "file"),
@@ -126,98 +121,3 @@ func TestSplitPathIntoSlice(t *testing.T) {
 		assert.Equal(t, expected, output)
 	}
 }
-
-func Test2FAStateMachine(t *testing.T) {
-	fixtures := []struct {
-		name               string
-		mapper             configmap.Mapper
-		input              fs.ConfigIn
-		expectState        string
-		expectErrorMessage string
-		expectResult       string
-		expectFail         bool
-	}{
-		{
-			name:       "no url",
-			mapper:     configmap.Simple{},
-			input:      fs.ConfigIn{State: ""},
-			expectFail: true,
-		},
-		{
-			name:       "2fa not set",
-			mapper:     configmap.Simple{"url": "http://localhost/"},
-			input:      fs.ConfigIn{State: ""},
-			expectFail: true,
-		},
-		{
-			name:       "unknown state",
-			mapper:     configmap.Simple{"url": "http://localhost/", "2fa": "true", "user": "username"},
-			input:      fs.ConfigIn{State: "unknown"},
-			expectFail: true,
-		},
-		{
-			name:        "no password in config",
-			mapper:      configmap.Simple{"url": "http://localhost/", "2fa": "true", "user": "username"},
-			input:       fs.ConfigIn{State: ""},
-			expectState: "password",
-		},
-		{
-			name:        "config ready for 2fa token",
-			mapper:      configmap.Simple{"url": "http://localhost/", "2fa": "true", "user": "username", "pass": obscure.MustObscure("password")},
-			input:       fs.ConfigIn{State: ""},
-			expectState: "2fa",
-		},
-		{
-			name:               "password not entered",
-			mapper:             configmap.Simple{"url": "http://localhost/", "2fa": "true", "user": "username"},
-			input:              fs.ConfigIn{State: "password"},
-			expectState:        "",
-			expectErrorMessage: "Password can't be blank",
-		},
-		{
-			name:        "password entered",
-			mapper:      configmap.Simple{"url": "http://localhost/", "2fa": "true", "user": "username"},
-			input:       fs.ConfigIn{State: "password", Result: "password"},
-			expectState: "2fa",
-		},
-		{
-			name:        "ask for a 2fa code",
-			mapper:      configmap.Simple{"url": "http://localhost/", "2fa": "true", "user": "username"},
-			input:       fs.ConfigIn{State: "2fa"},
-			expectState: "2fa_do",
-		},
-		{
-			name:               "no 2fa code entered",
-			mapper:             configmap.Simple{"url": "http://localhost/", "2fa": "true", "user": "username"},
-			input:              fs.ConfigIn{State: "2fa_do"},
-			expectState:        "2fa", // ask for a code again
-			expectErrorMessage: "2FA codes can't be blank",
-		},
-		{
-			name:        "2fa error and retry",
-			mapper:      configmap.Simple{"url": "http://localhost/", "2fa": "true", "user": "username"},
-			input:       fs.ConfigIn{State: "2fa_error", Result: "true"},
-			expectState: "2fa", // ask for a code again
-		},
-		{
-			name:       "2fa error and fail",
-			mapper:     configmap.Simple{"url": "http://localhost/", "2fa": "true", "user": "username"},
-			input:      fs.ConfigIn{State: "2fa_error"},
-			expectFail: true,
-		},
-	}
-
-	for _, fixture := range fixtures {
-		t.Run(fixture.name, func(t *testing.T) {
-			output, err := Config(context.Background(), "test", fixture.mapper, fixture.input)
-			if fixture.expectFail {
-				require.Error(t, err)
-				t.Log(err)
-				return
-			}
-			assert.Equal(t, fixture.expectState, output.State)
-			assert.Equal(t, fixture.expectErrorMessage, output.Error)
-			assert.Equal(t, fixture.expectResult, output.Result)
-		})
-	}
-}

backend/sftp/sftp.go

@@ -1,6 +1,5 @@
 // Package sftp provides a filesystem interface using github.com/pkg/sftp
 
-//go:build !plan9
 // +build !plan9
 
 package sftp
@@ -430,6 +429,10 @@ func (f *Fs) newSftpClient(conn *ssh.Client, opts ...sftp.ClientOption) (*sftp.C
 		sftp.UseConcurrentReads(!f.opt.DisableConcurrentReads),
 		sftp.UseConcurrentWrites(!f.opt.DisableConcurrentWrites),
 	)
+	if f.opt.DisableConcurrentReads { // FIXME
+		fs.Errorf(f, "Ignoring disable_concurrent_reads after library reversion - see #5197")
+	}
+
 	return sftp.NewClientPipe(pr, pw, opts...)
 }
 

backend/sftp/sftp_internal_test.go

@@ -1,4 +1,3 @@
-//go:build !plan9
 // +build !plan9
 
 package sftp

backend/sftp/sftp_test.go

@@ -1,6 +1,5 @@
 // Test Sftp filesystem interface
 
-//go:build !plan9
 // +build !plan9
 
 package sftp_test

backend/sftp/sftp_unsupported.go

@@ -1,7 +1,6 @@
 // Build for sftp for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
-//go:build plan9
 // +build plan9
 
 package sftp

backend/sftp/stringlock.go

@@ -1,4 +1,3 @@
-//go:build !plan9
 // +build !plan9
 
 package sftp

backend/sftp/stringlock_test.go

@@ -1,4 +1,3 @@
-//go:build !plan9
 // +build !plan9
 
 package sftp

backend/sharefile/generate_tzdata.go

@@ -1,4 +1,3 @@
-//go:build ignore
 // +build ignore
 
 package main

backend/sharefile/tzdata_vfsdata.go

@@ -1,6 +1,5 @@
 // Code generated by vfsgen; DO NOT EDIT.
 
-//go:build !dev
 // +build !dev
 
 package sharefile

backend/sugarsync/sugarsync.go

@@ -105,7 +105,7 @@ func init() {
 
 				authRequest := api.AppAuthorization{
 					Username:         username,
-					Password:         obscure.MustReveal(password),
+					Password:         password,
 					Application:      withDefault(opt.AppID, appID),
 					AccessKeyID:      withDefault(opt.AccessKeyID, accessKeyID),
 					PrivateAccessKey: withDefault(opt.PrivateAccessKey, obscure.MustReveal(encryptedPrivateAccessKey)),

backend/tardigrade/fs.go

@@ -1,4 +1,3 @@
-//go:build !plan9
 // +build !plan9
 
 // Package tardigrade provides an interface to Tardigrade decentralized object storage.

backend/tardigrade/object.go

@@ -1,4 +1,3 @@
-//go:build !plan9
 // +build !plan9
 
 package tardigrade

backend/tardigrade/tardigrade_test.go

@@ -1,4 +1,3 @@
-//go:build !plan9
 // +build !plan9
 
 // Test Tardigrade filesystem interface

backend/tardigrade/tardigrade_unsupported.go

@@ -1,4 +1,3 @@
-//go:build plan9
 // +build plan9
 
 package tardigrade

bin/.ignore-emails

@@ -1,5 +1,3 @@
 # Email addresses to ignore in the git log when making the authors.md file
 <nick@raig-wood.com>
 <anaghk.dos@gmail.com>
-<33207650+sp31415t1@users.noreply.github.com>
-<unknown>

bin/check-merged.go

@@ -1,4 +1,3 @@
-//go:build ignore
 // +build ignore
 
 // Attempt to work out if branches have already been merged

bin/cross-compile.go

@@ -1,4 +1,3 @@
-//go:build ignore
 // +build ignore
 
 // Cross compile rclone - in go because I hate bash ;-)

bin/get-github-release.go

@@ -1,4 +1,3 @@
-//go:build ignore
 // +build ignore
 
 // Get the latest release from a github project

bin/make_manual.py

@@ -23,7 +23,6 @@ docs = [
     "rc.md",
     "overview.md",
     "flags.md",
-    "docker.md",
 
     # Keep these alphabetical by full name
     "fichier.md",

bin/test_independence.go

@@ -1,4 +1,3 @@
-//go:build ignore
 // +build ignore
 
 // Test that the tests in the suite passed in are independent

cmd/all/all.go

@@ -10,7 +10,6 @@ import (
 	_ "github.com/rclone/rclone/cmd/cachestats"
 	_ "github.com/rclone/rclone/cmd/cat"
 	_ "github.com/rclone/rclone/cmd/check"
-	_ "github.com/rclone/rclone/cmd/checksum"
 	_ "github.com/rclone/rclone/cmd/cleanup"
 	_ "github.com/rclone/rclone/cmd/cmount"
 	_ "github.com/rclone/rclone/cmd/config"

cmd/cachestats/cachestats.go

@@ -1,4 +1,3 @@
-//go:build !plan9 && !js
 // +build !plan9,!js
 
 package cachestats

cmd/cachestats/cachestats_unsupported.go

@@ -1,7 +1,6 @@
 // Build for cache for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
-//go:build plan9 || js
 // +build plan9 js
 
 package cachestats

cmd/check/check.go

@@ -2,7 +2,6 @@ package check
 
 import (
 	"context"
-	"fmt"
 	"io"
 	"os"
 	"strings"
@@ -26,14 +25,12 @@ var (
 	match        = ""
 	differ       = ""
 	errFile      = ""
-	checkFileHashType = ""
 )
 
 func init() {
 	cmd.Root.AddCommand(commandDefinition)
 	cmdFlags := commandDefinition.Flags()
 	flags.BoolVarP(cmdFlags, &download, "download", "", download, "Check by downloading rather than with hash.")
-	flags.StringVarP(cmdFlags, &checkFileHashType, "checkfile", "C", checkFileHashType, "Treat source:path as a SUM file with hashes of given type")
 	AddFlags(cmdFlags)
 }
 
@@ -129,6 +126,7 @@ func GetCheckOpt(fsrc, fdst fs.Fs) (opt *operations.CheckOpt, close func(), err
 	}
 
 	return opt, close, nil
+
 }
 
 var commandDefinition = &cobra.Command{
@@ -146,39 +144,16 @@ If you supply the |--download| flag, it will download the data from
 both remotes and check them against each other on the fly.  This can
 be useful for remotes that don't support hashes or if you really want
 to check all the data.
-
-If you supply the |--checkfile HASH| flag with a valid hash name,
-the |source:path| must point to a text file in the SUM format.
 `, "|", "`") + FlagsHelp,
-	RunE: func(command *cobra.Command, args []string) error {
+	Run: func(command *cobra.Command, args []string) {
 		cmd.CheckArgs(2, 2, command, args)
-		var (
-			fsrc, fdst fs.Fs
-			hashType   hash.Type
-			fsum       fs.Fs
-			sumFile    string
-		)
-		if checkFileHashType != "" {
-			if err := hashType.Set(checkFileHashType); err != nil {
-				fmt.Println(hash.HelpString(0))
-				return err
-			}
-			fsum, sumFile, fsrc = cmd.NewFsSrcFileDst(args)
-		} else {
-			fsrc, fdst = cmd.NewFsSrcDst(args)
-		}
-
+		fsrc, fdst := cmd.NewFsSrcDst(args)
 		cmd.Run(false, true, command, func() error {
 			opt, close, err := GetCheckOpt(fsrc, fdst)
 			if err != nil {
 				return err
 			}
 			defer close()
-
-			if checkFileHashType != "" {
-				return operations.CheckSum(context.Background(), fsrc, fsum, sumFile, hashType, opt, download)
-			}
-
 			if download {
 				return operations.CheckDownload(context.Background(), opt)
 			}
@@ -190,6 +165,5 @@ the |source:path| must point to a text file in the SUM format.
 			}
 			return operations.Check(context.Background(), opt)
 		})
-		return nil
 	},
 }

cmd/checksum/checksum.go

@@ -1,57 +0,0 @@
-package checksum
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/rclone/rclone/cmd"
-	"github.com/rclone/rclone/cmd/check" // for common flags
-	"github.com/rclone/rclone/fs/config/flags"
-	"github.com/rclone/rclone/fs/hash"
-	"github.com/rclone/rclone/fs/operations"
-	"github.com/spf13/cobra"
-)
-
-var download = false
-
-func init() {
-	cmd.Root.AddCommand(commandDefinition)
-	cmdFlags := commandDefinition.Flags()
-	flags.BoolVarP(cmdFlags, &download, "download", "", download, "Check by hashing the contents.")
-	check.AddFlags(cmdFlags)
-}
-
-var commandDefinition = &cobra.Command{
-	Use:   "checksum <hash> sumfile src:path",
-	Short: `Checks the files in the source against a SUM file.`,
-	Long: strings.ReplaceAll(`
-Checks that hashsums of source files match the SUM file.
-It compares hashes (MD5, SHA1, etc) and logs a report of files which
-don't match.  It doesn't alter the file system.
-
-If you supply the |--download| flag, it will download the data from remote
-and calculate the contents hash on the fly.  This can be useful for remotes
-that don't support hashes or if you really want to check all the data.
-`, "|", "`") + check.FlagsHelp,
-	RunE: func(command *cobra.Command, args []string) error {
-		cmd.CheckArgs(3, 3, command, args)
-		var hashType hash.Type
-		if err := hashType.Set(args[0]); err != nil {
-			fmt.Println(hash.HelpString(0))
-			return err
-		}
-		fsum, sumFile, fsrc := cmd.NewFsSrcFileDst(args[1:])
-
-		cmd.Run(false, true, command, func() error {
-			opt, close, err := check.GetCheckOpt(nil, fsrc)
-			if err != nil {
-				return err
-			}
-			defer close()
-
-			return operations.CheckSum(context.Background(), fsrc, fsum, sumFile, hashType, opt, download)
-		})
-		return nil
-	},
-}

cmd/cmd.go

@@ -37,7 +37,6 @@ import (
 	"github.com/rclone/rclone/fs/rc/rcserver"
 	"github.com/rclone/rclone/lib/atexit"
 	"github.com/rclone/rclone/lib/buildinfo"
-	"github.com/rclone/rclone/lib/exitcode"
 	"github.com/rclone/rclone/lib/random"
 	"github.com/rclone/rclone/lib/terminal"
 	"github.com/spf13/cobra"
@@ -61,6 +60,19 @@ var (
 	errorTooManyArguments   = errors.New("too many arguments")
 )
 
+const (
+	exitCodeSuccess = iota
+	exitCodeUsageError
+	exitCodeUncategorizedError
+	exitCodeDirNotFound
+	exitCodeFileNotFound
+	exitCodeRetryError
+	exitCodeNoRetryError
+	exitCodeFatalError
+	exitCodeTransferExceeded
+	exitCodeNoFilesTransferred
+)
+
 // ShowVersion prints the version to stdout
 func ShowVersion() {
 	osVersion, osKernel := buildinfo.GetOSVersion()
@@ -472,31 +484,31 @@ func resolveExitCode(err error) {
 	if err == nil {
 		if ci.ErrorOnNoTransfer {
 			if accounting.GlobalStats().GetTransfers() == 0 {
-				os.Exit(exitcode.NoFilesTransferred)
+				os.Exit(exitCodeNoFilesTransferred)
 			}
 		}
-		os.Exit(exitcode.Success)
+		os.Exit(exitCodeSuccess)
 	}
 
 	_, unwrapped := fserrors.Cause(err)
 
 	switch {
 	case unwrapped == fs.ErrorDirNotFound:
-		os.Exit(exitcode.DirNotFound)
+		os.Exit(exitCodeDirNotFound)
 	case unwrapped == fs.ErrorObjectNotFound:
-		os.Exit(exitcode.FileNotFound)
+		os.Exit(exitCodeFileNotFound)
 	case unwrapped == errorUncategorized:
-		os.Exit(exitcode.UncategorizedError)
+		os.Exit(exitCodeUncategorizedError)
 	case unwrapped == accounting.ErrorMaxTransferLimitReached:
-		os.Exit(exitcode.TransferExceeded)
+		os.Exit(exitCodeTransferExceeded)
 	case fserrors.ShouldRetry(err):
-		os.Exit(exitcode.RetryError)
+		os.Exit(exitCodeRetryError)
 	case fserrors.IsNoRetryError(err):
-		os.Exit(exitcode.NoRetryError)
+		os.Exit(exitCodeNoRetryError)
 	case fserrors.IsFatalError(err):
-		os.Exit(exitcode.FatalError)
+		os.Exit(exitCodeFatalError)
 	default:
-		os.Exit(exitcode.UsageError)
+		os.Exit(exitCodeUsageError)
 	}
 }
 
@@ -527,8 +539,7 @@ func AddBackendFlags() {
 				if opt.IsPassword {
 					help += " (obscured)"
 				}
-				flag := pflag.CommandLine.VarPF(opt, name, opt.ShortOpt, help)
-				flags.SetDefaultFromEnv(pflag.CommandLine, name)
+				flag := flags.VarPF(pflag.CommandLine, opt, name, opt.ShortOpt, help)
 				if _, isBool := opt.Default.(bool); isBool {
 					flag.NoOptDefVal = "true"
 				}

cmd/cmount/fs.go

@@ -1,4 +1,3 @@
-//go:build cmount && cgo && (linux || darwin || freebsd || windows)
 // +build cmount
 // +build cgo
 // +build linux darwin freebsd windows

cmd/cmount/mount.go

@@ -2,7 +2,6 @@
 //
 // This uses the cgo based cgofuse library
 
-//go:build cmount && cgo && (linux || darwin || freebsd || windows)
 // +build cmount
 // +build cgo
 // +build linux darwin freebsd windows

cmd/cmount/mount_brew.go

@@ -1,8 +1,8 @@
 // Build for macos with the brew tag to handle the absence
 // of fuse and print an appropriate error message
 
-//go:build brew && darwin
-// +build brew,darwin
+// +build brew
+// +build darwin
 
 package cmount
 

cmd/cmount/mount_test.go

@@ -1,4 +1,3 @@
-//go:build cmount && cgo && (linux || darwin || freebsd || windows) && (!race || !windows)
 // +build cmount
 // +build cgo
 // +build linux darwin freebsd windows

cmd/cmount/mount_unsupported.go

@@ -1,7 +1,6 @@
 // Build for cmount for unsupported platforms to stop go complaining
 // about "no buildable Go source files "
 
-//go:build (!linux && !darwin && !freebsd && !windows) || !brew || !cgo || !cmount
 // +build !linux,!darwin,!freebsd,!windows !brew !cgo !cmount
 
 package cmount

cmd/cmount/mountpoint_other.go

@@ -1,5 +1,6 @@
-//go:build cmount && cgo && !windows
-// +build cmount,cgo,!windows
+// +build cmount
+// +build cgo
+// +build !windows
 
 package cmount
 

cmd/cmount/mountpoint_windows.go

@@ -1,5 +1,6 @@
-//go:build cmount && cgo && windows
-// +build cmount,cgo,windows
+// +build cmount
+// +build cgo
+// +build windows
 
 package cmount
 

cmd/hashsum/hashsum.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/rclone/rclone/cmd"
@@ -20,7 +21,6 @@ var (
 	OutputBase64   = false
 	DownloadFlag   = false
 	HashsumOutfile = ""
-	ChecksumFile   = ""
 )
 
 func init() {
@@ -33,7 +33,6 @@ func init() {
 func AddHashFlags(cmdFlags *pflag.FlagSet) {
 	flags.BoolVarP(cmdFlags, &OutputBase64, "base64", "", OutputBase64, "Output base64 encoded hashsum")
 	flags.StringVarP(cmdFlags, &HashsumOutfile, "output-file", "", HashsumOutfile, "Output hashsums to a file rather than the terminal")
-	flags.StringVarP(cmdFlags, &ChecksumFile, "checkfile", "C", ChecksumFile, "Validate hashes against a given SUM file instead of printing them")
 	flags.BoolVarP(cmdFlags, &DownloadFlag, "download", "", DownloadFlag, "Download the file and hash it locally; if this flag is not specified, the hash is requested from the remote")
 }
 
@@ -71,7 +70,7 @@ hashed locally enabling any hash for any remote.
 Run without a hash to see the list of all supported hashes, e.g.
 
     $ rclone hashsum
-` + hash.HelpString(4) + `
+` + hashListHelp("    ") + `
 Then
 
     $ rclone hashsum MD5 remote:path
@@ -81,7 +80,7 @@ Note that hash names are case insensitive.
 	RunE: func(command *cobra.Command, args []string) error {
 		cmd.CheckArgs(0, 2, command, args)
 		if len(args) == 0 {
-			fmt.Print(hash.HelpString(0))
+			fmt.Print(hashListHelp(""))
 			return nil
 		} else if len(args) == 1 {
 			return errors.New("need hash type and remote")
@@ -89,16 +88,12 @@ Note that hash names are case insensitive.
 		var ht hash.Type
 		err := ht.Set(args[0])
 		if err != nil {
-			fmt.Println(hash.HelpString(0))
+			fmt.Println(hashListHelp(""))
 			return err
 		}
 		fsrc := cmd.NewFsSrc(args[1:])
 
 		cmd.Run(false, false, command, func() error {
-			if ChecksumFile != "" {
-				fsum, sumFile := cmd.NewFsFile(ChecksumFile)
-				return operations.CheckSum(context.Background(), fsrc, fsum, sumFile, ht, nil, DownloadFlag)
-			}
 			if HashsumOutfile == "" {
 				return operations.HashLister(context.Background(), ht, OutputBase64, DownloadFlag, fsrc, nil)
 			}
@@ -112,3 +107,14 @@ Note that hash names are case insensitive.
 		return nil
 	},
 }
+
+func hashListHelp(indent string) string {
+	var help strings.Builder
+	help.WriteString(indent)
+	help.WriteString("Supported hashes are:\n")
+	for _, ht := range hash.Supported().Array() {
+		help.WriteString(indent)
+		fmt.Fprintf(&help, "  * %v\n", ht.String())
+	}
+	return help.String()
+}

cmd/md5sum/md5sum.go

@@ -32,10 +32,6 @@ hashed locally enabling MD5 for any remote.
 		cmd.CheckArgs(1, 1, command, args)
 		fsrc := cmd.NewFsSrc(args)
 		cmd.Run(false, false, command, func() error {
-			if hashsum.ChecksumFile != "" {
-				fsum, sumFile := cmd.NewFsFile(hashsum.ChecksumFile)
-				return operations.CheckSum(context.Background(), fsrc, fsum, sumFile, hash.MD5, nil, hashsum.DownloadFlag)
-			}
 			if hashsum.HashsumOutfile == "" {
 				return operations.HashLister(context.Background(), hash.MD5, hashsum.OutputBase64, hashsum.DownloadFlag, fsrc, nil)
 			}

cmd/mount/dir.go

@@ -1,4 +1,3 @@
-//go:build linux || freebsd
 // +build linux freebsd
 
 package mount

cmd/mount/file.go

@@ -1,4 +1,3 @@
-//go:build linux || freebsd
 // +build linux freebsd
 
 package mount

cmd/mount/fs.go

@@ -1,6 +1,5 @@
 // FUSE main Fs
 
-//go:build linux || freebsd
 // +build linux freebsd
 
 package mount

cmd/mount/handle.go

@@ -1,4 +1,3 @@
-//go:build linux || freebsd
 // +build linux freebsd
 
 package mount