unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-22 07:48:10 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2069 from unisonweb/fix/2068

Browse Source 
Fix issue when syncing with >=2 namespaces only existing in memory
This commit is contained in:
mergify[bot] 2021-06-04 19:15:50 +00:00 committed by GitHub
commit e7575a079c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
parser-typechecker/src/Unison/Codebase/SqliteCodebase.hs
View File

@ -843,11 +843,13 @@ syncInternal progress srcConn destConn b = time "syncInternal" do
ds <- filterM (fmap not . runDB destConn . declExists') ds
pure (cs, es, ts, ds)
if null cs && null es && null ts && null ds
then lift . runDB destConn $ putBranch' b
else
then do
lift . runDB destConn $ putBranch' b
processBranches @m sync progress rest
else do
let bs = map (uncurry B) branchDeps
os = map O (es <> ts <> ds)
in processBranches @m sync progress (os ++ bs ++ B h mb : rest)
processBranches @m sync progress (os ++ bs ++ B h mb : rest)
processBranches sync progress (O h : rest) = do
when debugProcessBranches $ traceM $ "processBranches O " ++ take 10 (show h)
(runExceptT $ flip runReaderT srcConn (Q.expectHashIdByHash (Cv.hash1to2 h) >>= Q.expectObjectIdForAnyHashId)) >>= \case

45
parser-typechecker/tests/Unison/Test/GitSync.hs
View File

@ -361,6 +361,51 @@ test = scope "gitsync22" . tests $
void . fmap (fromJust . sequence) $
traverse (Codebase.getWatch cb TestWatch) =<<
Codebase.watches cb TestWatch)
,
pushPullTest "fix2068(a)" fmt
-- this triggers
{-
gitsync22.sc.fix2068(a) EXCEPTION!!!: Called SqliteCodebase.setNamespaceRoot on unknown causal hash CausalHash (fromBase32Hex "codddvgt1ep57qpdkhe2j4pe1ehlpi5iitcrludtb8ves1aaqjl453onvfphqg83vukl7bbrj49itceqfob2b3alf47u4vves5s7pog")
CallStack (from HasCallStack):
error, called at src/Unison/Codebase/SqliteCodebase.hs:1072:17 in unison-parser-typechecker-0.0.0-6U6boimwb8GAC5qrhLfs8h:Unison.Codebase.SqliteCodebase
-}
(\repo -> [i|
```ucm
.> alias.type ##Nat builtin.Nat2
.> alias.type ##Int builtin.Int2
.> push ${repo}:.foo.bar
```
|])
(\repo -> [i|
```ucm
.> pull ${repo} pulled
.> view pulled.foo.bar.builtin.Nat2
.> view pulled.foo.bar.builtin.Int2
```
|])
,
pushPullTest "fix2068(b)" fmt
-- this triggers
{-
- gitsync22.sc.fix2068(b) EXCEPTION!!!: I couldn't find the hash ndn6fa85ggqtbgffqhd4d3bca2d08pgp3im36oa8k6p257aid90ovjq75htmh7lmg7akaqneva80ml1o21iscjmp9n1uc3lmqgg9rgg that I just synced to the cached copy of /private/var/folders/6m/p3szds2j67d8vwmxr51yrf5c0000gn/T/git-simple-1047398c149d3d5c/repo.git in "/Users/pchiusano/.cache/unisonlanguage/gitfiles/$x2F$private$x2F$var$x2F$folders$x2F$6m$x2F$p3szds2j67d8vwmxr51yrf5c0000gn$x2F$T$x2F$git-simple-1047398c149d3d5c$x2F$repo$dot$git".
CallStack (from HasCallStack):
error, called at src/Unison/Codebase/SqliteCodebase.hs:1046:13 in unison-parser-typechecker-0.0.0-6U6boimwb8GAC5qrhLfs8h:Unison.Codebase.SqliteCodebase
-}
(\repo -> [i|
```ucm
.> alias.type ##Nat builtin.Nat2
.> alias.type ##Int builtin.Int2
.> push ${repo}
.> push ${repo}:.foo.bar
```
|])
(\repo -> [i|
```ucm
.> pull ${repo} pulled
.> view pulled.foo.bar.builtin.Nat2
.> view pulled.foo.bar.builtin.Int2
```
|])
-- m [Reference.Id]