unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-23 00:08:14 +03:00
Code Issues Projects Releases Wiki Activity
7,582 Commits 419 Branches 90 Tags 331 MiB
86793c0dfe
Commit Graph

4378 Commits

Author SHA1 Message Date
mergify[bot]
86793c0dfe
Merge pull request #2077 from unisonweb/topic/named-sqlite-connections 
wrapper type for DB connection provenance
 2021-06-05 00:25:55 +00:00
Arya Irani
1b623aaea5 new type for db connection provenance 2021-06-04 17:45:41 -06:00
Paul Chiusano
4764e5cace
Merge pull request #2075 from unisonweb/topic/parse-status-codebasepath 2021-06-04 18:28:53 -05:00
Mike (stew) O'Connor
3250ca1229
Merge pull request #2076 from unisonweb/series/M2 
Series/m2
 2021-06-04 16:02:14 -07:00
Arya Irani
8e6ef52e93 use codebase path constants in SC.parseStatus 
this should also help with windows, one day
 2021-06-04 14:56:59 -06:00
Arya Irani
a5d09a734b fix some benign mistakes 2021-06-04 13:41:27 -06:00
Arya Irani
1b15bbbaf6 fix #2068 2021-06-04 12:27:10 -06:00
Paul Chiusano
6bc2796a96 Default to optimized = true 2021-06-03 11:23:51 -05:00
Paul Chiusano
bd99774f14 Regression test for #2068 2021-06-03 10:55:32 -05:00
Paul Chiusano
20df66a8c4 trim whitespace from start of status lines too 2021-06-02 23:43:41 -05:00
Paul Chiusano
05549aef1b Merge remote-tracking branch 'origin/trunk' into fix/wal-flush 2021-06-02 23:23:06 -05:00
Paul Chiusano
c5182a33a3 Added comment 2021-06-02 22:51:23 -05:00
Paul Chiusano
12337d2a3b Parsing git status to ensure no stray files get committed 2021-06-02 22:31:33 -05:00
mergify[bot]
49a3dd323f
Merge pull request #2065 from unisonweb/topic/prompt-to-upgrade 
Suggest a codebase upgrade on startup, if appropriate
 2021-06-02 23:14:04 +00:00
Arya Irani
c6df8798cf Improve output v2 codebase not found 
```
arya@jrrr unison-trunk % unison
No codebase exists in /Users/arya.
Run `unison init` to create one there, then try again; or `unison -codebase <dir>` to load a codebase from someplace else!

arya@jrrr unison-trunk % unison --old-codebase init
Initializing a new codebase in: /Users/arya

arya@jrrr unison-trunk % unison
I looked for a v2 codebase in `/Users/arya`, but found only a v1 codebase there.

You can use:
* `unison upgrade-codebase` to update it to v2,
* `unison init` to create a new v2 codebase alongside it, or
* `unison -codebase <dir>` to load a v2 codebase from elsewhere.
```

```
arya@jrrr unison-trunk % unison -codebase foo
No codebase exists in /Users/arya/unison-trunk/foo.
Run `unison -codebase foo init` to create one, then try again!

arya@jrrr unison-trunk % unison -codebase foo --old-codebase init
Initializing a new codebase in: /Users/arya/unison-trunk/foo

arya@jrrr unison-trunk % unison -codebase foo
I looked for a v2 codebase in `/Users/arya/unison-trunk/foo`, but found only a v1
codebase there.

You can use:
* `unison -codebase foo upgrade-codebase` to update it to v2,
* `unison -codebase foo init` to create a new v2 codebase alongside it, or
* `unison -codebase <dir>` to load a v2 codebase from elsewhere.
```
 2021-06-02 17:03:12 -06:00
Paul Chiusano
c03b30c29d add flag 2021-06-02 16:24:24 -05:00
Paul Chiusano
dd706f19bb
Merge pull request #2062 from unisonweb/topic/--old-codebase-help 
add something to `ucm help` for `--old-codebase`
 2021-06-02 15:05:08 -05:00
Arya Irani
c922ed6d41 add something to ucm help for --old-codebase 
closes #2059
 2021-06-02 13:09:37 -06:00
Arya Irani
f34a94e41b Add upgrade-codebase to the ucm help 
Closes #2057
 2021-06-02 12:00:52 -06:00
Rúnar
cde0d40cb6 Add cache-control header 2021-06-01 23:55:11 -04:00
Arya Irani
c92bf5528e print the number of cpus configured on headless startup 2021-06-01 11:26:10 -06:00
Paul Chiusano
c112a2415f
Merge pull request #2039 from unisonweb/fix/2004-2-hash 2021-05-31 08:21:06 -05:00
Arya Irani
60cf4c1f00 adjust tests and transcripts for changed hashes 2021-05-28 14:03:41 -06:00
Paul Chiusano
26f8dd37f2 Codebase server default ui path is relative to the executable now 
To test, I added a script that downloads the latest UI release and puts it next to the executable.
 2021-05-28 14:45:10 -05:00
Arya Irani
0fa859f32a Merge remote-tracking branch 'origin/topic/remove-v1-codebase-sync-tests' into fix/2004-2-hash 2021-05-28 01:13:44 -06:00
Arya Irani
59f927eb55 add _edits to Branch0 hash value 2021-05-28 01:04:58 -06:00
Paul Chiusano
5ad3a4e418
Merge pull request #2030 from unisonweb/fix/2026 
Fix wrapper code for putBytes
 2021-05-27 23:37:00 -05:00
Dan Doel
57ecb81d27 Fix bad failure references in builtins 
- When originally written, various builtins were referencing data types
  defined in IOSource. However, those no longer exist there.
- Instead, they are defined in Unison.Builtin.Decls
- This switches the builtins to the Decls values, some of which weren't
  exported yet.
- Also eliminates them from IOSource, since the ones there didn't
  actually work.
- Transcript testing the behavior added.
 2021-05-27 16:41:14 -04:00
Arya Irani
5c4ae33af1 update Branch.step and stepM to skip empty ancestors 2021-05-27 10:39:00 -06:00
Dan Doel
8cbac09958 Use correct wrapper for putBytes 
- It was using `boxBoxToEFBox`, which was resulting in the handle being
  returned as a result. It should be `boxBoxToEF0` to return a unit
  instead.
 2021-05-27 10:53:36 -04:00
Dan Doel
5299f5aebd Provide more information when unable to decompile a Foreign value 2021-05-27 10:51:11 -04:00
Paul Chiusano
88116239a7
Merge pull request #2016 from unisonweb/feature/only-ui-url 
Minor nit: don't show the API url unless launching UCM in headless mode
 2021-05-26 21:36:10 -05:00
Arya Irani
455b2caaa6 Revert "Empty nodes don't count as LCA" 
This reverts commit 9e10dbedc6.

# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Branch.hs
#	unison-src/transcripts/fix2000.output.md
 2021-05-26 11:37:28 -06:00
Paul Chiusano
d0f0bd038d Don't typecheck all scratch files on startup 2021-05-26 09:22:49 -05:00
Paul Chiusano
71c91ae7bc Don't show the API url in UCM, only show when headless 2021-05-26 08:49:34 -05:00
mergify[bot]
1f8b829909
Merge pull request #1996 from unisonweb/feature/codebase-before 
Speed up `push` by using fast SQL-based `Branch.before` calculation
 2021-05-25 20:07:01 +00:00
Arya Irani
1036b449c8 delete some leftover comments 2021-05-25 13:51:59 -06:00
Arya Irani
35f2261d45 delete Before Command aka Command.Before 
but you can revert this commit later if you want it!
 2021-05-25 13:49:44 -06:00
Arya Irani
6341f10cf7 forgot to use a ucm block in my transcripts 2021-05-25 13:24:18 -06:00
Paul Chiusano
7641e85909 fix pretty-printing of inline signature blocks 2021-05-25 13:48:35 -05:00
Paul Chiusano
8f51911007
Merge pull request #2006 from unisonweb/topic/headless 
Add an option for running codebase server in headless mode
 2021-05-25 11:39:24 -05:00
Rúnar
fc9d875664 Add help for headless 2021-05-25 12:11:00 -04:00
Rúnar
e12fc171a0 Revert "Add help for headless mode" 
This reverts commit 697d391b25.
 2021-05-25 12:08:18 -04:00
Rúnar
697d391b25 Add help for headless mode 2021-05-25 12:06:22 -04:00
Paul Chiusano
24cf74d745 @signature is now @inlineSignature 2021-05-25 10:51:58 -05:00
Rúnar
97062667c9 Add "headless" option 2021-05-25 10:54:14 -04:00
Arya Irani
2a3245a636 fix white space in before query 2021-05-24 21:41:26 -06:00
Arya Irani
7f65c45929 add a test that non-fast-forward pushes produce an error, 
though as of now it does not produce an error, for reasons unknown
 2021-05-24 20:36:36 -06:00
Paul Chiusano
b860c4bfc6 Add short-circuiting for squash 
This fixes the fix2000.md transcript
 2021-05-24 21:51:26 -04:00
Rúnar
9e10dbedc6 Empty nodes don't count as LCA 2021-05-24 21:50:32 -04:00