tweak field name
This commit is contained in:
parent
20a451a58b
commit
78d3add86b
10 changed files with 12 additions and 13 deletions
|
@ -175,7 +175,7 @@ remotesUnder st dstatus dir = runThreadState st $ do
|
|||
updateKnownRemotes dstatus
|
||||
return $ map snd $ filter fst pairs
|
||||
where
|
||||
checkremote repotop r = case Remote.path r of
|
||||
checkremote repotop r = case Remote.localpath r of
|
||||
Just p | dirContains dir (absPathFrom repotop p) ->
|
||||
(,) <$> pure True <*> updateRemote r
|
||||
_ -> return (False, r)
|
||||
|
|
|
@ -128,6 +128,5 @@ handleConnection st dstatus scanremotes = do
|
|||
|
||||
{- Finds network remotes. -}
|
||||
networkRemotes :: ThreadState -> IO [Remote]
|
||||
networkRemotes st = runThreadState st $ do
|
||||
rs <- remoteList
|
||||
return $ filter (isNothing . Remote.path) rs
|
||||
networkRemotes st = runThreadState st $
|
||||
filter (isNothing . Remote.localpath) <$> remoteList
|
||||
|
|
|
@ -60,7 +60,7 @@ gen r u c = do
|
|||
, whereisKey = Nothing
|
||||
, config = c
|
||||
, repo = r
|
||||
, path = if bupLocal buprepo && not (null buprepo)
|
||||
, localpath = if bupLocal buprepo && not (null buprepo)
|
||||
then Just buprepo
|
||||
else Nothing
|
||||
, remotetype = remote
|
||||
|
|
|
@ -53,7 +53,7 @@ gen r u c = do
|
|||
whereisKey = Nothing,
|
||||
config = Nothing,
|
||||
repo = r,
|
||||
path = Just dir,
|
||||
localpath = Just dir,
|
||||
remotetype = remote
|
||||
}
|
||||
where
|
||||
|
|
|
@ -94,7 +94,7 @@ gen r u _ = new <$> remoteCost r defcst
|
|||
, hasKeyCheap = repoCheap r
|
||||
, whereisKey = Nothing
|
||||
, config = Nothing
|
||||
, path = if Git.repoIsLocal r || Git.repoIsLocalUnknown r
|
||||
, localpath = if Git.repoIsLocal r || Git.repoIsLocalUnknown r
|
||||
then Just $ Git.repoPath r
|
||||
else Nothing
|
||||
, repo = r
|
||||
|
|
|
@ -48,7 +48,7 @@ gen r u c = do
|
|||
hasKeyCheap = False,
|
||||
whereisKey = Nothing,
|
||||
config = Nothing,
|
||||
path = Nothing,
|
||||
localpath = Nothing,
|
||||
repo = r,
|
||||
remotetype = remote
|
||||
}
|
||||
|
|
|
@ -58,7 +58,7 @@ gen r u c = do
|
|||
, whereisKey = Nothing
|
||||
, config = Nothing
|
||||
, repo = r
|
||||
, path = if rsyncUrlIsPath $ rsyncUrl o
|
||||
, localpath = if rsyncUrlIsPath $ rsyncUrl o
|
||||
then Just $ rsyncUrl o
|
||||
else Nothing
|
||||
, remotetype = remote
|
||||
|
|
|
@ -60,7 +60,7 @@ gen' r u c cst =
|
|||
whereisKey = Nothing,
|
||||
config = c,
|
||||
repo = r,
|
||||
path = Nothing,
|
||||
localpath = Nothing,
|
||||
remotetype = remote
|
||||
}
|
||||
|
||||
|
|
|
@ -47,7 +47,7 @@ gen r _ _ =
|
|||
hasKeyCheap = False,
|
||||
whereisKey = Just getUrls,
|
||||
config = Nothing,
|
||||
path = Nothing,
|
||||
localpath = Nothing,
|
||||
repo = r,
|
||||
remotetype = remote
|
||||
}
|
||||
|
|
|
@ -64,8 +64,8 @@ data RemoteA a = Remote {
|
|||
config :: Maybe RemoteConfig,
|
||||
-- git configuration for the remote
|
||||
repo :: Git.Repo,
|
||||
-- a Remote can be assocated with a specific filesystem path
|
||||
path :: Maybe FilePath,
|
||||
-- a Remote can be assocated with a specific local filesystem path
|
||||
localpath :: Maybe FilePath,
|
||||
-- the type of the remote
|
||||
remotetype :: RemoteTypeA a
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue