5642 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Aaron Novstrup	93b0d2a353	replace case .. of syntax with match .. with	2020-02-07 18:59:37 -08:00
mergify[bot]	d0c3be9c3c	Merge pull request #1210 from unisonweb/topic/1202-one-root-update ... eliminated single-use helper and out-of-date comment	2020-02-06 23:51:58 +00:00
Arya Irani	bdc9c9822d	eliminated single-use helper and out-of-date comment	2020-02-06 18:35:52 -05:00
Paul Chiusano	45acdab994	Merge pull request #1209 from unisonweb/topic/1202-one-root-update ... Refactor pull / merge / pr.load	2020-02-06 17:58:58 -05:00
Arya Irani	1a653b8a1d	refactored load/pull/merge & did cleanup	2020-02-06 17:49:15 -05:00
Arya Irani	72832815eb	updated MergeLocalBranchI to use two updates, and not print todo ... implement added Lens.Cons and Lens.Snoc instances (closes #1200): instance Cons Path Path NameSegment NameSegment instance Snoc Relative Relative NameSegment NameSegment instance Snoc Absolute Absolute NameSegment NameSegment instance Snoc Path Path NameSegment NameSegment instance Snoc Path' Path' NameSegment NameSegment and class Path.Resolve l r where resolve :: l -> r -> l with instance Resolve Path Path instance Resolve Relative Relative instance Resolve Absolute Relative instance Resolve Path' Path' instance Resolve Path' Split' instance Resolve Absolute Path'	2020-02-06 00:05:34 -05:00
Arya Irani	5cd19d3eef	refactor MergeLocalBranchI to produce only one root update [...] ... * refactored `propagatePatch` to delay the actual propagation, * add `Branch.adjustHeadMN` which is kind of like `git commit --amend` * use `adjustHeadMN` to rewrite the head of the merged branch with the result of propagation * introduced or fixed a bug relating to applying conflicted patch in diff.md ? * changed output in delete.output.md ?	2020-02-04 21:44:42 -05:00
Arya Irani	f7e36e7583	Merge pull request #1107 from dolio/master ... Simple cabal.project for building with cabal.	2020-02-04 16:16:21 -05:00
Arya Irani	d5f2bcc4da	Merge pull request #1198 from unisonweb/topic/mergify-delete-label ... have mergify bot remote "ready-to-merge" label when merging	2020-02-04 16:13:38 -05:00
Paul Chiusano	ef471512ec	Merge pull request #1199 from unisonweb/fix/bad-consAbsolute ... `Path.consAbsolute` function existed when it shouldn't	2020-02-04 16:12:35 -05:00
mergify[bot]	ea184137be	Merge pull request #1197 from unisonweb/topic/pr.load ... implement pr.create / pr.load	2020-02-04 20:26:06 +00:00
Arya Irani	5b02d0d643	redundant import	2020-02-04 15:20:08 -05:00
Arya Irani	ff2414f02a	introduce Path.relativeSingleton to replace textToRelative	2020-02-04 15:03:56 -05:00
Arya Irani	cd5df7141f	add a transcript for corrected builtins.merge	2020-02-04 14:56:12 -05:00
Arya Irani	03d509b8b5	noticed that this unhelpful consAbsolute function existed when it shouldn't	2020-02-04 14:45:15 -05:00
Arya Irani	f7a73e4780	remove whitespace before .	2020-02-04 13:20:23 -05:00
Arya Irani	61092ccbee	add more suggested commands	2020-02-04 13:00:39 -05:00
Arya Irani	dd3c8b3fc4	unnecessary parens	2020-02-04 12:23:26 -05:00
Arya Irani	fecba86349	Merge branch 'master' into topic/pr.load ... # Conflicts: # parser-typechecker/src/Unison/Codebase/Editor/HandleInput.hs # parser-typechecker/src/Unison/Codebase/Editor/Output.hs # parser-typechecker/src/Unison/CommandLine/OutputMessages.hs	2020-02-04 11:58:13 -05:00
Arya Irani	008747ca68	have mergify bot remote "ready-to-merge" label when merging	2020-02-04 11:39:28 -05:00
mergify[bot]	7ebc9b493e	Merge pull request #1154 from unisonweb/mitchell/2020-01-16/remove-input-from-output ... Remove Input from Output	2020-02-04 16:28:12 +00:00
Arya Irani	e2db5de94f	Merge branch 'master' into mitchell/2020-01-16/remove-input-from-output	2020-02-04 11:20:37 -05:00
Arya Irani	fab9b10c84	LoadPullRequest output message	2020-02-04 10:44:39 -05:00
Paul Chiusano	49ead4295f	Merge pull request #1186 from pt2121/pt/fix-1083-help-topics ... split help-topic(s) into its own command	2020-02-04 09:46:24 -05:00
Paul Chiusano	07069512b7	Merge pull request #1191 from unisonweb/topic/cleanup ... remove superfluous dos	2020-02-04 09:44:42 -05:00
Dan Doel	cfef811e02	Move cabal.project to contrib/ ... - Update documentation for using it.	2020-02-04 08:27:16 -05:00
Arya Irani	7e721d3039	Merge branch 'master' into topic/pr.load	2020-02-03 22:50:16 -05:00
Arya Irani	4204d4de41	remove superfluous dos	2020-02-03 22:49:12 -05:00
Arya Irani	ebe63b895b	partial implementation of pr.load	2020-02-03 18:02:25 -05:00
Arya Irani	281bc6d596	whitespace	2020-02-03 18:01:49 -05:00
Arya Irani	b001f4a285	use resolveToAbsolute helper	2020-02-03 18:01:03 -05:00
Arya Irani	fe025702de	whitespace	2020-02-03 14:04:44 -05:00
Arya Irani	ef206a45dd	update help for pr.create	2020-02-03 14:04:30 -05:00
Arya Irani	589d112a57	Merge pull request #1187 from pete-ts/fix/typo-in-delimiter ... addresses the typo in 'delimiter'	2020-02-02 23:40:22 -05:00
pete-ts	36ec976511	addresses the typo in 'delimiter'	2020-02-02 11:20:20 +00:00
Prat T	2181578b60	split help-topic(s) into its own command	2020-02-01 14:19:54 -08:00
mergify[bot]	44ed1db47c	Merge pull request #1183 from unisonweb/fix/1042-big-list-crashes ... fix #1042	2020-01-29 22:21:23 +00:00
Arya Irani	2f9f627fc6	and the transcript output	2020-01-29 17:14:19 -05:00
Arya Irani	fa475ece81	restore big transcript	2020-01-29 17:09:45 -05:00
Arya Irani	5c8df7a047	should've been Set.max freeInBody - 1	2020-01-29 16:46:06 -05:00
Arya Irani	3c43442779	Merge branch 'fix/1042-big-list-crashes' of https://github.com/pete-ts/unison into fix/1042-big-list-crashes	2020-01-29 12:32:37 -05:00
Arya Irani	9d4b802ed5	simplify sample program	2020-01-29 12:31:32 -05:00
pete-ts	3e75584b72	Merge branch 'fix/1042-big-list-crashes' of github.com:unisonweb/unison into fix/1042-big-list-crashes	2020-01-29 16:56:24 +00:00
Arya Irani	fa1930498c	minimal stack allocations & minimized transcript for debugging #1042 big list crash	2020-01-28 22:23:25 -05:00
mergify[bot]	84e6446f31	Merge pull request #1177 from pete-ts/feature/1160 ... fix/1160	2020-01-28 20:10:48 +00:00
Arya Irani	b59953ad46	roll back haskeline submodule branch head	2020-01-28 15:02:03 -05:00
Paul Chiusano	ff64f6c5cf	Merge pull request #1165 from anovstrup/patch-2 ... follow-up revisions for handle-with syntax	2020-01-28 12:25:15 -05:00
Paul Chiusano	5b36676d82	Merge pull request #1174 from unisonweb/topic/simpler-gitignore ... simplify .gitignore to project-specific entries per	2020-01-28 12:23:50 -05:00
Paul Chiusano	c6c52f415e	Merge pull request #1167 from unisonweb/topic/transcript-hide-all ... Add ":hide:all" option for unison and ucm fences in transcripts	2020-01-28 12:22:06 -05:00
mergify[bot]	885a0f10e4	Merge pull request #1179 from pete-ts/fix/1178 ... fix/1178	2020-01-28 17:15:02 +00:00