diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2017-05-15 23:32:17 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2017-05-16 01:03:52 -0400 |
| commit | 4dc2000f97236089a8613cc6b0bf9846fea6abfa (patch) | |
| tree | 83df60ef702246b0b71bc99e141d4a8bf1990438 /Assistant | |
| parent | 973180b077e60b5d12d7c57d926878d11d7f2105 (diff) | |
adeiu, MissingH
Removed dependency on MissingH, instead depending on the split
library.
After laying groundwork for this since 2015, it
was mostly straightforward. Added Utility.Tuple and
Utility.Split. Eyeballed System.Path.WildMatch while implementing
the same thing.
Since MissingH's progress meter display was being used, I re-implemented
my own. Bonus: Now progress is displayed for transfers of files of
unknown size.
This commit was sponsored by Shane-o on Patreon.
Diffstat (limited to 'Assistant')
| -rw-r--r-- | Assistant/Threads/Committer.hs | 2 | ||||
| -rw-r--r-- | Assistant/Threads/Watcher.hs | 2 | ||||
| -rw-r--r-- | Assistant/Upgrade.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Assistant/Threads/Committer.hs b/Assistant/Threads/Committer.hs index d0acb8c60..3680349be 100644 --- a/Assistant/Threads/Committer.hs +++ b/Assistant/Threads/Committer.hs @@ -38,9 +38,9 @@ import Annex.Content.Direct import qualified Database.Keys import qualified Command.Sync import qualified Git.Branch +import Utility.Tuple import Data.Time.Clock -import Data.Tuple.Utils import qualified Data.Set as S import qualified Data.Map as M import Data.Either diff --git a/Assistant/Threads/Watcher.hs b/Assistant/Threads/Watcher.hs index 90bb3dc78..742b8c88f 100644 --- a/Assistant/Threads/Watcher.hs +++ b/Assistant/Threads/Watcher.hs @@ -44,13 +44,13 @@ import Git.FilePath import Config import Config.GitConfig import Utility.ThreadScheduler +import Utility.FileSystemEncoding import Logs.Location import qualified Database.Keys #ifndef mingw32_HOST_OS import qualified Utility.Lsof as Lsof #endif -import Data.Bits.Utils import Data.Typeable import qualified Data.ByteString.Lazy as L import qualified Control.Exception as E diff --git a/Assistant/Upgrade.hs b/Assistant/Upgrade.hs index 67a4d9fc2..cd1be4d4e 100644 --- a/Assistant/Upgrade.hs +++ b/Assistant/Upgrade.hs @@ -39,9 +39,9 @@ import qualified Utility.Lsof as Lsof import qualified Build.SysConfig import qualified Utility.Url as Url import qualified Annex.Url as Url +import Utility.Tuple import qualified Data.Map as M -import Data.Tuple.Utils {- Upgrade without interaction in the webapp. -} unattendedUpgrade :: Assistant () |