mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix view changing when in subdir

Browse source 
Failed reading some files with relative paths. This is a quick and dirty
fix.
This commit is contained in:
Joey Hess 2014-02-18 20:57:14 -04:00
parent 9b51d43318
commit 72c118152f
5 changed files with 18 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Command/VAdd.hs
View file

@ -9,7 +9,6 @@ module Command.VAdd where
import Common.Annex
import Command
import Types.View
import Annex.View
import Logs.View
import Command.View (paramView, parseViewParam, checkoutViewBranch)
@ -33,15 +32,11 @@ start params = do
Unchanged -> do
showNote "unchanged"
next $ next $ return True
Narrowing -> next $ next $
checkoutViewBranch view' narrowView
Widening -> error "Widening view to match more files is not currently supported."
Narrowing -> next $ perform view'
calc v c [] = (v, c)
calc v c (p:ps) =
let (v', c') = uncurry (refineView v) (parseViewParam p)
in calc v' (max c c') ps
perform :: View -> CommandPerform
perform view = do
branch <- narrowView view
next $ checkoutViewBranch view branch