flesh out some Branch stuff · JavaDerek/unison@19499b5 · GitHub
Skip to content

Commit 19499b5

Browse files
committed
flesh out some Branch stuff
1 parent e9ddc18 commit 19499b5

12 files changed

Lines changed: 298 additions & 61 deletions

File tree

Lines changed: 17 additions & 9 deletions
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
module U.Codebase.Sqlite.Branch.Format where
22

3-
import U.Codebase.Sqlite.Branch.Full
4-
import U.Codebase.Sqlite.Branch.Diff
3+
import U.Codebase.Sqlite.Branch.Diff ( Diff )
4+
import U.Codebase.Sqlite.Branch.Full ( Branch )
5+
import U.Codebase.Sqlite.DbId (BranchObjectId)
56

6-
data BranchFormat
7-
= Full Branch
8-
| Diff Diff
7+
data BranchFormat = Full Branch | Diff BranchObjectId Diff

‎codebase2/codebase-sqlite/U/Codebase/Sqlite/DbId.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ newtype TextId = TextId Word64 deriving (Eq, Ord, Show)
2222
newtype HashId = HashId Word64 deriving (Eq, Ord, Show)
2323
deriving (Num, Real, Enum, Integral, Bits, Hashable, FromField, ToField) via Word64
2424

25-
newtype PatchObjectId = PatchObjectId Word64 deriving (Eq, Ord, Show)
25+
newtype PatchObjectId = PatchObjectId { unPatchObjectId :: ObjectId } deriving (Eq, Ord, Show)
2626
deriving (Num, Real, Enum, Integral, Bits, Hashable, FromField, ToField) via ObjectId
2727

28-
newtype BranchObjectId = BranchObjectId ObjectId deriving (Eq, Ord, Show)
28+
newtype BranchObjectId = BranchObjectId { unBranchObjectId :: ObjectId } deriving (Eq, Ord, Show)
2929
deriving (Num, Real, Enum, Integral, Bits, Hashable, FromField, ToField) via ObjectId
3030

3131
newtype BranchHashId = BranchHashId { unBranchHashId :: HashId } deriving (Eq, Ord, Show)

‎codebase2/codebase-sqlite/U/Codebase/Sqlite/Operations.hs‎

Lines changed: 220 additions & 5 deletions

0 commit comments

Comments
 (0)