diff options
| author | Joey Hess <joeyh@joeyh.name> | 2020-01-02 12:34:10 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2020-01-02 12:42:57 -0400 |
| commit | 9df8a6eb9405dde4464d27133c04f5ee539a85de (patch) | |
| tree | 8a7ac5f52be8679f8a2525515a0b2c1b715c99ad /Utility/HumanTime.hs | |
| parent | 16022a8b98f4bc134542e78a42538364d2f97d92 (diff) | |
| download | git-repair-9df8a6eb9405dde4464d27133c04f5ee539a85de.tar.gz | |
merge from git-annex and relicense accordingly
Merge git library and utility from git-annex. The former is now relicensed
AGPL, so git-repair as a whole becomes AGPL.
For simplicity, I am relicensing the remainder of the code in git-repair
AGPL as well, per the header changes in this commit. While that code is
also technically available under the GPL license, as it's been released
under that license before, changes going forward will be only released by
me under the AGPL.
Diffstat (limited to 'Utility/HumanTime.hs')
| -rw-r--r-- | Utility/HumanTime.hs | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Utility/HumanTime.hs b/Utility/HumanTime.hs index fe7cf22..01fbeac 100644 --- a/Utility/HumanTime.hs +++ b/Utility/HumanTime.hs @@ -60,15 +60,17 @@ parseDuration = maybe parsefail (return . Duration) . go 0 fromDuration :: Duration -> String fromDuration Duration { durationSeconds = d } | d == 0 = "0s" - | otherwise = concatMap showunit $ go [] units d + | otherwise = concatMap showunit $ take 2 $ go [] units d where - showunit (u, n) - | n > 0 = show n ++ [u] - | otherwise = "" + showunit (u, n) = show n ++ [u] go c [] _ = reverse c go c ((u, n):us) v = let (q,r) = v `quotRem` n - in go ((u, q):c) us r + in if q > 0 + then go ((u, q):c) us r + else if null c + then go c us r + else reverse c units :: [(Char, Integer)] units = |