diff options
author | Joey Hess <joey@kitenet.net> | 2011-07-01 15:24:07 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2011-07-01 15:30:42 -0400 |
commit | cdbcd6f495580ee927a85af0581661b486c8ef77 (patch) | |
tree | 87f3f882bb543bbed05147ce416805387a45082d /Command | |
parent | ceb887d82669b3ec694f31a899b59eefe0f5f352 (diff) |
add web special remote
Generalized LocationLog to PresenceLog, and use a presence log to record
urls for the web special remote.
Diffstat (limited to 'Command')
-rw-r--r-- | Command/Add.hs | 2 | ||||
-rw-r--r-- | Command/Drop.hs | 2 | ||||
-rw-r--r-- | Command/DropKey.hs | 2 | ||||
-rw-r--r-- | Command/Fsck.hs | 4 | ||||
-rw-r--r-- | Command/Move.hs | 2 | ||||
-rw-r--r-- | Command/SetKey.hs | 2 | ||||
-rw-r--r-- | Command/Unannex.hs | 2 | ||||
-rw-r--r-- | Command/Whereis.hs | 2 |
8 files changed, 9 insertions, 9 deletions
diff --git a/Command/Add.hs b/Command/Add.hs index 5133ee1fd..6a1ffb5da 100644 --- a/Command/Add.hs +++ b/Command/Add.hs @@ -51,7 +51,7 @@ perform (file, backend) = do cleanup :: FilePath -> Key -> CommandCleanup cleanup file key = do - logStatus key ValuePresent + logStatus key InfoPresent link <- calcGitLink file key liftIO $ createSymbolicLink link file diff --git a/Command/Drop.hs b/Command/Drop.hs index 07cec1a67..bd4740741 100644 --- a/Command/Drop.hs +++ b/Command/Drop.hs @@ -45,5 +45,5 @@ perform key backend numcopies = do cleanup :: Key -> CommandCleanup cleanup key = do whenM (inAnnex key) $ removeAnnex key - logStatus key ValueMissing + logStatus key InfoMissing return True diff --git a/Command/DropKey.hs b/Command/DropKey.hs index 780fe0adf..16a3e35d6 100644 --- a/Command/DropKey.hs +++ b/Command/DropKey.hs @@ -40,5 +40,5 @@ perform key = do cleanup :: Key -> CommandCleanup cleanup key = do - logStatus key ValueMissing + logStatus key InfoMissing return True diff --git a/Command/Fsck.hs b/Command/Fsck.hs index cb062342d..988cfd28d 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -64,11 +64,11 @@ verifyLocationLog key file = do case (present, u `elem` uuids) of (True, False) -> do - fix g u ValuePresent + fix g u InfoPresent -- There is no data loss, so do not fail. return True (False, True) -> do - fix g u ValueMissing + fix g u InfoMissing warning $ "** Based on the location log, " ++ file ++ "\n** was expected to be present, " ++ diff --git a/Command/Move.hs b/Command/Move.hs index 03b605ce5..6bf6e0582 100644 --- a/Command/Move.hs +++ b/Command/Move.hs @@ -58,7 +58,7 @@ remoteHasKey remote key present = do g <- Annex.gitRepo logChange g key remoteuuid status where - status = if present then ValuePresent else ValueMissing + status = if present then InfoPresent else InfoMissing {- Moves (or copies) the content of an annexed file to a remote. - diff --git a/Command/SetKey.hs b/Command/SetKey.hs index dbad148b2..546bd8e2d 100644 --- a/Command/SetKey.hs +++ b/Command/SetKey.hs @@ -46,5 +46,5 @@ perform file = do cleanup :: CommandCleanup cleanup = do key <- cmdlineKey - logStatus key ValuePresent + logStatus key InfoPresent return True diff --git a/Command/Unannex.hs b/Command/Unannex.hs index fe413b25b..d30f8d20f 100644 --- a/Command/Unannex.hs +++ b/Command/Unannex.hs @@ -65,7 +65,7 @@ cleanup file key = do liftIO $ createDirectoryIfMissing True (parentDir file) fromAnnex key file - logStatus key ValueMissing + logStatus key InfoMissing -- Commit staged changes at end to avoid confusing the -- pre-commit hook if this file is later added back to diff --git a/Command/Whereis.hs b/Command/Whereis.hs index 3a7213217..0e4858f8b 100644 --- a/Command/Whereis.hs +++ b/Command/Whereis.hs @@ -10,7 +10,7 @@ module Command.Whereis where import LocationLog import Command import Messages -import UUID +import Remote import Types command :: [Command] |