diff options
| author | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-04-29 14:59:49 -0400 |
| commit | 36852d90bc18cb7b2bddb1ce9dce39cc1f0203de (patch) | |
| tree | 0419a1d67f6bb9db4ce79f8cb76b53752e2d7371 /Utility/Rsync.hs | |
| parent | efe7e174bfab4d0dd2e88e7b6eb859940b2228ea (diff) | |
| download | git-repair-36852d90bc18cb7b2bddb1ce9dce39cc1f0203de.tar.gz | |
Merge from git-annex.
Diffstat (limited to 'Utility/Rsync.hs')
| -rw-r--r-- | Utility/Rsync.hs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Utility/Rsync.hs b/Utility/Rsync.hs index ed1eab6..4f4c4eb 100644 --- a/Utility/Rsync.hs +++ b/Utility/Rsync.hs @@ -1,6 +1,6 @@ {- various rsync stuff - - - Copyright 2010-2013 Joey Hess <joey@kitenet.net> + - Copyright 2010-2013 Joey Hess <id@joeyh.name> - - License: BSD-2-clause -} @@ -92,13 +92,13 @@ rsyncUrlIsPath s | rsyncUrlIsShell s = False | otherwise = ':' `notElem` s -{- Runs rsync, but intercepts its progress output and updates a meter. - - The progress output is also output to stdout. +{- Runs rsync, but intercepts its progress output and updates a progress + - meter. - - The params must enable rsync's --progress mode for this to work. -} -rsyncProgress :: MeterUpdate -> [CommandParam] -> IO Bool -rsyncProgress meterupdate = commandMeter parseRsyncProgress meterupdate "rsync" . rsyncParamsFixup +rsyncProgress :: OutputHandler -> MeterUpdate -> [CommandParam] -> IO Bool +rsyncProgress oh meter = commandMeter parseRsyncProgress oh meter "rsync" . rsyncParamsFixup {- Strategy: Look for chunks prefixed with \r (rsync writes a \r before - the first progress output, and each thereafter). The first number |