PR cleanup

This commit is contained in:
Chris Penner 2022-08-25 14:04:10 -06:00
parent ec39743a5e
commit ed5884585d
3 changed files with 3 additions and 6 deletions

View File

@ -3,7 +3,7 @@
CREATE TABLE schema_version (
version INTEGER NOT NULL
);
INSERT INTO schema_version (version) VALUES (5);
INSERT INTO schema_version (version) VALUES (6);
-- actually stores the 512-byte hashes
CREATE TABLE hash (

View File

@ -1,7 +1,6 @@
module Unison.Codebase.SqliteCodebase.Migrations.MigrateSchema5To6 (migrateSchema5To6) where
import qualified Data.Text as Text
import qualified Data.Text.IO as Text
import Data.Time (NominalDiffTime, UTCTime, addUTCTime, getCurrentTime)
import System.FilePath ((</>))
import U.Codebase.HashTags (CausalHash (CausalHash))
@ -36,9 +35,7 @@ migrateCurrentReflog codebasePath = do
oldReflogEntries :: CodebasePath -> UTCTime -> IO [Reflog.Entry CausalHash Text]
oldReflogEntries codebasePath now =
( do
putStrLn $ reflogPath
contents <- readUtf8 reflogPath
Text.putStrLn $ contents
let lines = Text.lines contents
let entries = mapMaybe parseEntry (zip [0 ..] $ reverse lines)
pure entries

View File

@ -3155,12 +3155,12 @@ prettyHumanReadableTime now time =
minutesAgo = \f -> (++ " minutes" ++ dir f),
oneHourAgo = \f -> "an hour" ++ dir f,
aboutHoursAgo = \f x -> "about " ++ x ++ " hours" ++ dir f,
at = \_ -> ("at " ++),
at = \_ t -> t,
daysAgo = \f -> (++ " days" ++ dir f),
weekAgo = \f -> (++ " week" ++ dir f),
weeksAgo = \f -> (++ " weeks" ++ dir f),
onYear = \dt -> dt,
dayOfWeekFmt = "%A, %l:%M%p",
dayOfWeekFmt = "%A, %-l:%M%p",
thisYearFmt = "%b %e",
prevYearFmt = "%b %e, %Y"
}