diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-02-19 01:09:17 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-02-19 01:19:57 -0400 |
| commit | 51c12a76ef54affaf9428232fde4f2c3e30e7488 (patch) | |
| tree | 4cb2699e2b410260e383d3bf6da14d502aa0d0dc /Annex/TaggedPush.hs | |
| parent | b5b5ead4b28fd08100bcac9cb9482263bac3a64e (diff) | |
remove Read instance for Ref
Removed instance, got it all to build using fromRef. (With a few things
that really need to show something using a ref for debugging stubbed out.)
Then added back Read instance, and made Logs.View use it for serialization.
This changes the view log format.
Diffstat (limited to 'Annex/TaggedPush.hs')
| -rw-r--r-- | Annex/TaggedPush.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Annex/TaggedPush.hs b/Annex/TaggedPush.hs index 039dc0e17..35fdf333c 100644 --- a/Annex/TaggedPush.hs +++ b/Annex/TaggedPush.hs @@ -35,11 +35,11 @@ toTaggedBranch u info b = Git.Ref $ intercalate "/" $ catMaybes [ Just "refs/synced" , Just $ fromUUID u , toB64 <$> info - , Just $ show $ Git.Ref.base b + , Just $ Git.fromRef $ Git.Ref.base b ] fromTaggedBranch :: Git.Branch -> Maybe (UUID, Maybe String) -fromTaggedBranch b = case split "/" $ show b of +fromTaggedBranch b = case split "/" $ Git.fromRef b of ("refs":"synced":u:info:_base) -> Just (toUUID u, fromB64Maybe info) ("refs":"synced":u:_base) -> @@ -58,4 +58,4 @@ taggedPush u info branch remote = Git.Command.runBool , Param $ refspec branch ] where - refspec b = show b ++ ":" ++ show (toTaggedBranch u info b) + refspec b = Git.fromRef b ++ ":" ++ Git.fromRef (toTaggedBranch u info b) |