Commit Graph

4861 Commits

Author SHA1 Message Date
Tomas Mikula
99af97699e Remove some dead code in PrintError. 2019-10-17 21:44:14 +02:00
Rúnar
08effd4535
Merge pull request #748 from scott-christopher/fix/739
Fixes #739: Add optional semi to record field separators in FileParser
2019-08-21 08:09:21 -04:00
Scott Christopher
3b46f5d780 Fixes #739: Add optional semi to record field separators in FileParser 2019-08-21 21:09:30 +10:00
Rúnar
667d14a858
Merge pull request #746 from unisonweb/fix/745
Fix #745
2019-08-20 13:39:34 -04:00
Paul Chiusano
43260a3e65 remove commented out code 2019-08-20 00:02:51 -04:00
Paul Chiusano
6d26e67f8c nice message if handler is of an unexpected type 2019-08-19 23:33:06 -04:00
Paul Chiusano
10f8a30bf7 compiling and tests pass 2019-08-19 22:36:35 -04:00
Paul Chiusano
89d5ab5ae4 noncompiling simplification of handle typechecking 2019-08-19 17:13:35 -04:00
Paul Chiusano
133589002a remove garbage past the fold 2019-08-19 16:36:40 -04:00
Paul Chiusano
30eb92c90e added failing test 2019-08-19 16:32:00 -04:00
Paul Chiusano
5ca8523dac
Merge pull request #732 from unisonweb/topic/log
`history` command for viewing history of a namespace
2019-08-17 13:23:58 -04:00
Paul Chiusano
fc6150d826 Merge remote-tracking branch 'origin/master' into topic/log 2019-08-17 13:14:25 -04:00
Paul Chiusano
a0c42494c6 address PR comments from @aryairani 2019-08-17 13:14:11 -04:00
Runar Bjarnason
7e8c4246f6 Merge branch 'master' of github.com:unisonweb/unison 2019-08-16 22:54:33 -04:00
Runar Bjarnason
ccfbfa6df0 Tests for int/float/text roundtrips 2019-08-16 22:54:16 -04:00
Paul Chiusano
4752f827d0 Sync with master, just one minor conflict.
# Conflicts:
#	parser-typechecker/src/Unison/CommandLine/InputPatterns.hs
2019-08-16 12:05:17 -04:00
Arya Irani
bcdb8a32e9 Merge branch 'master' of github.com:unisonweb/unison 2019-08-15 13:42:15 -04:00
Arya Irani
dfe939b389 delete unused codecs for Name 2019-08-15 13:42:11 -04:00
Arya Irani
3622fee082
Merge pull request #728 from unisonweb/runarorama/656-Add-baseInttoFloat-and-baseInttoText
Added Nat.fromText, Nat.toText, Int.fromText, Nat.toText, Int.toFloat
2019-08-15 13:39:44 -04:00
Arya Irani
9379636931 Merge branch 'master' into runarorama/656-Add-baseInttoFloat-and-baseInttoText
# Conflicts:
#	parser-typechecker/src/Unison/Runtime/Rt1.hs
2019-08-15 11:58:16 -04:00
Arya Irani
1ac3673cbb
Merge pull request #737 from exw/master
Fixed #692, path -> namespace in 'help namespace' InputPatterns.hs
2019-08-14 20:14:30 -04:00
ubuntu
22eba27148 Fixed #692, path -> namespace in 'help namespace' InputPatterns.hs 2019-08-14 13:26:40 -07:00
Paul Chiusano
b8c6296fe0
Merge pull request #735 from unisonweb/topic/show-git-version-simple
use template haskell to embed git version during compilation
2019-08-14 16:25:24 -04:00
Arya Irani
1a4fd54c3f switch to unison --version to print version 2019-08-14 16:11:38 -04:00
Arya Irani
bd8bf0f45d Merge branch 'master' of github.com:unisonweb/unison 2019-08-14 15:36:48 -04:00
Arya Irani
6880d363bc Fix #683 2019-08-14 15:33:04 -04:00
Paul Chiusano
650653fb4b Some minor message wording tweaks based on feedback from @aryairani. Reads a bit better. 2019-08-14 15:18:50 -04:00
Paul Chiusano
95c9673e6d
Merge pull request #705 from mitchellwrosen/unison-prelude
Add Unison.Prelude
2019-08-14 15:08:05 -04:00
Paul Chiusano
3b62ab91ae merge tails show the current hash, some output tweaks 2019-08-14 13:26:53 -04:00
Paul Chiusano
d0eff62c89 branchFromFiles takes an extra arg indicating whether to crash if given a hash it doesn't know about
For loading the root branch, the hash had better exist. For loading a user-specified hash, return the empty branch if it's not found. It's only an error if the one of the branch references in the history refers to something that doesn't exist.
2019-08-14 13:17:46 -04:00
Paul Chiusano
69ba6cf9cc fork / copy.namespace command can now take a namespace hash as first argument 2019-08-14 12:55:31 -04:00
Paul Chiusano
df84377102 output tweaks 2019-08-14 12:32:27 -04:00
Arya Irani
7ec4a6c919
Merge pull request #730 from zenhack/text-builtins-tuples
Text.uncons/unsnoc: use tuples instead of "Pair"
2019-08-14 12:30:14 -04:00
Paul Chiusano
ba28296298 finish draft of log/history command, seems to be working 2019-08-14 11:54:28 -04:00
Chris Gibbs
512ea18208
Merge pull request #729 from zenhack/line-endings
TermPrinter: use unix line endings.
2019-08-14 06:54:43 +01:00
Ian Denhardt
c8ee49e1db Text.uncons/unsnoc: use tuples instead of "Pair"
As internally a 2-tuple is not the same thing as a pair. Rather,
`(x, y)` is equivalent to `Pair x (Pair y Unit)`
2019-08-14 00:04:21 -04:00
Ian Denhardt
3cb87ba066 TermPrinter: use unix line endings.
The file is currently using windows line endings ("\r\n"), unlike the
rest of the codebase.
2019-08-13 21:19:43 -04:00
Paul Chiusano
d7bb7f3611 WIP on log/history command
Still todo - decide on output message type, fill in handle input todo, rendering of output message, allow aliasing a historical namespace into local namespace
2019-08-13 17:49:22 -04:00
Runar Bjarnason
fc87ff42e1 Added Nat.fromText, Nat.toText, Int.fromText, Nat.toText, Int.toFloat 2019-08-13 16:49:37 -04:00
Arya Irani
d437e27746 use template haskell to embed git version during compilation
haven't tested without git.
2019-08-13 15:34:24 -04:00
Rúnar
6c53a5c42a
Merge pull request #707 from seagreen/contributors
Add myself to contributors.
2019-08-12 09:55:59 -04:00
Ian Grant Jeffries
74e60dfaa3 Add myself to contributors. 2019-08-12 09:54:21 -04:00
Rúnar
c616ec92fc
Merge pull request #706 from seagreen/remove-set-title
Remove Console.setTitle calls.
2019-08-12 09:29:09 -04:00
Ian Grant Jeffries
f12affdfa7 Remove Console.setTitle calls.
They mess with tmux unfortunately.
2019-08-12 09:22:49 -04:00
Rúnar
ffb44245c6
Update README.md 2019-08-12 07:37:43 -04:00
Mitchell Rosen
af28fed3cb Add Unison.Prelude 2019-08-11 12:56:44 -04:00
Paul Chiusano
ec99350113
Merge pull request #699 from zenhack/char-patterns
Add missing logic for character patterns
2019-08-11 12:24:11 -04:00
Paul Chiusano
f65297ceda
Merge pull request #687 from zenhack/char-to-from-nat
New builtins for converting Char <-> Nat.
2019-08-11 12:21:37 -04:00
Paul Chiusano
d99a55b7eb
Merge pull request #701 from mitchellwrosen/better-delete-namespace-feedback
Improve delete.namespace feedback a bit
2019-08-11 12:17:06 -04:00
Paul Chiusano
1d1b01e5c2
Merge pull request #698 from mitchellwrosen/Nat.fromText
Add Nat.fromText
2019-08-11 12:15:36 -04:00