push/mounted: fix unload of paths in root + no return catch

Fixes #641.

+ Refactored push mounted, removing/generalizing code for
mounts to use same as ordinary pushes.

+ Ensure that in cmd/drive/main.go, after a mounted push
we return appropriately otherwise we were erraneously falling
to start an ordinary push which would trigger a bug with
a bad context. This is akin to the common C-style switch bug in which
one forgets to break/return.

+ Fixed up a bug with mounted push where if the user
specified a single mounted path, the current working
directory wouldn't be added to the arguments that needed
to be processed. It was an error comparison mismatch.

Author: odeke-em

cmd/drive/main.go

@@ -851,6 +851,7 @@ func (cmd *pushCmd) Flags(fs *flag.FlagSet) *flag.FlagSet {
 func (cmd *pushCmd) Run(args []string, definedFlags map[string]*flag.Flag) {
 	if *cmd.MountedPush {
 		exitWithError(cmd.pushMounted(args, definedFlags))
+		return
 	}
 
 	sources, context, path := preprocessArgs(args)
@@ -1056,7 +1057,7 @@ func (cmd *pushCmd) pushMounted(args []string, definedFlags map[string]*flag.Fla
 	// Expectation is that at least one path has to be passed in
 	if argc < 2 {
 		cwd, cerr := os.Getwd()
-		if cerr != nil {
+		if cerr == nil {
 			contextArgs = append(contextArgs, cwd)
 		}
 		rest = args

src/push.go

@@ -81,6 +81,17 @@ func (g *Commands) Push() error {
 		}
 	}
 
+	mount := g.opts.Mount
+	if mount != nil {
+		for _, mt := range mount.Points {
+			ccl, cclashes, cerr := g.changeListResolve(mt.Name, mt.MountPath, true)
+			if cerr == nil {
+				cl = append(cl, ccl...)
+			}
+			clashes = append(clashes, cclashes...)
+		}
+	}
+
 	if len(clashes) >= 1 {
 		if g.opts.FixClashes {
 			err := autoRenameClashes(g, clashes)
@@ -94,16 +105,6 @@ func (g *Commands) Push() error {
 		return ErrClashesDetected
 	}
 
-	mount := g.opts.Mount
-	if mount != nil {
-		for _, mt := range mount.Points {
-			ccl, _, cerr := lonePush(g, rootAbsPath, mt.Name, mt.MountPath)
-			if cerr == nil {
-				cl = append(cl, ccl...)
-			}
-		}
-	}
-
 	spin.stop()
 
 	nonConflictsPtr, conflictsPtr := g.resolveConflicts(cl, true)
@@ -319,48 +320,6 @@ func (g *Commands) playPushChanges(cl []*Change, opMap *map[Operation]sizeCounte
 	return err
 }
 
-func lonePush(g *Commands, parent, absPath, path string) (cl, clashes []*Change, err error) {
-	remotesChan := g.rem.FindByPathM(absPath)
-
-	var l *File
-	localinfo, _ := os.Stat(path)
-	if localinfo != nil {
-		l = NewLocalFile(path, localinfo)
-	}
-
-	iterCount := uint64(0)
-	noClashThreshold := uint64(1)
-
-	for r := range remotesChan {
-		if r != nil {
-			iterCount++
-		}
-
-		clr := &changeListResolve{
-			remote:    r,
-			local:     l,
-			push:      true,
-			dir:       parent,
-			localBase: absPath,
-			depth:     g.opts.Depth,
-		}
-
-		ccl, cclashes, cErr := g.resolveChangeListRecv(clr)
-		cl = append(cl, ccl...)
-		clashes = append(clashes, cclashes...)
-		if cErr != nil {
-			err = combineErrors(err, cErr)
-		}
-	}
-
-	if iterCount > noClashThreshold && len(clashes) < 1 {
-		clashes = append(clashes, cl...)
-		err = combineErrors(err, ErrClashesDetected)
-	}
-
-	return
-}
-
 func (g *Commands) pathSplitter(absPath string) (dir, base string) {
 	p := strings.Split(absPath, "/")
 	pLen := len(p)