diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-08-29 18:51:22 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-08-29 19:13:00 -0400 |
| commit | 7a53fb249f0c02762d8c13f413e24c5c250167dd (patch) | |
| tree | b612c5a8b9c630561ae1ff02dd8cd6c076881f19 /Upgrade | |
| parent | d3c895b8b328685541cf41e025cff17f94b258b1 (diff) | |
refactor git-annex branch log filename code into central location
Having one module that knows about all the filenames used on the branch
allows working back from an arbitrary filename to enough information about
it to implement dropping dead remotes and doing other log file compacting
as part of a forget transition.
Diffstat (limited to 'Upgrade')
| -rw-r--r-- | Upgrade/V2.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index b5de6c8c0..42419b8ab 100644 --- a/Upgrade/V2.hs +++ b/Upgrade/V2.hs @@ -12,9 +12,9 @@ import qualified Git import qualified Git.Command import qualified Git.Ref import qualified Annex.Branch -import Logs.Location import Annex.Content import Utility.Tmp +import Logs olddir :: Git.Repo -> FilePath olddir g @@ -47,7 +47,7 @@ upgrade = do e <- liftIO $ doesDirectoryExist old when e $ do - mapM_ (\(k, f) -> inject f $ logFile k) =<< locationLogs + mapM_ (\(k, f) -> inject f $ locationLogFile k) =<< locationLogs mapM_ (\f -> inject f f) =<< logFiles old saveState False @@ -73,7 +73,7 @@ locationLogs = do where tryDirContents d = catchDefaultIO [] $ dirContents d islogfile f = maybe Nothing (\k -> Just (k, f)) $ - logFileKey $ takeFileName f + locationLogFileKey f inject :: FilePath -> FilePath -> Annex () inject source dest = do |