From 5e7fe9663d2ced9c62d1d9b1a5c704dcde3c0492 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 16 Nov 2015 19:32:30 -0400 Subject: Display progress meter in -J mode when copying from a local git repo, to a local git repo, and from a remote git repo. Had everything available, just didn't combine the progress meter with the other places progress is sent to update it. (And to a remote repo already did show progress.) Most special remotes should already display progress meters with -J, same as without it. One exception to this is the web, since it relies on wget/curl progress display without -J. Still todo.. --- Utility/Metered.hs | 3 +++ 1 file changed, 3 insertions(+) (limited to 'Utility/Metered.hs') diff --git a/Utility/Metered.hs b/Utility/Metered.hs index c34e931a4..60dcf7c74 100644 --- a/Utility/Metered.hs +++ b/Utility/Metered.hs @@ -29,6 +29,9 @@ type MeterUpdate = (BytesProcessed -> IO ()) nullMeterUpdate :: MeterUpdate nullMeterUpdate _ = return () +combineMeterUpdate :: MeterUpdate -> MeterUpdate -> MeterUpdate +combineMeterUpdate a b = \n -> a n >> b n + {- Total number of bytes processed so far. -} newtype BytesProcessed = BytesProcessed Integer deriving (Eq, Ord, Show) -- cgit v1.2.3