all commands building except for assistant
also, changed ConfigValue to a newtype, and moved it into Git.Config.
This commit is contained in:
		
					parent
					
						
							
								718fa83da6
							
						
					
				
			
			
				commit
				
					
						c20f4704a7
					
				
			
		
					 40 changed files with 187 additions and 174 deletions
				
			
		| 
						 | 
				
			
			@ -17,6 +17,7 @@ import Data.String
 | 
			
		|||
import Data.ByteString.Builder
 | 
			
		||||
import qualified Data.Semigroup as Sem
 | 
			
		||||
 | 
			
		||||
import Git.Types (ConfigValue(..))
 | 
			
		||||
import Utility.FileSystemEncoding
 | 
			
		||||
import Utility.QuickCheck
 | 
			
		||||
import qualified Utility.SimpleProtocol as Proto
 | 
			
		||||
| 
						 | 
				
			
			@ -52,6 +53,12 @@ instance FromUUID String where
 | 
			
		|||
instance ToUUID String where
 | 
			
		||||
	toUUID s = toUUID (encodeBS' s)
 | 
			
		||||
 | 
			
		||||
instance FromUUID ConfigValue where
 | 
			
		||||
	fromUUID s = (ConfigValue (fromUUID s))
 | 
			
		||||
 | 
			
		||||
instance ToUUID ConfigValue where
 | 
			
		||||
	toUUID (ConfigValue v) = toUUID v
 | 
			
		||||
 | 
			
		||||
-- There is no matching FromUUID U.UUID because a git-annex UUID may
 | 
			
		||||
-- be NoUUID or perhaps contain something not allowed in a canonical UUID.
 | 
			
		||||
instance ToUUID U.UUID where
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue