Commit Graph

5841 Commits

Author SHA1 Message Date
pete-ts
0daeea86d4 Adds a transcript testing the ambiguous metadata error 2020-04-07 22:03:09 +01:00
Paul Chiusano
93e32d84c6
Merge pull request #1403 from unisonweb/topic/fork-empty-namespace
improve two error messages when forking
2020-04-06 14:03:59 -04:00
Arya Irani
0124b84b7f improve two error messages when forking
probably could be improved further by distinguishing
Branch.isEmpty vs Branch.isEmpty0
2020-04-05 02:15:47 -04:00
Paul Chiusano
361895f8ab
Merge pull request #1389 from unisonweb/fix/1388
Fix issue with `putSymbol` which resulted in extra numbers getting appended to the name on each round trip
2020-04-03 10:18:49 -04:00
Paul Chiusano
7a6b411e97 Ensure fresh var isn't old either
Not positive this is needed, but also not positive it isn't needed, and not harmful to do
2020-04-02 23:05:58 -04:00
Paul Chiusano
a0fb28c1a5 Fix #1277 and add unit test
Also reverted incorrect ABT Eq instance. Need to rename both Abs to bring the names into alignment
2020-04-02 22:48:42 -04:00
Paul Chiusano
dcd0d331f3 Added unit test which fails without this fix 2020-03-31 20:32:11 -04:00
Paul Chiusano
3c396c5d92 Fix #1388
After fixing this, some serialization round trip tests started failing. This ended up being due to the Eq instance for ABT being busted due to its use of rename, which has a subtle variable capture bug that @dolio spotted a while ago https://github.com/unisonweb/unison/issues/1277 #1277 needs a proper fix but in the meantime, I've tweaked the Eq instance to be a bit more efficient and also avoid the #1277 bug in this particular case.
2020-03-31 19:06:18 -04:00
Rúnar
050d309d2b
Merge pull request #1387 from unisonweb/topic/fix-local-git-repo
four git ux fixes
2020-03-30 14:03:21 -04:00
Arya Irani
8687e1d01d Add withStatus messages to Git.hs 2020-03-28 17:03:21 -04:00
Arya Irani
713a746294 update Shellmet, hide most git commands 2020-03-28 12:49:02 -04:00
Arya Irani
abe749dc14 drop unneeded flag to git rev-parse and do less stdout 2020-03-28 12:43:31 -04:00
Arya Irani
45d5ff3708 use --git-dir & --work-tree to avoid git changing dirs 2020-03-28 12:13:14 -04:00
Paul Chiusano
415681a49e
Merge pull request #1383 from pete-ts/easytest-pending
easytest.pending runs hidden tests and reports accordingly
2020-03-27 15:22:49 -04:00
Paul Chiusano
3970db8d61
Merge pull request #1382 from unisonweb/topic/debug-big-base#10-2
fix Star3.replaceFact
2020-03-27 15:18:03 -04:00
pete-ts
eb4b1bb66b easytest.pending runs hidden tests and reports accordingly 2020-03-26 19:15:19 +00:00
Arya Irani
5c081a5253 fix Star3.replaceFact 2020-03-25 08:04:09 -04:00
Arya Irani
8863c6a0ef add failing transcript 2020-03-23 19:09:01 -04:00
Arya Irani
bf59f60076
Merge pull request #1372 from pete-ts/fix/1339
Removes empty string at the end of Name.suffixes output and unittests
2020-03-22 17:32:58 -04:00
Arya Irani
ea39f957b3
Merge pull request #1380 from unisonweb/topic/trailing-whitespace
remove all trailing whitespace
2020-03-22 15:57:33 -04:00
Arya Irani
2caf56a86c remove all trailing whitespace 2020-03-22 15:39:50 -04:00
pete-ts
9838b7cbd1 removes Twoolean and == from transcript 2020-03-21 16:59:43 +00:00
mergify[bot]
a5efa94fa2
Merge pull request #1376 from pete-ts/remove-suppressed-warnings
Remove suppressed warnings and unused pragmas
2020-03-21 16:22:18 +00:00
Arya Irani
69b9476226
Merge pull request #1374 from pete-ts/fix/1324
Make the first argument of push required
2020-03-21 11:51:13 -04:00
Arya Irani
35fbe86fe9
Merge pull request #1378 from unisonweb/topic/reference.id
Let more places use Reference.Id
2020-03-21 08:05:10 -04:00
pete-ts
20c18f78bc Merge branch 'remove-suppressed-warnings' of github.com:pete-ts/unison into remove-suppressed-warnings 2020-03-21 11:15:10 +00:00
pete-ts
f2bd1228e5 removes warnings after rebase from master 2020-03-21 11:15:02 +00:00
pete-ts
39894882b8 removes two unused language pragmas 2020-03-21 11:13:16 +00:00
pete-ts
bc109fda4a removes commented out warning suppression 2020-03-21 11:13:16 +00:00
pete-ts
db60373833 removes warning suppression and unused LANGUAGE (Classes) 2020-03-21 11:13:16 +00:00
pete-ts
1b3c0685b7 removes warning suppression (UriParser) 2020-03-21 11:13:16 +00:00
pete-ts
dbf923a897 removes warning suppression (OutputMessages) 2020-03-21 11:13:16 +00:00
mergify[bot]
ac9b5dcd10
Merge pull request #1368 from unisonweb/fix/1356
Make `link`, `unlink`, and `diff.namespace` work with unnamed metadata (fix for #1356)
2020-03-20 22:53:01 +00:00
Arya Irani
3a16b33b7a Let more places use Reference.Id where appropriate
- Codebase functions are now parameterized by Reference.Id or Referent.Id
  (a Referent that doesn't refer to a built-in) where appropriate, to
  enforce at the type level that Codebases can't contain builtins, and
  to eliminate jank that was enforcing or assuming this at runtime.

  ditto CodeLookup

  ditto `UnisonFile` and `TypecheckedUnisonFile`; with some backwards-
  compatible functions and pattern synonyms to support the old types,
  and some new functions for the new types.

- Codebase.getRootBranch and .getBranchForHash return a sum type instead
  of a magic value (`Branch.empty`) on error. `BranchLoadMode` goes away.

  `getRootBranch`'s result distinguishes between "I don't know what the
  head is supposed to be" vs "I do know what it is supposed to be but
  couldn't find it".

- Not strictly related to Referent.Id (oops) but I moved the actual
  builtin Decls from `unison-core/Unison.DataDeclaration` to
  `unison-parser-typechecker/Unison.Builtin.Decls`.

  I left these qualified as `DD` to minimize diffs, although it may
  make it harder to know which module a `DD.` definition is coming from.
2020-03-20 18:47:30 -04:00
Paul Chiusano
60f7ca1ce0
Merge pull request #1371 from unisonweb/fix/view-suffixified
Allow `view` and `display` commands to resolve any unique suffix
2020-03-20 18:28:57 -04:00
Paul Chiusano
6c0dc0d188 Merge remote-tracking branch 'origin/master' into fix/view-suffixified
# Conflicts:
#	parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs
#	parser-typechecker/src/Unison/CommandLine/InputPatterns.hs
2020-03-20 18:16:25 -04:00
pete-ts
914375a329 removes two unused language pragmas 2020-03-20 21:47:41 +00:00
pete-ts
6475ff5b5b removes commented out warning suppression 2020-03-20 21:32:02 +00:00
pete-ts
b903ab4e56 removes warning suppression and unused LANGUAGE (Classes) 2020-03-20 21:31:31 +00:00
pete-ts
48d46f996d removes warning suppression (UriParser) 2020-03-20 21:26:48 +00:00
pete-ts
fa1e97c80d removes warning suppression (OutputMessages) 2020-03-20 21:26:48 +00:00
pete-ts
3ee9e0c94f makes the first argument of push required 2020-03-20 21:03:58 +00:00
Rúnar
f8467a02c2
Merge pull request #1360 from unisonweb/topic/editPatch
Allow deleting type and term replacements in patches
2020-03-19 21:53:56 -04:00
Runar Bjarnason
8f0da4d4a6 Improved types in Input per Arya 2020-03-19 17:56:20 -04:00
Paul Chiusano
cda53566b5 Delete exactDefiniitionQueryArg, call fuzzyDefinitionQueryArg from definitionQueryArg.
The diff on this shows all the commands affected.
2020-03-19 17:05:08 -04:00
pete-ts
52965d2ddf suffixes no longer adds "" at the end of the list 2020-03-19 20:05:14 +00:00
Paul Chiusano
171cfd0e82 switch to using unsuffixed names for display, but suffixed names for resolving argument to display 2020-03-19 14:59:26 -04:00
pete-ts
389d36ada9 adds unittests for core.Name.suffixes in the tests executable 2020-03-19 18:47:37 +00:00
Paul Chiusano
95b8517bb1 display gets same treatment 2020-03-19 14:30:30 -04:00
Paul Chiusano
781b2ad5d7 Fix #1241 2020-03-19 14:18:56 -04:00