diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-06-08 00:29:39 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-06-08 00:29:39 -0400 |
| commit | d45a9a7831a567c548f2552e1470d72f1966fffd (patch) | |
| tree | 172a41852cdc055f11606dbe5b68f7d0a7f91bc5 /Annex | |
| parent | 7d78cbf97ca9d5a579f05b4ba735be69bafdef97 (diff) | |
refactor and function name cleanup
(oops, I had a calcMerge and a calc_merge!)
Diffstat (limited to 'Annex')
| -rw-r--r-- | Annex/Branch.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Annex/Branch.hs b/Annex/Branch.hs index 1dacd5f32..7b433cc6e 100644 --- a/Annex/Branch.hs +++ b/Annex/Branch.hs @@ -261,15 +261,15 @@ files = withIndexUpdate $ do - in changes from other branches. -} genIndex :: Git.Repo -> IO () -genIndex g = Git.UpdateIndex.stream_update_index g - [Git.UpdateIndex.ls_tree fullname g] +genIndex g = Git.UpdateIndex.streamUpdateIndex g + [Git.UpdateIndex.lsTree fullname g] {- Merges the specified refs into the index. - Any changes staged in the index will be preserved. -} mergeIndex :: [Git.Ref] -> Annex () mergeIndex branches = do h <- catFileHandle - inRepo $ \g -> Git.UnionMerge.merge_index h g branches + inRepo $ \g -> Git.UnionMerge.mergeIndex h g branches {- Runs an action using the branch's index file. -} withIndex :: Annex a -> Annex a @@ -338,13 +338,13 @@ stageJournal = do g <- gitRepo withIndex $ liftIO $ do h <- hashObjectStart g - Git.UpdateIndex.stream_update_index g + Git.UpdateIndex.streamUpdateIndex g [genstream (gitAnnexJournalDir g) h fs] hashObjectStop h where genstream dir h fs streamer = forM_ fs $ \file -> do let path = dir </> file sha <- hashFile h path - _ <- streamer $ Git.UpdateIndex.update_index_line + _ <- streamer $ Git.UpdateIndex.updateIndexLine sha FileBlob (asTopFilePath $ fileJournal file) removeFile path |