moved module and relicensed

Annex/VectorClock.hs

@@ -15,7 +15,7 @@ import Control.Applicative
 import Prelude
 
 import Utility.Env
-import Logs.TimeStamp
+import Utility.TimeStamp
 import Utility.QuickCheck
 
 -- | Some very old logs did not have any time stamp at all;

Assistant/DaemonStatus.hs

@@ -16,7 +16,7 @@ import Utility.NotificationBroadcaster
 import Types.Transfer
 import Logs.Transfer
 import Logs.Trust
-import Logs.TimeStamp
+import Utility.TimeStamp
 import qualified Remote
 import qualified Types.Remote as Remote
 import Config.DynamicConfig

Command/Fsck.hs

@@ -22,7 +22,7 @@ import Annex.Link
 import Logs.Location
 import Logs.Trust
 import Logs.Activity
-import Logs.TimeStamp
+import Utility.TimeStamp
 import Logs.PreferredContent
 import Annex.NumCopies
 import Annex.UUID

Logs/MetaData.hs

@@ -40,7 +40,7 @@ import Annex.VectorClock
 import qualified Annex.Branch
 import qualified Annex
 import Logs
-import Logs.TimeStamp
+import Utility.TimeStamp
 import Logs.MetaData.Pure
 
 import qualified Data.Set as S

Logs/Transfer.hs

@@ -18,7 +18,7 @@ import Utility.Metered
 import Utility.Percentage
 import Utility.PID
 import Annex.LockPool
-import Logs.TimeStamp
+import Utility.TimeStamp
 import Logs.File
 
 import Data.Time.Clock

Logs/Unused.hs

@@ -33,7 +33,7 @@ import Data.Time
 
 import Annex.Common
 import qualified Annex
-import Logs.TimeStamp
+import Utility.TimeStamp
 import Logs.File
 
 -- everything that is stored in the unused log

Utility/PartialPrelude.hs

@@ -38,8 +38,9 @@ last = Prelude.last
 
 {- Attempts to read a value from a String.
  -
- - Unlike Text.Read.readMaybe, this ignores leading/trailing whitespace,
+ - Unlike Text.Read.readMaybe, this ignores some trailing text
- - and throws away any trailing text after the part that can be read.
+ - after the part that can be read. However, if the trailing text looks
+ - like another readable value, it fails.
  -}
 readish :: Read a => String -> Maybe a
 readish s = case reads s of

Utility/TimeStamp.hs

@@ -1,13 +1,13 @@
-{- log timestamp parsing
+{- timestamp parsing and formatting
  -
  - Copyright 2015-2016 Joey Hess <id@joeyh.name>
  -
- - Licensed under the GNU GPL version 3 or higher.
+ - License: BSD-2-clause
  -}
 
 {-# LANGUAGE CPP #-}
 
-module Logs.TimeStamp where
+module Utility.TimeStamp where
 
 import Utility.PartialPrelude
 import Utility.Misc

git-annex.cabal

@@ -879,7 +879,6 @@ Executable git-annex
     Logs.SingleValue
     Logs.SingleValue.Pure
     Logs.Smudge
-    Logs.TimeStamp
     Logs.Transfer
     Logs.Transitions
     Logs.Trust
@@ -1062,6 +1061,7 @@ Executable git-annex
     Utility.SshHost
     Utility.Su
     Utility.SystemDirectory
+    Utility.TimeStamp
     Utility.TList
     Utility.Tense
     Utility.ThreadLock