summaryrefslogtreecommitdiff
path: root/Command/Sync.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2012-08-08 16:06:01 -0400
committerGravatar Joey Hess <joey@kitenet.net>2012-08-08 16:20:24 -0400
commit94fcd0cf59f94dd29ab171f0875bd25af65fd527 (patch)
treec89328f776d3a305cc45355471ab8fa8409aa686 /Command/Sync.hs
parente0cd9776690c74aa1b346aa11615a75c862d7714 (diff)
add routes to pause/start/cancel transfers
This commit includes a paydown on technical debt incurred two years ago, when I didn't know that it was bad to make custom Read and Show instances for types. As the routes need Read and Show for Transfer, which includes a Key, and deriving my own Read instance of key was not practical, I had to finally clean that up. So the compact Key read and show functions are now file2key and key2file, and Read and Show are now derived instances. Changed all code that used the old instances, compiler checked. (There were a few places, particularly in Command.Unused, and the test suite where the Show instance continue to be used for legitimate comparisons; ie show key_x == show key_y (though really in a bloom filter))
Diffstat (limited to 'Command/Sync.hs')
-rw-r--r--Command/Sync.hs5
1 files changed, 3 insertions, 2 deletions
diff --git a/Command/Sync.hs b/Command/Sync.hs
index ab29c82b6..f40a2f621 100644
--- a/Command/Sync.hs
+++ b/Command/Sync.hs
@@ -25,6 +25,7 @@ import qualified Git
import Git.Types (BlobType(..))
import qualified Types.Remote
import qualified Remote.Git
+import Types.Key
import qualified Data.Map as M
import qualified Data.ByteString.Lazy as L
@@ -260,8 +261,8 @@ resolveMerge' u
-}
mergeFile :: FilePath -> Key -> FilePath
mergeFile file key
- | doubleconflict = go $ show key
- | otherwise = go $ shortHash $ show key
+ | doubleconflict = go $ key2file key
+ | otherwise = go $ shortHash $ key2file key
where
varmarker = ".variant-"
doubleconflict = varmarker `isSuffixOf` (dropExtension file)