Branch handling improvements
Support creating the branch. Unified branch state into a single data type. Only commit changes when the index has been changed.
This commit is contained in:
parent
d3f0106f2e
commit
8166facaef
4 changed files with 97 additions and 49 deletions
8
Annex.hs
8
Annex.hs
|
@ -23,7 +23,7 @@ import GitQueue
|
|||
import Types.Backend
|
||||
import Types.Remote
|
||||
import Types.Crypto
|
||||
import Types.Branch
|
||||
import Types.BranchState
|
||||
import TrustLevel
|
||||
import Types.UUID
|
||||
|
||||
|
@ -40,8 +40,7 @@ data AnnexState = AnnexState
|
|||
, quiet :: Bool
|
||||
, force :: Bool
|
||||
, fast :: Bool
|
||||
, branchupdated :: Bool
|
||||
, branchcache :: BranchCache
|
||||
, branchstate :: BranchState
|
||||
, forcebackend :: Maybe String
|
||||
, forcenumcopies :: Maybe Int
|
||||
, defaultkey :: Maybe String
|
||||
|
@ -62,8 +61,7 @@ newState allbackends gitrepo = AnnexState
|
|||
, quiet = False
|
||||
, force = False
|
||||
, fast = False
|
||||
, branchupdated = False
|
||||
, branchcache = emptyBranchCache
|
||||
, branchstate = startBranchState
|
||||
, forcebackend = Nothing
|
||||
, forcenumcopies = Nothing
|
||||
, defaultkey = Nothing
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue