mergify[bot]
b59be142b6
Merge pull request #2086 from unisonweb/aryairani-patch-1
...
pass -f-terminfo to haskeline
2021-06-07 16:31:39 +00:00
Dan Doel
a5c35541b9
Try to give a better error message when subtyping rows
...
- The subtyping procedure for rows just calls an ability check, but the
errors for ability checks seem somewhat inappropriate.
- Instead catch the ability check error and report a type mismatch.
2021-06-07 11:29:17 -04:00
Dan Doel
5915f7c8b8
Tweak stream.u type signatures
...
- The definitions in this file used a combination of signatures that was
very hard to make work, with no annotations on some functions, and
annotations with unnecessarily general rows in others.
- The checking could possibly be made better, but in an effort to keep
things from getting too complicated for now, just tweak the type
signatures.
2021-06-07 11:26:05 -04:00
Arya Irani
51716a121e
pass -f-terminfo to haskeline
...
Closes #2085
2021-06-07 09:22:18 -06:00
Paul Chiusano
dddf896e12
Merge pull request #2084 from unisonweb/topic/more-tolerant-gitcache
...
more tolerant git cache
2021-06-07 10:00:37 -05:00
Arya Irani
de46c52d7f
Merge branch 'trunk' into topic/more-tolerant-gitcache
2021-06-07 01:59:29 -04:00
Arya Irani
ff9f685a52
wipe a gitcache and retry, if pull fails
2021-06-06 23:53:36 -06:00
Arya Irani
b9720aa944
regression test for unrelated remote git repo
2021-06-06 23:53:21 -06:00
Dan Doel
4018bcd148
Factor out the equating part of subtyping
...
- Possibly useful if more specific handling of equality is desired in
some cases
2021-06-07 00:22:03 -04:00
Dan Doel
848498f86f
Avoid keeping useless variables in the wanted list
2021-06-07 00:07:05 -04:00
Dan Doel
82a0ce2865
Replace a long named variable with an unnamed one
2021-06-06 23:54:29 -04:00
mergify[bot]
0d991a74bc
Merge pull request #2081 from unisonweb/topic/termlink-parens
...
add parens around termLink and typeLink, according to ambient precedence
2021-06-06 17:40:20 +00:00
Chris Gibbs
f7e932bfaf
add parens around termLink and typeLink, according to ambient precedence - transcript updates
2021-06-06 18:00:34 +01:00
Chris Gibbs
1f6e36ff3b
add parens around termLink and typeLink, according to ambient precedence
2021-06-06 16:19:13 +01:00
Paul Chiusano
15e51eb1df
Merge pull request #2079 from jmorag/disable-pager-emacs
2021-06-05 12:52:53 -05:00
Joseph Morag
83e547425f
Add jmorag to contributors
2021-06-05 11:12:14 -04:00
Joseph Morag
fd79953161
Bypass less if running inside emacs
2021-06-05 11:11:41 -04:00
Arya Irani
29db5b7a1f
Merge pull request #2078 from unisonweb/topic/silence-null-results
...
Don't print output for queries that don't have output
2021-06-04 23:43:37 -04:00
Stew O'Connor
a9b5b629dc
the last guy here was a dog in a lab coat
2021-06-04 19:34:50 -07:00
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
8cb3190976
Don't print output for queries without output
...
the substring match is pretty hacky
2021-06-04 18:12:06 -06: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
Stew O'Connor
55ff7b3b88
needs more credentials
2021-06-04 14:15:21 -07:00
Stew O'Connor
c7e67290c1
needs credentials
2021-06-04 14:13:05 -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
Stew O'Connor
28245d63db
upload artifacts to the same release
2021-06-04 13:35:35 -07:00
mergify[bot]
7d5044fa4a
Merge pull request #2074 from unisonweb/topic/sync-tweak
...
fix some benign mistakes in sync
2021-06-04 20:23:56 +00:00
Stew O'Connor
06ea7b475f
build for 2 versions of ubuntu to pickup ncurses{5,6}
2021-06-04 13:08:41 -07:00
Arya Irani
a5d09a734b
fix some benign mistakes
2021-06-04 13:41:27 -06:00
mergify[bot]
e7575a079c
Merge pull request #2069 from unisonweb/fix/2068
...
Fix issue when syncing with >=2 namespaces only existing in memory
2021-06-04 19:15:50 +00:00
Arya Irani
1b15bbbaf6
fix #2068
2021-06-04 12:27:10 -06:00
Stew O'Connor
fa2b7e0112
not prerelease and don't strip release
2021-06-03 13:39:41 -07:00
Stew O'Connor
2aefeda2cc
oops trailing /
2021-06-03 11:24:38 -07:00
Stew O'Connor
cf59ebeb54
get rid of unneeded condition
2021-06-03 09:38:10 -07:00
Stew O'Connor
13d2a85dbb
Merge branch 'series/M2' of https://github.com/unisonweb/unison into series/M2
2021-06-03 09:35:46 -07:00
Stew O'Connor
fdc72a2ac6
look for tags starting with release/ ; publish optimized builds
2021-06-03 09:34:54 -07:00
Paul Chiusano
6bc2796a96
Default to optimized = true
2021-06-03 11:23:51 -05:00
Paul Chiusano
beae24814b
Update release.yaml
2021-06-03 11:10:34 -05:00
Paul Chiusano
bd99774f14
Regression test for #2068
2021-06-03 10:55:32 -05:00
Stew O'Connor
4bf90389b0
make a release whenever we push a tag that starts with a v
2021-06-03 08:41:48 -07:00
mergify[bot]
5b54b3dce6
Merge pull request #2064 from unisonweb/fix/wal-flush
...
Flush the WAL files on `push`
2021-06-03 04:57:12 +00: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
