kowainik/hit-on
1
1
Fork 0
mirror of https://github.com/kowainik/hit-on.git synced 2024-11-03 23:06:10 +03:00
Code Issues Projects Releases Wiki Activity

[#110] Increase width for file names (#140)

Browse Source 
Resolves #110
This commit is contained in:
Dmitrii Kovanikov 2020-02-09 17:50:58 +00:00 committed by GitHub
parent aa7e20e143
commit 271ff33ce0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/Hit/Git/Status.hs
View File

@ -9,12 +9,12 @@ module Hit.Git.Status
import Shellmet (($?), ($|))
import System.Process (callCommand)
import Hit.ColorTerminal (blueCode, boldCode, cyanCode, greenCode, magentaCode
, redCode, resetCode, yellowCode)
import Hit.ColorTerminal (blueCode, boldCode, cyanCode, greenCode, magentaCode, redCode, resetCode,
yellowCode)
import Hit.Git.Common (withDeletedFiles, withUntrackedFiles)
import qualified Hit.Formatting as Fmt
import qualified Data.Text as T
import qualified Hit.Formatting as Fmt
{- | Show stats from the given commit. If commit is not specified, uses HEAD.
@ -102,8 +102,8 @@ Typical raw text returned by @git@ can look like this:
@
-}
parseDiffName :: [Text] -> Maybe DiffName
parseDiffName (t : xs) = DiffName (unwords xs) <$> parsePatchType t
parseDiffName _ = Nothing
parseDiffName (t : xs) = DiffName (unwords xs) <$> parsePatchType t
parseDiffName _ = Nothing
-- | Output of the @git diff --stat@ command.
data DiffStat = DiffStat
@ -181,7 +181,7 @@ showPrettyDiff commit = do
-- 2. Output pretty diff
diffName <- map words . lines <$> "git" $| ["diff", commit, "--name-status"]
diffStat <- map toStats . lines <$> "git" $| ["diff", commit, "--stat", "--color=always"]
diffStat <- map toStats . lines <$> "git" $| ["diff", commit, "--stat=1000", "--color=always"]
let fileTypes = sortWith diffNameFile $ mapMaybe parseDiffName diffName
let fileStats = sortWith diffStatFile $ mapMaybe parseDiffStat diffStat
let rows = zipWith joinDiffs fileTypes fileStats