summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-26 14:26:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-26 14:26:43 -0400
commit78d3add86b564149cd1e7c4527deffbf30cf839b (patch)
tree6c5d54557f30dc1bafcf6b52eca31c5a75b31df8
parent20a451a58bf6be3359d458cebb9e9e192313e11a (diff)
tweak field name
-rw-r--r--Assistant/Threads/MountWatcher.hs2
-rw-r--r--Assistant/Threads/NetWatcher.hs5
-rw-r--r--Remote/Bup.hs2
-rw-r--r--Remote/Directory.hs2
-rw-r--r--Remote/Git.hs2
-rw-r--r--Remote/Hook.hs2
-rw-r--r--Remote/Rsync.hs2
-rw-r--r--Remote/S3.hs2
-rw-r--r--Remote/Web.hs2
-rw-r--r--Types/Remote.hs4
10 files changed, 12 insertions, 13 deletions
diff --git a/Assistant/Threads/MountWatcher.hs b/Assistant/Threads/MountWatcher.hs
index 2d9b5a82b..cc7495602 100644
--- a/Assistant/Threads/MountWatcher.hs
+++ b/Assistant/Threads/MountWatcher.hs
@@ -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)
diff --git a/Assistant/Threads/NetWatcher.hs b/Assistant/Threads/NetWatcher.hs
index 2f71b0825..117ab7a20 100644
--- a/Assistant/Threads/NetWatcher.hs
+++ b/Assistant/Threads/NetWatcher.hs
@@ -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
diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 56b8071ee..3dfedfec6 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -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
diff --git a/Remote/Directory.hs b/Remote/Directory.hs
index 1b75b937f..2e7d8c6ad 100644
--- a/Remote/Directory.hs
+++ b/Remote/Directory.hs
@@ -53,7 +53,7 @@ gen r u c = do
whereisKey = Nothing,
config = Nothing,
repo = r,
- path = Just dir,
+ localpath = Just dir,
remotetype = remote
}
where
diff --git a/Remote/Git.hs b/Remote/Git.hs
index f12ef2fc7..9f81c689d 100644
--- a/Remote/Git.hs
+++ b/Remote/Git.hs
@@ -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
diff --git a/Remote/Hook.hs b/Remote/Hook.hs
index 5856b2a02..5bd091efa 100644
--- a/Remote/Hook.hs
+++ b/Remote/Hook.hs
@@ -48,7 +48,7 @@ gen r u c = do
hasKeyCheap = False,
whereisKey = Nothing,
config = Nothing,
- path = Nothing,
+ localpath = Nothing,
repo = r,
remotetype = remote
}
diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs
index 1ed73e119..86e9771f9 100644
--- a/Remote/Rsync.hs
+++ b/Remote/Rsync.hs
@@ -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
diff --git a/Remote/S3.hs b/Remote/S3.hs
index b248335c8..d1e592b0d 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -60,7 +60,7 @@ gen' r u c cst =
whereisKey = Nothing,
config = c,
repo = r,
- path = Nothing,
+ localpath = Nothing,
remotetype = remote
}
diff --git a/Remote/Web.hs b/Remote/Web.hs
index 02a2b5ab4..54b93c1fe 100644
--- a/Remote/Web.hs
+++ b/Remote/Web.hs
@@ -47,7 +47,7 @@ gen r _ _ =
hasKeyCheap = False,
whereisKey = Just getUrls,
config = Nothing,
- path = Nothing,
+ localpath = Nothing,
repo = r,
remotetype = remote
}
diff --git a/Types/Remote.hs b/Types/Remote.hs
index 814be9feb..a65919605 100644
--- a/Types/Remote.hs
+++ b/Types/Remote.hs
@@ -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
}