fix view generation code to work when run in a subdirectory; no longer needs to setCurrentDirectory to top of repo

Annex/View.hs

@@ -340,8 +340,9 @@ applyView' mkviewedfile getfilemetadata view = do
 	genViewBranch view $ do
 		uh <- inRepo Git.UpdateIndex.startUpdateIndex
 		hasher <- inRepo hashObjectStart
-		forM_ l $ \f ->
-			go uh hasher f =<< Backend.lookupFile f
+		forM_ l $ \f -> do
+			relf <- getTopFilePath <$> inRepo (toTopFilePath f)
+			go uh hasher relf =<< Backend.lookupFile f
 		liftIO $ do
 			hashObjectStop hasher
 			void $ stopUpdateIndex uh
@@ -352,7 +353,8 @@ applyView' mkviewedfile getfilemetadata view = do
 		metadata <- getCurrentMetaData k
 		let metadata' = getfilemetadata f `unionMetaData` metadata
 		forM_ (genviewedfiles f metadata') $ \fv -> do
-			stagesymlink uh hasher fv =<< inRepo (gitAnnexLink fv k)
+			f' <- fromRepo $ fromTopFilePath $ asTopFilePath fv
+			stagesymlink uh hasher f' =<< inRepo (gitAnnexLink f' k)
 	go uh hasher f Nothing
 		| "." `isPrefixOf` f = do
 			s <- liftIO $ getSymbolicLinkStatus f

Command/View.hs

@@ -53,10 +53,8 @@ mkView params = go =<< inRepo Git.Branch.current
 
 checkoutViewBranch :: View -> (View -> Annex Git.Branch) -> CommandCleanup
 checkoutViewBranch view mkbranch = do
-	oldcwd <- liftIO getCurrentDirectory
+	here <- liftIO getCurrentDirectory
 
-	{- Change to top of repository before creating view branch. -}
-	liftIO . setCurrentDirectory =<< fromRepo Git.repoPath
 	branch <- mkbranch view
 	
 	showOutput
@@ -68,9 +66,9 @@ checkoutViewBranch view mkbranch = do
 		setView view
 		{- A git repo can easily have empty directories in it,
 		 - and this pollutes the view, so remove them. -}
-		liftIO $ removeemptydirs "."
-		unlessM (liftIO $ doesDirectoryExist oldcwd) $ do
 		top <- fromRepo Git.repoPath
+		liftIO $ removeemptydirs top
+		unlessM (liftIO $ doesDirectoryExist here) $ do
 			showLongNote (cwdmissing top)
 	return ok
   where